Fix phpunit tests (#10)

Add the `composer test` command as mentioned in the readme file.
And as phpunit's prophesize method is deprecated from version 9 on and
will be removed in phpunit 10, use the trait from
phpspec/prophecy-phpunit instead as recommended.

phpspec/prophecy-phpunit v2 which contains the needed trait isn't
available for PHP 7.2, so bump the version requirement to 7.3.
Also use composer test instead of phpunit directly in the ci config and
remove running the tests on version 7.2.
Finally also remove --diff-format to get cs running again.

New php cs fixer config file name.

Co-authored-by: David Buchmann <david@liip.ch>

Author: otsch

.gitattributes

@@ -1,7 +1,7 @@
-.editorconfig     export-ignore
-.gitattributes    export-ignore
-/.github/         export-ignore
-.gitignore        export-ignore
-/.php_cs.dist     export-ignore
-/phpunit.xml.dist export-ignore
-/tests/           export-ignore
+.editorconfig               export-ignore
+.gitattributes              export-ignore
+/.github/                   export-ignore
+.gitignore                  export-ignore
+/.php-cs-fixer.dist.php     export-ignore
+/phpunit.xml.dist           export-ignore
+/tests/                     export-ignore

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: [ '7.2', '7.3', '7.4']
+        php: [ '7.3', '7.4']
 
     steps:
       - name: Set up PHP
@@ -28,7 +28,7 @@ jobs:
         run: ./vendor/bin/http_test_server > /dev/null 2>&1 &
 
       - name: Run tests
-        run: ./vendor/bin/phpunit
+        run: composer test
 
   lowest:
     name: Lowest deps

.github/workflows/static.yml

@@ -24,7 +24,7 @@ jobs:
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --dry-run --diff-format udiff
+          args: --dry-run
 
   psalm:
     name: Psalm

.gitignore

@@ -2,3 +2,4 @@
 /composer.lock
 /phpunit.xml
 /vendor/
+.phpunit.result.cache

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -2,12 +2,11 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
-    ->in(__DIR__)
-;
+    ->in(__DIR__);
+$config = new PhpCsFixer\Config();
 
-return PhpCsFixer\Config::create()
+return $config->setFinder($finder)
     ->setRules([
          '@Symfony' => true,
          'array_syntax' => ['syntax' => 'short'],
-    ])
-    ->setFinder($finder);
+    ]);

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Changed
+- Drop support for PHP version 7.2
+
+### Fixed
+- Add missing `composer test` command and use it in CI
+- Fix deprecated usage of prophesize in phpunit tests
+
 ## [1.0.0] - 2021-03-09
 
 - Stable release - no changes since 0.1.1

composer.json

@@ -11,14 +11,15 @@
         }
     ],
     "require": {
-        "php": "^7.2 | ^8.0",
+        "php": "^7.3 | ^8.0",
         "php-http/httplug": "^2.0",
         "psr/http-client": "^1.0",
         "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0|^9.3",
-        "php-http/client-integration-tests": "^3.0"
+        "php-http/client-integration-tests": "^3.0",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "provide": {
         "php-http/client-implementation": "1.0",
@@ -39,5 +40,8 @@
         "branch-alias": {
             "dev-master": "1.x-dev"
         }
+    },
+    "scripts": {
+        "test": "@php vendor/bin/phpunit"
     }
 }

tests/PromiseTest.php

@@ -8,13 +8,16 @@
 use GuzzleHttp\Promise\RejectedPromise;
 use Http\Adapter\Guzzle7\Promise;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\RequestInterface;
 
 /**
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
  */
 class PromiseTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testNonDomainExceptionIsHandled(): void
     {
         $this->expectException(Exception::class);