Add support for PHPUnit 10 & drop support for PHP 7.x (#23)

martinssipenko · web-flow · commit a6fbcc38394d · 2023-03-04T10:19:06.000+01:00
* Add support for PHPUnit 10 &amp; drop support from PHP 7.x

* Allow PHPUnit 10

* Prep for PHPUnit 10

* bump

* v5

* PHPUnit 10 support
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -12,33 +12,24 @@ jobs:
   build:
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4']
-        phpunit: ['8.0', '9.0']
-        composer-arg: ['']
-        include:
-          - php: '8.0'
-            phpunit: '9.0'
-            composer-arg: 'ignore-platform-req=php'
+        php: ['8.0', '8.1', '8.2']
+        phpunit: ['8.0', '9.0', '10.0']
         exclude:
           - php: '8.0'
-            phpunit: '8.0'
-          - php: '7.2'
-            phpunit: '9.0'
+            phpunit: '10.0'
     runs-on: ubuntu-latest
-
-    continue-on-error: ${{ matrix.php == '8.0' }}
     name: PHP ${{ matrix.php }}, PHPUnit ${{ matrix.phpunit }}
 
     steps:
     - uses: actions/checkout@v1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
         extensions: mbstring, intl, json
+        ini-values: error_reporting=E_ALL
         coverage: pcov
-
         tools: composer:v2
 
     - name: Validate composer.json and composer.lock
@@ -49,10 +40,10 @@ jobs:
         composer require --no-update --dev phpunit/phpunit ~${{ matrix.phpunit }}
 
     - name: Install dependencies
-      run: composer install --prefer-dist --no-progress --no-suggest --${{ matrix.composer-arg }}
+      run: composer install --prefer-dist --no-progress --no-suggest
 
     #- name: Run type checker
     #  run: ./vendor/bin/psalm
 
     - name: Run unit tests
-      run: ./vendor/bin/phpunit --testdox
+      run: ./vendor/bin/phpunit --testdox --no-coverage
diff --git a/.github/workflows/php_coverage.yml b/.github/workflows/php_coverage.yml
@@ -12,17 +12,17 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.0
         extensions: mbstring, intl, json
         coverage: pcov
-    
+
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress --no-suggest
-  
+
     - name: Test & publish code coverage
-      uses: paambaati/codeclimate-action@v2.3.0
+      uses: paambaati/codeclimate-action@v3.0.0
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.codeClimateReporterID }}
       with:
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /build/
 /composer.lock
 /vendor/
+/.phpunit.cache/
 .phpunit.result.cache
 
 /.idea/
diff --git a/README.md b/README.md
@@ -24,12 +24,12 @@ There are several release branches of this library, each of these being compatib
 with different releases of PHPUnit and PHP. The following table should give an
 easy overview:
 
