From cb49cf06e7d024b7ca7f2f12549e2d05b04b53d7 Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Sat, 4 Feb 2012 12:45:37 -0500
Subject: [PATCH] Passing Unit Test

Turned on E_STRICT and fixed resulting unit test failures
---
 composer.lock                                               | 2 +-
 src/Ratchet/Component/Server/IOServerComponent.php          | 4 +++-
 .../Tests/Component/Server/IOServerComponentTest.php        | 6 ++----
 tests/bootstrap.php                                         | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index a2d950a..4e02f7a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,5 +1,5 @@
 {
-    "hash": "9c9347f555af9a961102c4158e6d2ae8",
+    "hash": "e898a89b9f66807dae53937fe3b089d3",
     "packages": [
         {
             "package": "guzzle",
diff --git a/src/Ratchet/Component/Server/IOServerComponent.php b/src/Ratchet/Component/Server/IOServerComponent.php
index cd0d403..d292d57 100644
--- a/src/Ratchet/Component/Server/IOServerComponent.php
+++ b/src/Ratchet/Component/Server/IOServerComponent.php
@@ -90,7 +90,9 @@ class IOServerComponent implements MessageComponentInterface {
         $changed = $this->_resources;
 
         try {
-            $num_changed = $host->select($changed, $write = null, $except = null, null);
+            $write = $except = null;
+
+            $num_changed = $host->select($changed, $write, $except, null);
         } catch (Exception $e) {
             // master had a problem?...what to do?
             return;
diff --git a/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php b/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php
index b608e98..99b4cfc 100644
--- a/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php
+++ b/tests/Ratchet/Tests/Component/Server/IOServerComponentTest.php
@@ -37,8 +37,7 @@ class IOServerComponentTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testOnOpenPassesClonedSocket() {
-        $master = $this->_catalyst;
-        $this->_server->run($master);
+        $this->_server->run($this->_catalyst);
         $master = $this->getMasterConnection();
 
         $this->_server->onOpen($master);
@@ -48,8 +47,7 @@ class IOServerComponentTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testOnMessageSendsToApp() {
-        $master = $this->_catalyst;
-        $this->_server->run($master);
+        $this->_server->run($this->_catalyst);
         $master = $this->getMasterConnection();
 
         // todo, make FakeSocket better, set data in select, recv to pass data when called, then do this check
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 259d106..f814127 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,3 +1,5 @@
 <?php
 
+    error_reporting(E_ALL | E_STRICT);
+
     require_once dirname(__DIR__) . '/vendor/.composer/autoload.php';
\ No newline at end of file