faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

Merge branch 'refs/heads/app-refactor' into wamp

Browse Source
This commit is contained in:
Chris Boden 2012-01-08 21:58:50 -05:00
commit 81700d8cd4
4 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Ratchet/Application/ApplicationInterface.php
View File

@ -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

6
lib/Ratchet/Application/Server/App.php
View File

@ -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;
}

6
lib/Ratchet/Application/WebSocket/App.php
View File

@ -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;
}

5
tests/Ratchet/Tests/Application/Server/AppTest.php
View File

@ -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();