From 01804dac6c3d400a060b46688032c7e8dec4d879 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sat, 4 Feb 2012 12:37:53 -0500 Subject: [PATCH] Attempted Fixes Attempting to change some things to pass on TravisCI...even though I'm not getting any unit test failures. --- composer.json | 2 -- .../Tests/Component/Server/IOServerComponentTest.php | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 464f025..3000123 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,8 @@ , "type": "library" , "description": "PHP WebSocket server component library" , "keywords": ["WebSocket"] - , "homepage": "http://socketo.me" , "repository": "https://github.com/cboden/Ratchet" , "license": "MIT" - , "version": "0.1" , "authors": [ { "name": "Chris Boden" diff --git a/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php b/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php index 0fa0601..b608e98 100644 --- a/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php +++ b/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php @@ -13,9 +13,9 @@ class IOServerComponentTest extends \PHPUnit_Framework_TestCase { protected $_decorated; public function setUp() { - $this->_catalyst = new Socket; - $this->_decorated = new TestApp; - $this->_server = new IOServerComponent($this->_decorated); + $this->_catalyst = new Socket; + $this->_decorated = new TestApp; + $this->_server = new IOServerComponent($this->_decorated); $ref = new \ReflectionClass('\\Ratchet\\Component\\Server\\IOServerComponent'); $prop = $ref->getProperty('_run'); @@ -37,7 +37,8 @@ class IOServerComponentTest extends \PHPUnit_Framework_TestCase { } public function testOnOpenPassesClonedSocket() { - $this->_server->run($this->_catalyst); + $master = $this->_catalyst; + $this->_server->run($master); $master = $this->getMasterConnection(); $this->_server->onOpen($master); @@ -47,7 +48,8 @@ class IOServerComponentTest extends \PHPUnit_Framework_TestCase { } public function testOnMessageSendsToApp() { - $this->_server->run($this->_catalyst); + $master = $this->_catalyst; + $this->_server->run($master); $master = $this->getMasterConnection(); // todo, make FakeSocket better, set data in select, recv to pass data when called, then do this check