middleware update

Server/App/Stack/Factory/Middleware.php

@@ -36,45 +36,38 @@ public function __construct(
     ) {
         $this->_component = $component;
         $this->_middleware = $middleware;
+        $this->_middleware->setComponent($component);
     }
 
     /**
      * {@inheritdoc}
      */
     public function onOpen(ConnectionInterface $conn, RequestInterface $request = null)
     {
-        $answer = $this->_middleware->onOpen($conn, $request);
-
-        return $answer instanceof ConnectionInterface ? $answer : $this->_component->onOpen($conn, $request);
+        return $this->_middleware->onOpen($conn, $request);
     }
 
     /**
      * {@inheritdoc}
      */
     public function onMessage(ConnectionInterface $from, $msg)
     {
-        $this->_middleware->onMessage($from, $msg);
-
-        return $this->_component->onMessage($from, $msg);
+        return $this->_middleware->onMessage($from, $msg);
     }
 
     /**
      * {@inheritdoc}
      */
     public function onClose(ConnectionInterface $conn)
     {
-        $this->_middleware->onClose($conn);
-
-        return $this->_component->onClose($conn);
+        return $this->_middleware->onClose($conn);
     }
 
     /**
      * {@inheritdoc}
      */
     public function onError(ConnectionInterface $conn, \Exception $e)
     {
-        $this->_middleware->onError($conn, $e);
-
-        return $this->_component->onError($conn, $e);
+        return $this->_middleware->onError($conn, $e);
     }
 }

Server/App/Stack/HandshakeMiddlewareAbstract.php

@@ -17,17 +17,50 @@ abstract class HandshakeMiddlewareAbstract implements HttpServerInterface
      */
     protected $_component;
 
+    /**
+     * @param MessageComponentInterface $component
+     */
     public function setComponent(MessageComponentInterface $component)
     {
         $this->_component = $component;
     }
 
     /**
-     * @param \Ratchet\ConnectionInterface          $conn
-     * @param \Guzzle\Http\Message\RequestInterface $request null is default because PHP won't let me overload; don't pass null!!!
-     *
-     * @return ConnectionInterface|void
-     * @throws \UnexpectedValueException if a RequestInterface is not passed
+     * @param ConnectionInterface $conn
+     * @param RequestInterface|null $request
+     * @return mixed
+     */
+    public function onOpen(ConnectionInterface $conn, RequestInterface $request = null)
+    {
+        return $this->_component->onOpen($conn, $request);
+    }
+
+    /**
+     * @param ConnectionInterface $conn
+     * @return mixed
      */
-    abstract public function onOpen(ConnectionInterface $conn, RequestInterface $request = null);
+    public function onClose(ConnectionInterface $conn)
+    {
+        return $this->_component->onClose($conn);
+    }
+
+    /**
+     * @param ConnectionInterface $conn
+     * @param \Exception $e
+     * @return mixed
+     */
+    public function onError(ConnectionInterface $conn, \Exception $e)
+    {
+        return $this->_component->onError($conn, $e);
+    }
+
+    /**
+     * @param ConnectionInterface $from
+     * @param string $msg
+     * @return mixed
+     */
+    public function onMessage(ConnectionInterface $from, $msg)
+    {
+        return $this->_component->onMessage($from, $msg);
+    }
 }