Update to require PHP 7.1+

WyriHaximus · clue · commit 9bde4fdbed05 · 2024-05-15T14:24:29.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,11 +19,6 @@ jobs:
           - 7.3
           - 7.2
           - 7.1
-          - 7.0
-          - 5.6
-          - 5.5
-          - 5.4
-          - 5.3
     steps:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
@@ -52,23 +47,3 @@ jobs:
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
       - run: time php examples/91-benchmark-throughput.php
-
-  PHPUnit-hhvm:
-    name: PHPUnit (HHVM)
-    runs-on: ubuntu-22.04
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v4
-      - run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
-      - name: Run hhvm composer.phar install
-        uses: docker://hhvm/hhvm:3.30-lts-latest
-        with:
-          args: hhvm composer.phar install
-      - name: Run hhvm vendor/bin/phpunit
-        uses: docker://hhvm/hhvm:3.30-lts-latest
-        with:
-          args: hhvm vendor/bin/phpunit
-      - name: Run time hhvm examples/91-benchmark-throughput.php
-        uses: docker://hhvm/hhvm:3.30-lts-latest
-        with:
-          args: bash -c "time hhvm examples/91-benchmark-throughput.php"
diff --git a/README.md b/README.md
@@ -1217,9 +1217,8 @@ composer require react/stream:^3@dev
 See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
 
 This project aims to run on any platform and thus does not require any PHP
-extensions and supports running on legacy PHP 5.3 through current PHP 8+ and HHVM.
-It's *highly recommended to use PHP 7+* for this project due to its vast
-performance improvements.
+extensions and supports running on PHP 7.1 through current PHP 8+.
+It's *highly recommended to use the latest supported PHP version* for this project.
 
 ## Tests
 
