Merge branch 'martinssipenko-master'

martin-helmich · martin-helmich · commit 1138c88009e5 · 2019-03-22T18:54:32.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /build/
 /composer.lock
 /vendor/
+.phpunit.result.cache
 
 /.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,15 @@
 language: php
 sudo: false
 php:
+  - 7.3
   - 7.2
-  - 7.1
 install:
-  - composer install --prefer-dist
+  - composer install --optimize-autoloader --prefer-dist --no-interaction
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script:
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-after_success:
-  - vendor/bin/test-reporter
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ interfaces.
 
 ## Author and copyright
 
-Martin Helmich <kontakt@martin-helmich.de>  
+Martin Helmich <kontakt@martin-helmich.de>
 This library is [MIT-licensed](LICENSE.txt).
 
 ## Installation
@@ -24,11 +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 |
-| ----------------------- | --------- | --------- | --------- | --------- |
-| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: |
-| v2 (branch `v2`) | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: |
-| v3 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: |
+| PSR-7 assertion version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 |
+| ----------------------- | --------- | --------- | --------- | --------- | --------- |
+| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
+| v2 (branch `v2`) | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: |
+| v3 (branch `v3`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :no_entry_sign: |
+| v4 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :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
@@ -204,7 +205,7 @@ The `$uriOrRequest` value may be
 
 - a string, which will be interpreted as URI
 - an instance of the `Psr\Http\Message\UriInterface` interface
-- an instance of the `Psr\Http\Message\RequestInterface` interface 
+- an instance of the `Psr\Http\Message\RequestInterface` interface
 
 [composer-autoload]: https://getcomposer.org/doc/04-schema.md#autoload-dev
 [json-assert]: https://packagist.org/packages/helmich/phpunit-json-assert
diff --git a/composer.json b/composer.json
@@ -9,17 +9,16 @@
         }
     ],
     "require": {
-        "psr/http-message": "^1.0",
-        "helmich/phpunit-json-assert": "^2.0",
-        "php": ">=7.1"
+        "php": "^7.1",
+        "helmich/phpunit-json-assert": "^3.0",
+        "psr/http-message": "^1.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.2",
-        "phpunit/phpunit": "^7.0",
-        "codeclimate/php-test-reporter": "dev-master"
+        "phpunit/phpunit": "^8.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<7.0 || >= 8.0"
+        "phpunit/phpunit": "<8.0 || >= 9.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,5 +31,8 @@
             "vendor/helmich/phpunit-json-assert/src/Functions.php",
             "src/Functions.php"
         ]