-| PSR-7 assertion version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 | PHPUnit 9 |
-| ----------------------- | --------- | --------- | --------- | --------- | --------- | --------- |
-| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
-| v2 (branch `v2`), **unsupported** | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
-| v3 (branch `v3`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: |
-| v4 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: |
+| PSR-7 assertion version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 | PHPUnit 9 | PHPUnit 10 |
+| ----------------------- | --------- | --------- | --------- | --------- | --------- | --------- | ---------- |
+| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
+| v2 (branch `v2`), **unsupported** | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
+| v3 (branch `v3`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
+| v4 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 When you are using `composer require` and have already declared a dependency to
 `phpunit/phpunit` in your `composer.json` file, Composer should pick latest
diff --git a/composer.json b/composer.json
@@ -9,16 +9,17 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0",
         "helmich/phpunit-json-assert": "^3.4",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.2",
-        "phpunit/phpunit": "^8.0 || ^9.0"
+        "mockery/mockery": "^1.4.1",
+        "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<8.0 || >= 10.0"
+        "phpunit/phpunit": "<8.0 || >= 11.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,14 +1,13 @@
+<?xml version="1.0"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.1/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
         bootstrap="vendor/autoload.php"
         colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
         timeoutForSmallTests="1"
         timeoutForMediumTests="10"
-        timeoutForLargeTests="60">
+        timeoutForLargeTests="60"
+        cacheDirectory=".phpunit.cache">
     <testsuites>
         <testsuite name="functional">
             <directory>tests/Functional</directory>
@@ -18,13 +17,14 @@
         </testsuite>
     </testsuites>
     <logging>
-        <log type="coverage-html" target="build/coverage" lowUpperBound="35"
-             highLowerBound="70"/>
-        <log type="junit" target="build/phpunit"/>
+        <junit outputFile="build/phpunit"/>
     </logging>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage>
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+        </include>
+        <report>
+            <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/src/Functions.php b/src/Functions.php
@@ -6,7 +6,7 @@
 use Helmich\Psr7Assert\Constraint\HasHeaderConstraint;
 use Helmich\Psr7Assert\Constraint\HasUriConstraint;
 use Helmich\Psr7Assert\Constraint\IsAbsoluteUriConstraint;
-use Helmich\Psr7Assert\Psr7Assertions;
+use Helmich\Psr7Assert\Psr7AssertionsClass;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Constraint\Constraint;
 
@@ -22,42 +22,42 @@ function hasHeader(string $name, $constraint = null): HasHeaderConstraint
 
 function hasHeaders(array $constraints): Constraint
 {
-    return Psr7Assertions::hasHeaders($constraints);
+    return Psr7AssertionsClass::hasHeaders($constraints);
 }
 
 function hasStatus($status): Constraint
 {
-    return Psr7Assertions::hasStatus($status);
+    return Psr7AssertionsClass::hasStatus($status);
 }
 
 function hasQueryParameter($name, $value = null): Constraint
 {
-    return Psr7Assertions::hasQueryParameter($name, $value);
+    return Psr7AssertionsClass::hasQueryParameter($name, $value);
 }
 
 function hasQueryParameters(array $constraints): Constraint
 {
-    return Psr7Assertions::hasQueryParameters($constraints);
+    return Psr7AssertionsClass::hasQueryParameters($constraints);
 }
 
 function isSuccess(): Constraint
 {
-    return Psr7Assertions::isSuccess();
+    return Psr7AssertionsClass::isSuccess();
 }
 
 function isRedirect(): Constraint
 {
-    return Psr7Assertions::isRedirect();
+    return Psr7AssertionsClass::isRedirect();
 }
 
 function isClientError(): Constraint
 {
-    return Psr7Assertions::isClientError();
+    return Psr7AssertionsClass::isClientError();
 }
 
 function isServerError(): Constraint
 {
-    return Psr7Assertions::isServerError();
+    return Psr7AssertionsClass::isServerError();
 }
 
 function hasContentType(string $contentType): Constraint
@@ -70,27 +70,27 @@ function hasContentType(string $contentType): Constraint
 
 function hasMethod(string $method): Constraint
 {
-    return Psr7Assertions::hasMethod($method);
+    return Psr7AssertionsClass::hasMethod($method);
 }
 
 function isGet(): Constraint
 {
-    return Psr7Assertions::isGet();
+    return Psr7AssertionsClass::isGet();
 }
 
 function isPost(): Constraint
 {
-    return Psr7Assertions::isPost();
+    return Psr7AssertionsClass::isPost();
 }
 
 function isPut(): Constraint
 {
-    return Psr7Assertions::isPut();
+    return Psr7AssertionsClass::isPut();
 }
 
 function isDelete(): Constraint
 {
-    return Psr7Assertions::isDelete();
+    return Psr7AssertionsClass::isDelete();
 }
 
 function bodyMatches($constraint): Constraint
@@ -113,7 +113,7 @@ function bodyMatchesJson($constraints): Constraint
 
 function bodyMatchesForm(array $constraints): Constraint
 {
-    return Psr7Assertions::bodyMatchesForm($constraints);
+    return Psr7AssertionsClass::bodyMatchesForm($constraints);
 }
 
 function isAbsoluteUri(): Constraint
diff --git a/src/Psr7Assertions.php b/src/Psr7Assertions.php
@@ -193,10 +193,7 @@ public static function hasHeaders(array $constraints): Constraint
             $headerConstraints[] = new HasHeaderConstraint($name, $constraint);
         }
 
-        $conjunction = Assert::logicalAnd();
-        $conjunction->setConstraints($headerConstraints);
-
-        return $conjunction;
+        return Assert::logicalAnd(...$headerConstraints);
     }
 
     public static function hasHeaderEqualTo(string $name, string $expected): Constraint
diff --git a/src/Psr7AssertionsClass.php b/src/Psr7AssertionsClass.php
@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+namespace Helmich\Psr7Assert;
+
+class Psr7AssertionsClass
+{
+    use Psr7Assertions;
+}
diff --git a/tests/Functional/ConstraintTest.php b/tests/Functional/ConstraintTest.php
@@ -102,7 +102,7 @@ public function testBodyMatchesJsonCanSucceedWithCharset()
         $this->assertMessageBodyMatchesJson($request, array('$.foo' => 'bar'));
     }
 
