diff --git a/lib/Ratchet/Application/ApplicationInterface.php b/lib/Ratchet/Application/ApplicationInterface.php index 4c0c919..6d964cb 100644 --- a/lib/Ratchet/Application/ApplicationInterface.php +++ b/lib/Ratchet/Application/ApplicationInterface.php @@ -7,12 +7,6 @@ use Ratchet\Resource\Connection; * It impelemtns the decorator and command pattern to build an application stack */ interface ApplicationInterface { - /** - * Decorator pattern - * @param Ratchet\ApplicationInterface Application to wrap in protocol - */ - public function __construct(ApplicationInterface $app = null); - /** * When a new connection is opened it will be passed to this method * @param Ratchet\Resource\Connection The socket/connection that just connected to your application diff --git a/lib/Ratchet/Application/Server/App.php b/lib/Ratchet/Application/Server/App.php index 5964f39..8eb8fb0 100644 --- a/lib/Ratchet/Application/Server/App.php +++ b/lib/Ratchet/Application/Server/App.php @@ -41,11 +41,7 @@ class App implements ApplicationInterface { */ protected $_run = true; - public function __construct(ApplicationInterface $application = null) { - if (null === $application) { - throw new \UnexpectedValueException("Server requires an application to run off of"); - } - + public function __construct(ApplicationInterface $application) { $this->_app = $application; } diff --git a/lib/Ratchet/Application/WebSocket/App.php b/lib/Ratchet/Application/WebSocket/App.php index 5c8bdfc..fb12136 100644 --- a/lib/Ratchet/Application/WebSocket/App.php +++ b/lib/Ratchet/Application/WebSocket/App.php @@ -41,11 +41,7 @@ class App implements ApplicationInterface, ConfiguratorInterface { protected $_mask_payload = false; - public function __construct(ApplicationInterface $app = null) { - if (null === $app) { - throw new \UnexpectedValueException("WebSocket requires an application to run"); - } - + public function __construct(ApplicationInterface $app) { $this->_app = $app; $this->_factory = new Factory; } diff --git a/tests/Ratchet/Tests/Application/Server/AppTest.php b/tests/Ratchet/Tests/Application/Server/AppTest.php index a9e96a6..4e3aed6 100644 --- a/tests/Ratchet/Tests/Application/Server/AppTest.php +++ b/tests/Ratchet/Tests/Application/Server/AppTest.php @@ -36,11 +36,6 @@ class AppTest extends \PHPUnit_Framework_TestCase { return array_pop($connections); } - public function testDoNotAllowStacklessServer() { - $this->setExpectedException('UnexpectedValueException'); - new ServerApp; - } - public function testOnOpenPassesClonedSocket() { $this->_server->run($this->_catalyst); $master = $this->getMasterConnection();