Only emit close on close, emit end on EOS, via @clue at #24 (comment)

Author: WyriHaximus

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,6 +99,7 @@ protected function performRead($chunkSize)
             if ($this->readCursor < $this->size) {
                 $this->readChunk();
             } else {
+                $this->emit('end', [$this]);
                 $this->close();
             }
         });

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