Upgraded php version & dev tools

Author: shudd3r

.github/workflows/build.yml

@@ -3,11 +3,12 @@ on: [push, pull_request]
 
 jobs:
   full-build:
+    name: "Coding standards & coverage tests"
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ["7.4"]
+        operating-system: ['ubuntu-latest']
+        php-versions: ['7.4']
     env:
       extensions: pcov, dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
       key: cache-v2
@@ -36,15 +37,12 @@ jobs:
           ini-values: assert.exception=1, zend.assertions=1
       - name: "Validate composer.json"
         run: composer validate
-      - name: "Set composer cache directory"
-        id: composer-cache-full-build
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: "Setup composer cache"
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache-full-build.outputs.dir }}
-          key: ${{ runner.os }}-composer-full-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-full-
+          path: ~/.composer/cache
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: "Install highest dependencies"
         run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable
       - name: "Coding standard Php-CS-Fixer checks"
@@ -63,16 +61,19 @@ jobs:
           COVERALLS_RUN_LOCALLY: 1
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
-  lowest-build:
+  php-os-builds:
+    name: "PHP 8 tests"
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ["7.4"]
+        operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+        php-versions: ['8.0', '8.1']
     env:
       extensions: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
       key: cache-v2
     steps:
+      - name: "Turn off git EOL conversion"
+        run: git config --global core.autocrlf false
       - name: "Checkout"
         uses: actions/checkout@v2
       - name: "Setup PHP extensions cache environment"
@@ -95,16 +96,13 @@ jobs:
           coverage: none
           extensions: ${{ env.extensions }}
           ini-values: assert.exception=1, zend.assertions=1
-      - name: "Set composer cache directory"
-        id: composer-cache-lowest-build
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: "Setup composer cache"
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache-lowest-build.outputs.dir }}
-          key: ${{ runner.os }}-composer-low-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-low-
-      - name: "Install lowest dependencies"
-        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable --prefer-lowest
+          path: ~/.composer/cache
+          key: ${{ runner.os }}-php${{ matrix.php-versions }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-php${{ matrix.php-versions }}-composer-
+      - name: "Install highest dependencies"
+        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable
       - name: "Run PhpUnit tests (no coverage)"
         run: vendor/bin/phpunit --no-coverage

composer.json

@@ -5,7 +5,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.4",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0"
@@ -29,5 +29,12 @@
         "psr-4": {
             "Polymorphine\\Message\\Tests\\": "tests/"
         }
+    },
+    "scripts": {
+        "test-cs": [
+            "vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src tests",
+            "vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml src",
+            "vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --ignore=*/CodeSamples/* tests"
+        ]
     }
 }

tests/StreamTest.php

@@ -45,7 +45,7 @@ public function testInstantiateWithStreamName()
 
     public function testInstantiateWithStreamResource()
     {
-        $this->assertInstanceOf(StreamInterface::class, (new Stream(fopen('php://input', 'r+b'))));
+        $this->assertInstanceOf(StreamInterface::class, new Stream(fopen('php://input', 'r+b')));
     }
 
     public function testNonResourceConstructorArgument_ThrowsException()

tests/UriTest.php

@@ -126,10 +126,10 @@ public function testDefaultSchemePortLogic()
 
         $uri = $this->uri('http:foo.bar:500');
         $this->assertNull($uri->getPort(), 'This is relative path with scheme - port not specified');
-        $uri = $uri->withPort(443); //SET Port
+        $uri = $uri->withPort(443);
         $this->assertSame(443, $uri->getPort(), 'No host was given but port was set with modifier');
         $this->assertNull($this->uri((string) $uri)->getPort(), 'Without host port will not be part of uri string even if specified');
-        $uri = $uri->withHost('example.com'); //SET Host
+        $uri = $uri->withHost('example.com');
         $this->assertSame(443, $this->uri((string) $uri)->getPort(), 'Port included in uri string when host became present');
         $this->assertNull($this->uri((string) $uri->withScheme('https'))->getPort(), 'Changed scheme match its default port - not present in uri string');
     }
@@ -154,8 +154,8 @@ public function testBasicSegmentsConcatenationLogic()
         $this->assertSame('?foo=bar&baz=qux#foo', (string) $uri->withScheme('')->withHost('')->withPath(''));
         $this->assertSame('#foo', (string) $uri->withScheme('')->withHost('')->withPath('')->withQuery(''));
 
-        //Invalid links, but valid URIs
-        //Browsers would ignore 'http' scheme (but not https) and resolve these into valid relative links
+        // Invalid links, but valid URIs
+        // Browsers would ignore 'http' scheme (but not https) and resolve these into valid relative links
         $this->assertSame('https:/foo/bar?foo=bar&baz=qux#foo', (string) $uri->withUserInfo('')->withHost(''));
         $this->assertSame('https:/foo/bar?foo=bar&baz=qux#foo', (string) $uri->withHost(''));
         $this->assertSame('https:#foo', (string) $uri->withHost('')->withPath('')->withQuery(''));
@@ -316,7 +316,7 @@ public function testEncodedStringParametersAreNotDoubleEncoded()
         $this->assertSame('fo%C3%B3%20bar.baz', $uri->withHost('foó%20bar.baz')->getHost());
         $this->assertSame('%E2%9E%A1/foo%20bar', $uri->withPath('%E2%9E%A1/foo bar')->getPath());
         $this->assertSame('%E2%9E%A1=foo%20bar&%E4%BE%8B%E5%AD%90=%E6%B5%8B%E8%AF%95', $uri->withQuery('%E2%9E%A1=foo%20bar&%E4%BE%8B%E5%AD%90=测试')->getQuery());
-        $this->assertSame('%D9%85%D8%AB%D8%A7%D9%84', $uri->withFragment('مثا%D9%84')->getFragment()); //Right-to-left-literals
+        $this->assertSame('%D9%85%D8%AB%D8%A7%D9%84', $uri->withFragment('مثا%D9%84')->getFragment()); // Right-to-left-literals
     }
 
     public function testEncodedNormalizedToUppercase()