+    },
+    "config": {
+        "sort-packages": true
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -6,7 +6,6 @@
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
-        mapTestClassNameToCoveredClassName="false"
         timeoutForSmallTests="1"
         timeoutForMediumTests="10"
         timeoutForLargeTests="60">
@@ -21,11 +20,11 @@
     <logging>
         <log type="coverage-html" target="build/coverage" lowUpperBound="35"
              highLowerBound="70"/>
-        <log type="junit" target="build/phpunit" logIncompleteSkipped="false"/>
+        <log type="junit" target="build/phpunit"/>
     </logging>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>
diff --git a/src/Constraint/BodyMatchesConstraint.php b/src/Constraint/BodyMatchesConstraint.php
@@ -13,7 +13,6 @@ class BodyMatchesConstraint extends Constraint
 
     public function __construct(Constraint $constraint)
     {
-        parent::__construct();
         $this->constraint = $constraint;
     }
 
diff --git a/src/Constraint/HasHeaderConstraint.php b/src/Constraint/HasHeaderConstraint.php
@@ -17,8 +17,6 @@ class HasHeaderConstraint extends Constraint
 
     public function __construct(string $name, $constraint = null)
     {
-        parent::__construct();
-
         if ($constraint === null) {
             $constraint = Assert::logicalNot(Assert::isEmpty());
         } elseif (!$constraint instanceof Constraint) {
diff --git a/src/Constraint/HasMethodConstraint.php b/src/Constraint/HasMethodConstraint.php
@@ -13,7 +13,6 @@ class HasMethodConstraint extends Constraint
 
     public function __construct(string $method)
     {
-        parent::__construct();
         $this->method = $method;
     }
 
diff --git a/src/Constraint/HasQueryParameterConstraint.php b/src/Constraint/HasQueryParameterConstraint.php
@@ -13,8 +13,6 @@ class HasQueryParameterConstraint extends Constraint
 
     public function __construct($nameMatcher, $valueMatcher = null)
     {
-        parent::__construct();
-
         $this->inner = new UrlEncodedMatches($nameMatcher, $valueMatcher);
     }
 
@@ -61,4 +59,4 @@ public function toString(): string
     {
         return 'query string ' . $this->inner->toString();
     }
-}
+}
diff --git a/src/Constraint/HasStatusConstraint.php b/src/Constraint/HasStatusConstraint.php
@@ -14,8 +14,6 @@ class HasStatusConstraint extends Constraint
 
     public function __construct($status)
     {
-        parent::__construct();
-
         if (!$status instanceof Constraint) {
             $status = Assert::equalTo($status);
         }
diff --git a/src/Constraint/HasUriConstraint.php b/src/Constraint/HasUriConstraint.php
@@ -13,7 +13,6 @@ class HasUriConstraint extends Constraint
 
     public function __construct(string $uri)
     {
-        parent::__construct();
         $this->uri = $uri;
     }
 
diff --git a/src/Constraint/UrlEncodedMatches.php b/src/Constraint/UrlEncodedMatches.php
@@ -12,8 +12,6 @@ class UrlEncodedMatches extends Constraint
 
     public function __construct($nameMatcher, $valueMatcher = null)
     {
-        parent::__construct();
-
         if (!($nameMatcher instanceof Constraint)) {
             $nameMatcher = new IsEqual($nameMatcher);
         }
@@ -53,4 +51,4 @@ public function toString(): string
     }
 
 
-}
+}
diff --git a/src/Constraint/UrlEncodedMatchesMany.php b/src/Constraint/UrlEncodedMatchesMany.php
@@ -10,8 +10,6 @@ class UrlEncodedMatchesMany extends Constraint
 
     public function __construct(array $constraints)
     {
-        parent::__construct();
-
         foreach ($constraints as $key => $value) {
             $this->constraints[] = new UrlEncodedMatches($key, $value);
         }
@@ -35,4 +33,4 @@ public function toString(): string
             return $c->toString();
         }, $this->constraints));
     }
-}
+}
diff --git a/tests/Functional/ConstraintTest.php b/tests/Functional/ConstraintTest.php
@@ -6,6 +6,7 @@
 use GuzzleHttp\Psr7\Response;
 use Helmich\Psr7Assert\Psr7Assertions;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\TestCase;
 
 class ConstraintTest extends TestCase
@@ -19,11 +20,10 @@ public function testHasUriCanSucceed()
         $this->assertRequestHasUri($request, '/foo');
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testHasUriCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $request = new Request('GET', '/foo');
         $this->assertRequestHasUri($request, '/bar');
     }
@@ -34,20 +34,18 @@ public function testHasHeaderCanSucceedWithPrimitiveValue()
         $this->assertMessageHasHeader($request, 'X-Foo', 'bar');
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testHasHeaderCanFailWithPrimitiveValue()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $request = new Request('GET', '/', ['x-foo' => 'baz']);
         $this->assertMessageHasHeader($request, 'X-Foo', 'bar');
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testHasHeaderCanFailWithNonExistingHeader()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $request = new Request('GET', '/', []);
         $this->assertMessageHasHeader($request, 'X-Foo', 'bar');
     }
@@ -70,11 +68,10 @@ public function testHasHeadersCanSucceedWithConstraint()
         );
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testHasHeaderCanFailWithConstraint()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $request = new Request('GET', '/', ['x-foo' => 4]);
         $this->assertMessageHasHeader($request, 'X-Foo', Assert::greaterThanOrEqual(10));
     }
@@ -85,11 +82,10 @@ public function testBodyMatchesCanSucceed()
         $this->assertMessageBodyMatches($request, Assert::equalTo('foobar'));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testBodyMatchesCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $request = new Request('GET', '/', [], 'foobar');
         $this->assertMessageBodyMatches($request, Assert::equalTo('barbaz'));
     }
@@ -133,11 +129,10 @@ public function testIsGetCanSucceed()
         $this->assertRequestIsGet(new Request('GET', '/'));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsGetCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertRequestIsGet(new Request('POST', '/'));
     }
 
