Emit close event once we reach the end of the stream

Author: WyriHaximus

src/Node/File.php

@@ -8,11 +8,11 @@
 use React\Filesystem\ObjectStreamSink;
 use React\Filesystem\Stream\GenericStreamInterface;
 use React\Promise\Deferred;
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
 use React\Promise\Stream;
 use React\Stream\ReadableStreamInterface;
 use React\Stream\WritableStreamInterface;
-use React\Promise\FulfilledPromise;
-use React\Promise\RejectedPromise;
 
 class File implements FileInterface
 {
@@ -149,9 +149,7 @@ public function close()
     public function getContents()
     {
         return $this->open('r')->then(function ($stream) {
-            return Stream\buffer($stream)->always(function () {
-                $this->close();
-            });
+            return Stream\buffer($stream);
         });
     }
 

src/Stream/GenericStreamTrait.php

@@ -93,7 +93,6 @@ public function close()
         }
 
         $this->closed = true;
-        $this->emit('end', [$this]);
 
         $this->filesystem->close($this->fileDescriptor)->then(function () {
             $this->emit('close', [$this]);

src/Stream/ReadableStreamTrait.php

@@ -99,9 +99,8 @@ protected function performRead($chunkSize)
             if ($this->readCursor < $this->size) {
                 $this->readChunk();
             } else {
-                $this->emit('end', [
-                    $this,
-                ]);
+                $this->emit('end', [$this]);
+                $this->close();
             }
         });
     }

tests/Node/FileTest.php

@@ -7,6 +7,7 @@
 use React\Filesystem\Node\Directory;
 use React\Filesystem\Node\File;
 use React\Filesystem\ObjectStream;
+use React\Filesystem\Stream\ReadableStream;
 use React\Promise\Deferred;
 use React\Promise\FulfilledPromise;
 use React\Promise\RejectedPromise;
@@ -296,27 +297,48 @@ public function testGetContents()
     {
         $path = 'foo.bar';
         $fd = '0123456789abcdef';
-        $filesystem = $this->mockAdapter();
 
-        $stream = $this->getMock('React\Filesystem\Stream\ReadableStream', [
-            'getFiledescriptor',
-            'resume',
-        ], [
-            'foo:bar',
-            $fd,
-            $filesystem,
+        $openPromise = $this->getMock('React\Promise\PromiseInterface', [
+            'then',
         ]);
 
-        $stream
+        $filesystem = $this->mockAdapter();
+
+        $filesystem
             ->expects($this->once())
-            ->method('getFiledescriptor')
-            ->with()
-            ->will($this->returnValue($fd))
+            ->method('stat')
+            ->with($path)
+            ->will($this->returnValue(new FulfilledPromise([
+                'size' => 1,
+            ])))
         ;
 
-        $openPromise = $this->getMock('React\Promise\PromiseInterface', [
-            'then',
-        ]);
+        $filesystem
+            ->expects($this->once())
+            ->method('open')
+            ->with($path, 'r')
+            ->will($this->returnValue($openPromise))
+        ;
+
+        $filesystem
+            ->expects($this->once())
+            ->method('read')
+            ->with($fd, 1, 0)
+            ->will($this->returnValue(new FulfilledPromise(str_repeat('a', 1))))
+        ;
+
+        $filesystem
+            ->expects($this->once())
+            ->method('close')
+            ->with($fd)
+            ->will($this->returnValue(new FulfilledPromise()))
+        ;
+
+        $stream = new ReadableStream(
+            $path,
+            $fd,
+            $filesystem
+        );
 
         $openPromise
             ->expects($this->once())
@@ -327,13 +349,6 @@ public function testGetContents()
             }))
         ;
 
-        $filesystem
-            ->expects($this->once())
-            ->method('open')
-            ->with($path, 'r')
-            ->will($this->returnValue($openPromise))
-        ;
-
         $getContentsPromise = (new File($path, Filesystem::createFromAdapter($filesystem)))->getContents();
         $this->assertInstanceOf('React\Promise\PromiseInterface', $getContentsPromise);
     }

tests/Stream/ReadableStreamTest.php

@@ -137,17 +137,11 @@ public function testClose($className, $stat)
         $stream
             ->expects($this->at(0))
             ->method('emit')
-            ->with('end', [$stream])
-        ;
-
-        $stream
-            ->expects($this->at(1))
-            ->method('emit')
             ->with('close', [$stream])
         ;
 
         $stream
-            ->expects($this->at(2))
+            ->expects($this->at(1))
             ->method('removeAllListeners')
             ->with()
         ;

tests/Stream/WritableStreamTest.php

@@ -194,17 +194,11 @@ public function testClose($className)
         $stream
             ->expects($this->at(0))
             ->method('emit')
-            ->with('end', [$stream])
-        ;
-
-        $stream
-            ->expects($this->at(1))
-            ->method('emit')
             ->with('close', [$stream])
         ;
 
         $stream
-            ->expects($this->at(2))
+            ->expects($this->at(1))
             ->method('removeAllListeners')
             ->with()
         ;