Merge pull request #325 from williamdes/1.4.x

Backports for 1.4.x

Author: akrabat

.github/workflows/tests.yml

@@ -10,17 +10,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: [7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
         experimental: [false]
+        dependency-versions: ['locked']
+        coverage: [false]
         include:
+          - php: 7.2
+            experimental: false
+            dependency-versions: lowest
+            coverage: false
           - php: 8.0
             analysis: true
-          - php: 8.1
+            coverage: false
+          - php: nightly
             experimental: true
+            coverage: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2
@@ -30,6 +38,8 @@ jobs:
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v1
+        with:
+          dependency-versions: ${{ matrix.dependency-versions }}
 
       - name: Coding standards
         if: matrix.analysis
@@ -40,10 +50,10 @@ jobs:
         run: vendor/bin/phpstan analyse src
 
       - name: Tests
-        run: vendor/bin/phpunit --coverage-clover clover.xml
+        run: vendor/bin/phpunit --no-coverage
 
       - name: Upload coverage results to Coveralls
-        if: matrix.analysis
+        if: matrix.coverage
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |

composer.json

@@ -38,10 +38,10 @@
   "require-dev": {
     "ext-json": "*",
     "adriansuter/php-autoload-override": "^1.2",
-    "http-interop/http-factory-tests": "^0.9.0",
-    "php-http/psr7-integration-tests": "dev-master",
+    "http-interop/http-factory-tests": "^1.0 || ^2.0",
+    "php-http/psr7-integration-tests": "^1.3",
     "phpstan/phpstan": "^0.12",
-    "phpunit/phpunit": "^8.5 || ^9.5",
+    "phpunit/phpunit": "^8.5 || ^9.5 || ^10",
     "squizlabs/php_codesniffer": "^3.6",
     "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
   },

src/Factory/StreamFactory.php

@@ -51,7 +51,7 @@ public function createStream(string $content = ''): StreamInterface
     public function createStreamFromFile(
         string $filename,
         string $mode = 'r',
-        StreamInterface $cache = null
+        ?StreamInterface $cache = null
     ): StreamInterface {
         set_error_handler(
             static function (int $errno, string $errstr) use ($filename, $mode): void {
@@ -82,7 +82,7 @@ static function (int $errno, string $errstr) use ($filename, $mode): void {
     /**
      * {@inheritdoc}
      */
-    public function createStreamFromResource($resource, StreamInterface $cache = null): StreamInterface
+    public function createStreamFromResource($resource, ?StreamInterface $cache = null): StreamInterface
     {
         if (!is_resource($resource)) {
             throw new InvalidArgumentException(

src/Stream.php

@@ -90,11 +90,11 @@ class Stream implements StreamInterface
 
     /**
      * @param  resource $stream  A PHP resource handle.
-     * @param  StreamInterface $cache A stream to cache $stream (useful for non-seekable streams)
+     * @param  StreamInterface|null $cache A stream to cache $stream (useful for non-seekable streams)
      *
      * @throws InvalidArgumentException If argument is not a resource.
      */
-    public function __construct($stream, StreamInterface $cache = null)
+    public function __construct($stream, ?StreamInterface $cache = null)
     {
         $this->attach($stream);
 

src/Uri.php

@@ -217,7 +217,7 @@ protected function filterUserInfo(?string $info = null): string
         }
 
         $match =  preg_replace_callback(
-            '/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=]+|%(?![A-Fa-f0-9]{2}))/u',
+            '/(?:[^%a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=]+|%(?![A-Fa-f0-9]{2}))/',
             function ($match) {
                 return rawurlencode($match[0]);
             },
@@ -328,7 +328,14 @@ protected function filterPort($port): ?int
      */
     public function getPath(): string
     {
-        return $this->path;
+        $path = $this->path;
+
+        // If the path starts with a / then remove all leading slashes except one.
+        if (strpos($path, '/') === 0) {
+            $path = '/' . ltrim($path, '/');
+        }
+
+        return $path;
     }
 
     /**
@@ -480,11 +487,13 @@ public function __toString(): string
     {
         $scheme = $this->getScheme();
         $authority = $this->getAuthority();
-        $path = $this->getPath();
+        $path = $this->path;
         $query = $this->getQuery();
         $fragment = $this->getFragment();
 
-        $path = '/' . ltrim($path, '/');
+        if (! str_starts_with($path, '/')) {
+            $path = '/' . $path;
+        }
 
         return ($scheme !== '' ? $scheme . ':' : '')
             . ($authority !== '' ? '//' . $authority : '')

tests/Integration/StreamTest.php

@@ -24,6 +24,14 @@ class StreamTest extends StreamIntegrationTest
 {
     use BaseTestFactories;
 
+    /**
+     * @var array with functionName => reason
+     */
+    protected $skippedTests = [
+        'testGetContentsError' => 'PHP 7.3 and 7.4 fail this test: stream_get_contents()'
+                                . ': supplied resource is not a valid stream resource'
+    ];
+
     /**
      * @param string|resource|StreamInterface $data
      *

tests/Integration/UploadedFileTest.php

@@ -21,6 +21,13 @@ class UploadedFileTest extends UploadedFileIntegrationTest
 {
     use BaseTestFactories;
 
+    /**
+     * @var array with functionName => reason
+     */
+    protected $skippedTests = [
+        'testGetSize' => 'PHP 7.2 fail this test: Failed asserting that \'\' matches PCRE pattern "|^[0-9]+$|"'
+    ];
+
     /**
      * @return UploadedFileInterface
      */

tests/ResponseTest.php

@@ -144,13 +144,8 @@ public function testResonPhraseContainsLineFeed()
 
     public function testWithStatusValidReasonPhraseObject()
     {
-        $mock = $this->getMockBuilder('ResponseTestReasonPhrase')->setMethods(['__toString'])->getMock();
-        $mock->expects($this->once())
-            ->method('__toString')
-            ->will($this->returnValue('Slim OK'));
-
         $response = new Response();
-        $response = $response->withStatus(200, $mock);
+        $response = $response->withStatus(200, new StringableTestObject('Slim OK'));
         $this->assertEquals('Slim OK', $response->getReasonPhrase());
     }
 

tests/StringableTestObject.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim-Psr7/blob/master/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Tests\Psr7;
+
+final class StringableTestObject implements \Stringable
+{
+    /** @var string */
+    private $value;
+
+    public function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public function __toString(): string
+    {
+        return $this->value;
+    }
+}

tests/UploadedFileTest.php

@@ -452,7 +452,7 @@ public function testCreateUploadedFileWithInvalidUri()
         new UploadedFile($stream);
     }
 
-    public function providerCreateFromGlobals()
+    public static function providerCreateFromGlobals()
     {
         return [
             // no nest: <input name="avatar" type="file">