Merge pull request #9 from polidog/feat/php8

Supported php8

.github/workflows/test.yaml

@@ -8,7 +8,7 @@ jobs:
  strategy:
  max-parallel: 5
  matrix:
- php-versions: [ '7.3', '7.4' ]
+ php-versions: [ '8.0', '8.1', '8.2' ]
 
  steps:
  - uses: actions/checkout@v1
@@ -18,4 +18,4 @@ jobs:
 
  - name: phpunit
  run: |
- composer test
+ composer test

.gitignore

@@ -4,3 +4,5 @@ vendor
 .idea
 .php_cs.cache
 composer.lock
+.php-cs-fixer.cache
+.phpunit.result.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,16 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+ ->in(__DIR__)
+ ->exclude('vendor');
+
+return (new PhpCsFixer\Config())
+ ->setRules([
+ '@PSR12' => true,
+ 'strict_param' => true,
+ 'array_syntax' => ['syntax' => 'short'],
+ '@PHP80Migration:risky' => true,
+ ])
+ ->setRiskyAllowed(true)
+ ->setFinder($finder)
+ ;

composer.json

@@ -9,13 +9,14 @@
  }
  ],
  "require": {
- "php": ">=7.3",
+ "php": ">=8.0",
  "ext-json": "*",
  "guzzlehttp/guzzle": "~7.0"
  },
  "require-dev": {
- "phpunit/phpunit": "^5.7",
- "fabpot/php-cs-fixer": "^2.10"
+ "phpunit/phpunit": "^9.6",
+ "friendsofphp/php-cs-fixer": "^3.23",
+ "phpspec/prophecy-phpunit": "^2.0"
  },
  "autoload": {
  "psr-4": {
@@ -28,6 +29,7 @@
  }
  },
  "scripts": {
- "test": "./vendor/bin/phpunit"
+ "test": "./vendor/bin/phpunit",
+ "cs-fix": "./vendor/bin/php-cs-fixer fix"
  }
 }

tests/ApiTest.php

@@ -7,9 +7,12 @@
 use PHPUnit\Framework\TestCase;
 use Polidog\Esa\Api;
 use Polidog\Esa\Client\ClientInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
-class ApiTest extends TestCase
+final class ApiTest extends TestCase
 {
+ use ProphecyTrait;
+
  /**
  * @var \Prophecy\Prophecy\ObjectProphecy|ClientInterface
  */

tests/Client/AuthorizationTest.php

@@ -8,11 +8,14 @@
 use PHPUnit\Framework\TestCase;
 use Polidog\Esa\Client\Authorization;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\RequestInterface;
 
-class AuthorizationTest extends TestCase
+final class AuthorizationTest extends TestCase
 {
+ use ProphecyTrait;
+
  public function testHandle(): void
  {
  $token = 'xxxxxxxxxxxxxxxxxx';

tests/Client/ClientTest.php

@@ -10,11 +10,14 @@
 use Polidog\Esa\Client\Client;
 use Polidog\Esa\Exception\ClientException;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 
-class ClientTest extends TestCase
+final class ClientTest extends TestCase
 {
+ use ProphecyTrait;
+
  public function testFactory(): void
  {
  $client = Client::factory('token');