-    public function dataForRequestMethods()
+    public static function dataForRequestMethods()
     {
         return [
             ['GET'],
@@ -172,7 +172,7 @@ public function testIsDeleteCanFail()
         $this->assertRequestIsDelete(new Request('POST', '/'));
     }
 
-    public function dataForStatusCodes()
+    public static function dataForStatusCodes()
     {
         return [
             [200],
diff --git a/tests/Functional/FunctionalConstraintTest.php b/tests/Functional/FunctionalConstraintTest.php
@@ -90,7 +90,7 @@ public function testBodyMatchesJsonCanSucceed()
         self::assertThat($request, bodyMatchesJson(['$.foo' => 'bar']));
     }
 
-    public function dataForRequestMethods()
+    public static function dataForRequestMethods()
     {
         return [
             ['GET'],
@@ -160,7 +160,7 @@ public function testIsDeleteCanFail()
         self::assertThat(new Request('POST', '/'), isDelete());
     }
 
-    public function dataForStatusCodes()
+    public static function dataForStatusCodes()
     {
         return [
             [200],
diff --git a/tests/Unit/Constraint/BodyMatchesConstraintTest.php b/tests/Unit/Constraint/BodyMatchesConstraintTest.php
@@ -4,13 +4,13 @@
 
 use GuzzleHttp\Psr7\Request;
 use Helmich\Psr7Assert\Constraint\BodyMatchesConstraint;
+use Mockery;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\TestCase;
 
 class BodyMatchesConstraintTest extends TestCase
 {
-
-    public function dataForBadTypes()
+    public static function dataForBadTypes()
     {
         return [
             ['foo'],
@@ -25,13 +25,13 @@ public function dataForBadTypes()
      */
     public function testMatchFailsOnWrongType($var)
     {
-        $inner = $this->prophesize(Constraint::class);
+        $inner = Mockery::mock(Constraint::class);
 
-        $constraint = new BodyMatchesConstraint($inner->reveal());
+        $constraint = new BodyMatchesConstraint($inner);
         self::assertThat($constraint->evaluate($var, '', true), self::isFalse());
     }
 
-    public function dataForInnerConstraintIsEvaluatedWithMessageContent()
+    public static function dataForInnerConstraintIsEvaluatedWithMessageContent()
     {
         return [
             [uniqid(), true],
@@ -50,11 +50,14 @@ public function testInnerConstraintIsEvaluatedWithMessageContent($body, $matches
     {
         $request = new Request('POST', '/', [], $body);
 
-        $inner = $this->prophesize(Constraint::class);
-        $inner->evaluate($body, '', true)->shouldBeCalled()->willReturn($matches);
+        $inner = Mockery::mock(Constraint::class, function ($mock) use ($body, $matches) {
+            $mock->shouldReceive('evaluate')
+                ->with($body, '', true)
+                ->andReturn($matches);
+        });
 
-        $constraint = new BodyMatchesConstraint($inner->reveal());
+        $constraint = new BodyMatchesConstraint($inner);
         self::assertThat($constraint->evaluate($request, '', true), self::equalTo($matches));
     }
 
-}
+}
diff --git a/tests/Unit/Constraint/HasHeaderConstraintTest.php b/tests/Unit/Constraint/HasHeaderConstraintTest.php
@@ -10,7 +10,7 @@
 class HasHeaderConstraintTest extends TestCase
 {
 
-    public function dataForHeaderValues()
+    public static function dataForHeaderValues()
     {
         return [
             ['foo'],
diff --git a/tests/Unit/Constraint/IsAbsoluteUriConstraintTest.php b/tests/Unit/Constraint/IsAbsoluteUriConstraintTest.php

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Helmich\Psr7Assert\Constraint\HasHeaderConstraint;`
`7`	`7`	`use Helmich\Psr7Assert\Constraint\HasUriConstraint;`
`8`	`8`	`use Helmich\Psr7Assert\Constraint\IsAbsoluteUriConstraint;`
`9`		`-use Helmich\Psr7Assert\Psr7Assertions;`
	`9`	`+use Helmich\Psr7Assert\Psr7AssertionsClass;`
`10`	`10`	`use PHPUnit\Framework\Assert;`
`11`	`11`	`use PHPUnit\Framework\Constraint\Constraint;`
`12`	`12`
`@@ -22,42 +22,42 @@ function hasHeader(string $name, $constraint = null): HasHeaderConstraint`
`22`	`22`
`23`	`23`	`function hasHeaders(array $constraints): Constraint`
`24`	`24`	`{`
`25`		`- return Psr7Assertions::hasHeaders($constraints);`
	`25`	`+ return Psr7AssertionsClass::hasHeaders($constraints);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`function hasStatus($status): Constraint`
`29`	`29`	`{`
`30`		`- return Psr7Assertions::hasStatus($status);`
	`30`	`+ return Psr7AssertionsClass::hasStatus($status);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`function hasQueryParameter($name, $value = null): Constraint`
`34`	`34`	`{`
`35`		`- return Psr7Assertions::hasQueryParameter($name, $value);`
	`35`	`+ return Psr7AssertionsClass::hasQueryParameter($name, $value);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function hasQueryParameters(array $constraints): Constraint`
`39`	`39`	`{`
`40`		`- return Psr7Assertions::hasQueryParameters($constraints);`
	`40`	`+ return Psr7AssertionsClass::hasQueryParameters($constraints);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`function isSuccess(): Constraint`
`44`	`44`	`{`
`45`		`- return Psr7Assertions::isSuccess();`
	`45`	`+ return Psr7AssertionsClass::isSuccess();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`function isRedirect(): Constraint`
`49`	`49`	`{`
`50`		`- return Psr7Assertions::isRedirect();`
	`50`	`+ return Psr7AssertionsClass::isRedirect();`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`function isClientError(): Constraint`
`54`	`54`	`{`
`55`		`- return Psr7Assertions::isClientError();`
	`55`	`+ return Psr7AssertionsClass::isClientError();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`function isServerError(): Constraint`
`59`	`59`	`{`
`60`		`- return Psr7Assertions::isServerError();`
	`60`	`+ return Psr7AssertionsClass::isServerError();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`function hasContentType(string $contentType): Constraint`
`@@ -70,27 +70,27 @@ function hasContentType(string $contentType): Constraint`
`70`	`70`
`71`	`71`	`function hasMethod(string $method): Constraint`
`72`	`72`	`{`
`73`		`- return Psr7Assertions::hasMethod($method);`
	`73`	`+ return Psr7AssertionsClass::hasMethod($method);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`function isGet(): Constraint`
`77`	`77`	`{`
`78`		`- return Psr7Assertions::isGet();`
	`78`	`+ return Psr7AssertionsClass::isGet();`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`function isPost(): Constraint`
`82`	`82`	`{`
`83`		`- return Psr7Assertions::isPost();`
	`83`	`+ return Psr7AssertionsClass::isPost();`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`function isPut(): Constraint`
`87`	`87`	`{`
`88`		`- return Psr7Assertions::isPut();`
	`88`	`+ return Psr7AssertionsClass::isPut();`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`function isDelete(): Constraint`
`92`	`92`	`{`
`93`		`- return Psr7Assertions::isDelete();`
	`93`	`+ return Psr7AssertionsClass::isDelete();`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`function bodyMatches($constraint): Constraint`
`@@ -113,7 +113,7 @@ function bodyMatchesJson($constraints): Constraint`
`113`	`113`
`114`	`114`	`function bodyMatchesForm(array $constraints): Constraint`
`115`	`115`	`{`
`116`		`- return Psr7Assertions::bodyMatchesForm($constraints);`
	`116`	`+ return Psr7AssertionsClass::bodyMatchesForm($constraints);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`function isAbsoluteUri(): Constraint`
Original file line number	Diff line number	Diff line change
`@@ -193,10 +193,7 @@ public static function hasHeaders(array $constraints): Constraint`
`193`	`193`	`$headerConstraints[] = new HasHeaderConstraint($name, $constraint);`
`194`	`194`	`}`
`195`	`195`
`196`		`- $conjunction = Assert::logicalAnd();`
`197`		`- $conjunction->setConstraints($headerConstraints);`
`198`		`-`
`199`		`- return $conjunction;`
	`196`	`+ return Assert::logicalAnd(...$headerConstraints);`
`200`	`197`	`}`
`201`	`198`
`202`	`199`	`public static function hasHeaderEqualTo(string $name, string $expected): Constraint`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function testBodyMatchesJsonCanSucceedWithCharset()`
`102`	`102`	`$this->assertMessageBodyMatchesJson($request, array('$.foo' => 'bar'));`
`103`	`103`	`}`
`104`	`104`
`105`		`- public function dataForRequestMethods()`
	`105`	`+ public static function dataForRequestMethods()`
`106`	`106`	`{`
`107`	`107`	`return [`
`108`	`108`	`['GET'],`
`@@ -172,7 +172,7 @@ public function testIsDeleteCanFail()`
`172`	`172`	`$this->assertRequestIsDelete(new Request('POST', '/'));`
`173`	`173`	`}`
`174`	`174`
`175`		`- public function dataForStatusCodes()`
	`175`	`+ public static function dataForStatusCodes()`
`176`	`176`	`{`
`177`	`177`	`return [`
`178`	`178`	`[200],`