[stream] Don't emit data if empty. Replaced py test with php

cboden · cboden · commit ebf704e05239 · 2014-04-13T12:32:50.000-04:00
diff --git a/src/Socket/Connection.php b/src/Socket/Connection.php
@@ -11,9 +11,10 @@ public function handleData($stream)
         // Socket is raw, not using fread as it's interceptable by filters
         // See issues #192, #209, and #240
         $data = stream_socket_recvfrom($stream, $this->bufferSize);
-        if( '' !== $data || false !== $data ){
+        if ('' !== $data && false !== $data) {
             $this->emit('data', array($data, $this));
         }
+
         if ('' === $data || false === $data || feof($stream)) {
             $this->end();
         }
diff --git a/tests/Socket/ServerTest.php b/tests/Socket/ServerTest.php
@@ -84,9 +84,9 @@ public function testDataWithNoData()
     public function testData()
     {
         $client = stream_socket_client('tcp://localhost:'.$this->port);
-        
+
         fwrite($client, "foo\n");
-        
+
         $mock = $this->createCallableMock();
         $mock
             ->expects($this->once())
@@ -99,25 +99,26 @@ public function testData()
         $this->loop->tick();
         $this->loop->tick();
     }
-    
+
     /**
      * Test data sent from python language
-     * 
+     *
      * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Connection::handleData
      */
     public function testDataSentFromPy()
     {
-        $cmd = "python -c 'import socket; s = socket.socket(socket.AF_INET, socket.SOCK_STREAM);s.connect((\"127.0.0.1\", $this->port));s.sendall(\"foo\\n\");s.shutdown(1);'";
-        exec($cmd);
-        
+        $client = stream_socket_client('tcp://localhost:' . $this->port);
+        fwrite($client, "foo\n");
+        stream_socket_shutdown($client, STREAM_SHUT_WR);
+
         $mock = $this->createCallableMock();
         $mock
             ->expects($this->once())
             ->method('__invoke')
             ->with("foo\n");
 
-                  
+
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('data', $mock);
         });

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@ public function handleData($stream)`
`11`	`11`	`// Socket is raw, not using fread as it's interceptable by filters`
`12`	`12`	`// See issues #192, #209, and #240`
`13`	`13`	`$data = stream_socket_recvfrom($stream, $this->bufferSize);`
`14`		`- if( '' !== $data \|\| false !== $data ){`
	`14`	`+ if ('' !== $data && false !== $data) {`
`15`	`15`	`$this->emit('data', array($data, $this));`
`16`	`16`	`}`
	`17`	`+`
`17`	`18`	`if ('' === $data \|\| false === $data \|\| feof($stream)) {`
`18`	`19`	`$this->end();`
`19`	`20`	`}`