Cleanup build

.github/workflows/checks.yml

@@ -3,7 +3,7 @@ name: Checks
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:
@@ -13,18 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Composer normalize
         uses: docker://ergebnis/composer-normalize-action
-
-  roave-bc-check:
-    name: Roave BC Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga

.github/workflows/static.yml

@@ -3,7 +3,7 @@ name: Static analysis
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:
@@ -13,10 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Install legacy zend diactoros as we reference that as well
-        run: composer require "zendframework/zend-diactoros:2.2.1" --no-interaction --no-update
+        uses: actions/checkout@v3
 
       - name: PHPStan
         uses: docker://oskarstark/phpstan-ga
@@ -31,9 +28,9 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga:2.19.0
+        uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --dry-run --diff-format udiff
+          args: --dry-run --diff

.github/workflows/ci.yml → .github/workflows/tests.yml

@@ -1,7 +1,9 @@
-name: CI
+name: tests
 
 on:
   push:
+    branches:
+      - '*.x'
   pull_request:
 
 jobs:
@@ -10,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -23,12 +25,6 @@ jobs:
           tools: composer
           coverage: none
 
-      - name: Require PHPSpec 7.1 dependencies
-        run: |
-          composer require "phpspec/phpspec:^7.1@dev" --no-interaction --no-update
-          composer update --prefer-dist --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php == '8.1'"
-
       - name: Install dependencies
         run: composer update --prefer-dist --no-interaction --no-progress
 
@@ -44,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -67,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.gitignore

@@ -1,5 +1,5 @@
-.php_cs
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
 /build/
 /composer.lock
 /phpspec.yml

.php-cs-fixer.dist.php

@@ -0,0 +1,18 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/spec')
+    ->name('*.php')
+;
+
+$config = new PhpCsFixer\Config();
+
+return $config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        'single_line_throw' => false,
+    ])
+    ->setFinder($finder)
+;

README.md