diff --git a/composer.json b/composer.json
@@ -26,12 +26,12 @@
         }
     ],
     "require": {
-        "php": ">=5.3.8",
+        "php": ">=7.1",
         "react/event-loop": "^1.2",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+        "phpunit/phpunit": "^9.6 || ^5.7",
         "clue/stream-filter": "~1.2"
     },
     "autoload": {
diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
@@ -2,7 +2,7 @@
 
 <!-- PHPUnit configuration file with old format for legacy PHPUnit -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>
diff --git a/src/DuplexResourceStream.php b/src/DuplexResourceStream.php
@@ -46,7 +46,7 @@ public function __construct($stream, LoopInterface $loop = null, $readChunkSize
 
         // ensure resource is opened for reading and wrting (fopen mode must contain "+")
         $meta = \stream_get_meta_data($stream);
-        if (isset($meta['mode']) && $meta['mode'] !== '' && \strpos($meta['mode'], '+') === false) {
+        if (\strpos($meta['mode'], '+') === false) {
             throw new InvalidArgumentException('Given stream resource is not opened in read and write mode');
         }
 
@@ -59,14 +59,9 @@ public function __construct($stream, LoopInterface $loop = null, $readChunkSize
         // Use unbuffered read operations on the underlying stream resource.
         // Reading chunks from the stream may otherwise leave unread bytes in
         // PHP's stream buffers which some event loop implementations do not
-        // trigger events on (edge triggered).
-        // This does not affect the default event loop implementation (level
-        // triggered), so we can ignore platforms not supporting this (HHVM).
-        // Pipe streams (such as STDIN) do not seem to require this and legacy
-        // PHP versions cause SEGFAULTs on unbuffered pipe streams, so skip this.
-        if (\function_exists('stream_set_read_buffer') && !$this->isLegacyPipe($stream)) {
-            \stream_set_read_buffer($stream, 0);
-        }
+        // trigger events on (edge triggered). This does not affect the default
+        // event loop implementation (level triggered).
+        \stream_set_read_buffer($stream, 0);
 
         if ($buffer === null) {
             $buffer = new WritableResourceStream($stream, $loop);
@@ -200,28 +195,4 @@ public function handleData($stream)
             $this->close();
         }
     }
-
-    /**
-     * Returns whether this is a pipe resource in a legacy environment
-     *
-     * This works around a legacy PHP bug (#61019) that was fixed in PHP 5.4.28+
-     * and PHP 5.5.12+ and newer.
-     *
-     * @param resource $resource
-     * @return bool
-     * @link https://github.com/reactphp/child-process/issues/40
-     *
-     * @codeCoverageIgnore
-     */
-    private function isLegacyPipe($resource)
-    {
-        if (\PHP_VERSION_ID < 50428 || (\PHP_VERSION_ID >= 50500 && \PHP_VERSION_ID < 50512)) {
-            $meta = \stream_get_meta_data($resource);
-
-            if (isset($meta['stream_type']) && $meta['stream_type'] === 'STDIO') {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/src/ReadableResourceStream.php b/src/ReadableResourceStream.php
@@ -48,7 +48,7 @@ public function __construct($stream, LoopInterface $loop = null, $readChunkSize
 
         // ensure resource is opened for reading (fopen mode must contain "r" or "+")
         $meta = \stream_get_meta_data($stream);
-        if (isset($meta['mode']) && $meta['mode'] !== '' && \strpos($meta['mode'], 'r') === \strpos($meta['mode'], '+')) {
+        if (\strpos($meta['mode'], 'r') === \strpos($meta['mode'], '+')) {
             throw new InvalidArgumentException('Given stream resource is not opened in read mode');
         }
 
@@ -61,14 +61,9 @@ public function __construct($stream, LoopInterface $loop = null, $readChunkSize
         // Use unbuffered read operations on the underlying stream resource.
         // Reading chunks from the stream may otherwise leave unread bytes in
         // PHP's stream buffers which some event loop implementations do not
-        // trigger events on (edge triggered).
-        // This does not affect the default event loop implementation (level
-        // triggered), so we can ignore platforms not supporting this (HHVM).
-        // Pipe streams (such as STDIN) do not seem to require this and legacy
-        // PHP versions cause SEGFAULTs on unbuffered pipe streams, so skip this.
-        if (\function_exists('stream_set_read_buffer') && !$this->isLegacyPipe($stream)) {
-            \stream_set_read_buffer($stream, 0);
-        }
+        // trigger events on (edge triggered). This does not affect the default
+        // event loop implementation (level triggered).
+        \stream_set_read_buffer($stream, 0);
 
         $this->stream = $stream;
         $this->loop = $loop ?: Loop::get();
@@ -152,28 +147,4 @@ public function handleData()
             $this->close();
         }
     }
-
-    /**
-     * Returns whether this is a pipe resource in a legacy environment
-     *
-     * This works around a legacy PHP bug (#61019) that was fixed in PHP 5.4.28+
-     * and PHP 5.5.12+ and newer.
-     *
-     * @param resource $resource
-     * @return bool
-     * @link https://github.com/reactphp/child-process/issues/40
-     *
-     * @codeCoverageIgnore
-     */
-    private function isLegacyPipe($resource)
-    {
-        if (\PHP_VERSION_ID < 50428 || (\PHP_VERSION_ID >= 50500 && \PHP_VERSION_ID < 50512)) {
-            $meta = \stream_get_meta_data($resource);
-
-            if (isset($meta['stream_type']) && $meta['stream_type'] === 'STDIO') {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/src/WritableResourceStream.php b/src/WritableResourceStream.php
@@ -36,7 +36,7 @@ public function __construct($stream, LoopInterface $loop = null, $writeBufferSof
 
         // ensure resource is opened for writing (fopen mode must contain either of "waxc+")
         $meta = \stream_get_meta_data($stream);
-        if (isset($meta['mode']) && $meta['mode'] !== '' && \strtr($meta['mode'], 'waxc+', '.....') === $meta['mode']) {
+        if (\strtr($meta['mode'], 'waxc+', '.....') === $meta['mode']) {
             throw new \InvalidArgumentException('Given stream resource is not opened in write mode');
         }
 
diff --git a/tests/DuplexResourceStreamIntegrationTest.php b/tests/DuplexResourceStreamIntegrationTest.php
@@ -6,11 +6,7 @@
 use React\Stream\DuplexResourceStream;
 use React\Stream\ReadableResourceStream;
 use React\EventLoop\ExtEventLoop;
-use React\EventLoop\ExtLibeventLoop;
-use React\EventLoop\ExtLibevLoop;
 use React\EventLoop\LoopInterface;
-use React\EventLoop\LibEventLoop;
-use React\EventLoop\LibEvLoop;
 use React\EventLoop\StreamSelectLoop;
 
 class DuplexResourceStreamIntegrationTest extends TestCase
@@ -26,22 +22,6 @@ function () {
                     return new StreamSelectLoop();
                 }
             ),
-            array(
-                function () {
-                    return function_exists('event_base_new');
-                },
-                function () {
-                    return class_exists('React\EventLoop\ExtLibeventLoop') ? new ExtLibeventLoop() : new LibEventLoop();
-                }
-            ),
-            array(
-                function () {
-                    return class_exists('libev\EventLoop');
-                },
-                function () {
-                    return class_exists('React\EventLoop\ExtLibevLoop') ? new ExtLibevLoop() : new LibEvLoop();
-                }
-            ),
             array(
                 function () {
                     return class_exists('EventBase') && class_exists('React\EventLoop\ExtEventLoop');
diff --git a/tests/DuplexResourceStreamTest.php b/tests/DuplexResourceStreamTest.php
@@ -65,10 +65,6 @@ public function testConstructorThrowsExceptionOnInvalidStream()
      */
     public function testConstructorThrowsExceptionOnWriteOnlyStream()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM does not report fopen mode for STDOUT');
-        }
-
         $loop = $this->createLoopMock();
 
         $this->setExpectedException('InvalidArgumentException');
diff --git a/tests/FunctionalInternetTest.php b/tests/FunctionalInternetTest.php
@@ -87,8 +87,8 @@ public function testUploadBiggerBlockSecure()
 
         $stream = stream_socket_client('ssl://httpbin.org:443');
 
-        // PHP < 7.1.4 (and PHP < 7.0.18) suffers from a bug when writing big
-        // chunks of data over TLS streams at once.
+        // PHP < 7.1.4 suffers from a bug when writing big chunks of data over
+        // TLS streams at once.
         // We work around this by limiting the write chunk size to 8192 bytes
         // here to also support older PHP versions.
         // See https://github.com/reactphp/socket/issues/105
diff --git a/tests/ReadableResourceStreamTest.php b/tests/ReadableResourceStreamTest.php
@@ -64,10 +64,6 @@ public function testConstructorThrowsExceptionOnInvalidStream()
      */
     public function testConstructorThrowsExceptionOnWriteOnlyStream()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM does not report fopen mode for STDOUT');
-        }
-
         $loop = $this->createLoopMock();
 
         $this->setExpectedException('InvalidArgumentException');
diff --git a/tests/WritableResourceStreamTest.php b/tests/WritableResourceStreamTest.php
@@ -347,10 +347,6 @@ public function testEndWithoutDataDoesNotCloseIfWritableResourceStreamIsFull()
      */
     public function testEndWithDataClosesImmediatelyIfWritableResourceStreamFlushes()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Not supported on HHVM');
-        }
-
         $stream = fopen('php://temp', 'r+');
         $filterBuffer = '';
         $loop = $this->createLoopMock();

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct($stream, LoopInterface $loop = null, $writeBufferSof`
`36`	`36`
`37`	`37`	`// ensure resource is opened for writing (fopen mode must contain either of "waxc+")`
`38`	`38`	`$meta = \stream_get_meta_data($stream);`
`39`		`- if (isset($meta['mode']) && $meta['mode'] !== '' && \strtr($meta['mode'], 'waxc+', '.....') === $meta['mode']) {`
	`39`	`+ if (\strtr($meta['mode'], 'waxc+', '.....') === $meta['mode']) {`
`40`	`40`	`throw new \InvalidArgumentException('Given stream resource is not opened in write mode');`
`41`	`41`	`}`
`42`	`42`