@@ -146,11 +141,10 @@ public function testIsPostCanSucceed()
         $this->assertRequestIsPost(new Request('POST', '/'));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsPostCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertRequestIsPost(new Request('GET', '/'));
     }
 
@@ -159,11 +153,10 @@ public function testIsPutCanSucceed()
         $this->assertRequestIsPut(new Request('PUT', '/'));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsPutCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertRequestIsPut(new Request('GET', '/'));
     }
 
@@ -172,11 +165,10 @@ public function testIsDeleteCanSucceed()
         $this->assertRequestIsDelete(new Request('DELETE', '/'));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsDeleteCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertRequestIsDelete(new Request('POST', '/'));
     }
 
@@ -198,11 +190,10 @@ public function testHasStatusCanSucceed($status)
         $this->assertResponseHasStatus(new Response($status), $status);
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testHasStatusCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertResponseHasStatus(new Response(400), 200);
     }
 
@@ -211,11 +202,10 @@ public function testIsSuccessCanSucceed()
         $this->assertResponseIsSuccess(new Response(200));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsSuccessCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertResponseIsSuccess(new Response(404));
     }
 
@@ -224,11 +214,10 @@ public function testIsClientErrorCanSucceed()
         $this->assertResponseIsClientError(new Response(404));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsClientErrorCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertResponseIsClientError(new Response(200));
     }
 
@@ -237,12 +226,11 @@ public function testIsServerErrorCanSucceed()
         $this->assertResponseIsServerError(new Response(503));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testIsServerErrorCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertResponseIsServerError(new Response(200));
     }
 
-}
+}
diff --git a/tests/Functional/FunctionalConstraintTest.php b/tests/Functional/FunctionalConstraintTest.php
diff --git a/tests/Unit/Constraint/HasHeaderConstraintTest.php b/tests/Unit/Constraint/HasHeaderConstraintTest.php
diff --git a/tests/Unit/Constraint/HasMethodConstraintTest.php b/tests/Unit/Constraint/HasMethodConstraintTest.php
diff --git a/tests/Unit/Constraint/HasStatusConstraintTest.php b/tests/Unit/Constraint/HasStatusConstraintTest.php
diff --git a/tests/Unit/Constraint/HasUriConstraintTest.php b/tests/Unit/Constraint/HasUriConstraintTest.php

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ class BodyMatchesConstraint extends Constraint`
`13`	`13`
`14`	`14`	`public function __construct(Constraint $constraint)`
`15`	`15`	`{`
`16`		`- parent::__construct();`
`17`	`16`	`$this->constraint = $constraint;`
`18`	`17`	`}`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ class HasHeaderConstraint extends Constraint`
`17`	`17`
`18`	`18`	`public function __construct(string $name, $constraint = null)`
`19`	`19`	`{`
`20`		`- parent::__construct();`
`21`		`-`
`22`	`20`	`if ($constraint === null) {`
`23`	`21`	`$constraint = Assert::logicalNot(Assert::isEmpty());`
`24`	`22`	`} elseif (!$constraint instanceof Constraint) {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ class HasMethodConstraint extends Constraint`
`13`	`13`
`14`	`14`	`public function __construct(string $method)`
`15`	`15`	`{`
`16`		`- parent::__construct();`
`17`	`16`	`$this->method = $method;`
`18`	`17`	`}`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ class HasQueryParameterConstraint extends Constraint`
`13`	`13`
`14`	`14`	`public function __construct($nameMatcher, $valueMatcher = null)`
`15`	`15`	`{`
`16`		`- parent::__construct();`
`17`		`-`
`18`	`16`	`$this->inner = new UrlEncodedMatches($nameMatcher, $valueMatcher);`
`19`	`17`	`}`
`20`	`18`
`@@ -61,4 +59,4 @@ public function toString(): string`
`61`	`59`	`{`
`62`	`60`	`return 'query string ' . $this->inner->toString();`
`63`	`61`	`}`
`64`		`-}`
	`62`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ class HasStatusConstraint extends Constraint`
`14`	`14`
`15`	`15`	`public function __construct($status)`
`16`	`16`	`{`
`17`		`- parent::__construct();`
`18`		`-`
`19`	`17`	`if (!$status instanceof Constraint) {`
`20`	`18`	`$status = Assert::equalTo($status);`
`21`	`19`	`}`