@@ -2,7 +2,7 @@
 
 [![Latest Version](https://img.shields.io/github/release/php-http/message.svg?style=flat-square)](https://github.com/php-http/message/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/php-http/message/CI?style=flat-square)](https://github.com/php-http/message/actions?query=workflow%3ACI+branch%3Amaster)
+[![tests](https://github.com/php-http/message/actions/workflows/ci.yml/badge.svg)](https://github.com/php-http/message/actions/workflows/ci.yml)
 [![Total Downloads](https://img.shields.io/packagist/dt/php-http/message.svg?style=flat-square)](https://packagist.org/packages/php-http/message)
 
 **HTTP Message related tools.**

composer.json

@@ -43,11 +43,6 @@
             "ergebnis/composer-normalize": true
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.10-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "Http\\Message\\": "src/"

phpstan-baseline.neon

@@ -80,11 +80,6 @@ parameters:
 			count: 1
 			path: src/CookieJar.php
 
-		-
-			message: "#^Method Http\\\\Message\\\\CookieJar\\:\\:findMatchingCookies\\(\\) should return array\\<Http\\\\Message\\\\Cookie\\> but returns array\\<int, object\\>\\.$#"
-			count: 1
-			path: src/CookieJar.php
-
 		-
 			message: "#^Method Http\\\\Message\\\\CookieJar\\:\\:setCookies\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -115,11 +110,6 @@ parameters:
 			count: 1
 			path: src/CookieJar.php
 
-		-
-			message: "#^Method Http\\\\Message\\\\CookieJar\\:\\:getIterator\\(\\) return type has no value type specified in iterable type Traversable\\<mixed, mixed\\>\\.$#"
-			count: 1
-			path: src/CookieJar.php
-
 		-
 			message: "#^Property Http\\\\Message\\\\CookieUtil\\:\\:\\$dateFormats type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -130,11 +120,6 @@ parameters:
 			count: 1
 			path: src/Encoding/ChunkStream.php
 
-		-
-			message: "#^Access to an undefined property object\\:\\:\\$datalen\\.$#"
-			count: 2
-			path: src/Encoding/Filter/Chunk.php
-
 		-
 			message: "#^Method Http\\\\Message\\\\Encoding\\\\FilteredStream\\:\\:fill\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -264,3 +249,8 @@ parameters:
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
 			path: src/UriFactory/SlimUriFactory.php
+
+		-
+			message: "#^Call to function array_key_exists\\(\\) with 'chunk' and array<int, string> will always evaluate to false\\.$#"
+			count: 1
+			path: src/filters.php

phpstan.neon.dist

@@ -5,3 +5,8 @@ parameters:
     level: max
     paths:
         - src
+    excludePaths:
+        analyse:
+            - %currentWorkingDirectory%/src/MessageFactory/*
+            - %currentWorkingDirectory%/src/StreamFactory/*
+            - %currentWorkingDirectory%/src/UriFactory/*

spec/Authentication/AutoBasicAuthSpec.php

@@ -3,23 +3,22 @@
 namespace spec\Http\Message\Authentication;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
 class AutoBasicAuthSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\AutoBasicAuth');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(
+    public function it_authenticates_a_request(
         RequestInterface $request,
         UriInterface $uri,
         UriInterface $uriWithoutUserInfo,
@@ -38,7 +37,7 @@ function it_authenticates_a_request(
         $this->authenticate($request)->shouldReturn($authenticatedRequest);
     }
 
-    function it_authenticates_a_request_without_password(
+    public function it_authenticates_a_request_without_password(
         RequestInterface $request,
         UriInterface $uri,
         UriInterface $uriWithoutUserInfo,
@@ -57,15 +56,15 @@ function it_authenticates_a_request_without_password(
         $this->authenticate($request)->shouldReturn($authenticatedRequest);
     }
 
-    function it_does_not_authenticate_a_request(RequestInterface $request, UriInterface $uri)
+    public function it_does_not_authenticate_a_request(RequestInterface $request, UriInterface $uri)
     {
         $request->getUri()->willReturn($uri);
         $uri->getUserInfo()->willReturn('');
 
         $this->authenticate($request)->shouldReturn($request);
     }
 
-    function it_authenticates_a_request_without_user_info_removal(
+    public function it_authenticates_a_request_without_user_info_removal(
         RequestInterface $request,
         UriInterface $uri,
         RequestInterface $authenticatedRequest

spec/Authentication/BasicAuthSpec.php

@@ -2,27 +2,27 @@
 
 namespace spec\Http\Message\Authentication;
 
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class BasicAuthSpec extends ObjectBehavior
 {
-    function let()
+    public function let()
     {
         $this->beConstructedWith('john.doe', 'secret');
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\BasicAuth');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
+    public function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Basic '.base64_encode('john.doe:secret'))->willReturn($newRequest);
 

spec/Authentication/BearerSpec.php

@@ -2,27 +2,27 @@
 
 namespace spec\Http\Message\Authentication;
 
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class BearerSpec extends ObjectBehavior
 {
-    function let()
+    public function let()
     {
         $this->beConstructedWith('token');
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Bearer');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
+    public function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Bearer token')->willReturn($newRequest);
 

spec/Authentication/ChainSpec.php

@@ -3,29 +3,29 @@
 namespace spec\Http\Message\Authentication;
 
 use Http\Message\Authentication;
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class ChainSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Chain');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_throws_an_exception_when_non_authentication_is_passed()
+    public function it_throws_an_exception_when_non_authentication_is_passed()
     {
         $this->beConstructedWith(['authentication']);
 
         $this->shouldThrow('InvalidArgumentException')->duringInstantiation();
     }
 
-    function it_authenticates_a_request(
+    public function it_authenticates_a_request(
         Authentication $auth1,
         Authentication $auth2,
         RequestInterface $originalRequest,