Merge pull request #45 from packagist/t/php8

PHP8 support

Author: glaubinix

.github/workflows/php.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - "master"
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          ini-values: "memory_limit=-1, phar.readonly=0"
+          php-version: "${{ matrix.php-version }}"
+
+      - name: Validate composer.json
+        run: composer validate
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: PHPUnit
+        run: ./vendor/bin/phpunit tests
+
+      - name: PHP-CS-Fixer
+        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff

.gitignore

@@ -1,4 +1,5 @@
 .php_cs.cache
+.php-cs-fixer.cache
 vendor
 composer.lock
 

.php-cs-fixer.php

@@ -0,0 +1,17 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->files()
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/tests')
+    ->name('*.php')
+;
+
+return (new PhpCsFixer\Config())
+    ->setUsingCache(true)
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@PSR2' => true,
+    ))
+    ->setFinder($finder)
+;

.travis.yml

@@ -108,7 +108,7 @@
 
 ## Requirements
 
-* PHP >= 5.6
+* PHP >= 7.2
 * [Guzzle](https://github.com/guzzle/guzzle) library,
 
 ## Install

README.md

@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.2 || ^8.0",
         "psr/http-message": "^1.0",
         "php-http/httplug": "^1.1 || ^2.0",
         "php-http/discovery": "^1.0",
@@ -20,12 +20,12 @@
         "composer-runtime-api": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.5 || ^7.0",
+        "phpunit/phpunit": "^8.0 || ^9.0",
         "php-http/guzzle6-adapter": "^1.0 || ^2.0",
         "php-http/mock-client": "^1.0",
         "guzzlehttp/psr7": "^1.2",
-        "cache/array-adapter": "^0.4",
-        "friendsofphp/php-cs-fixer": "^2.10"
+        "cache/array-adapter": "^1.1.0",
+        "friendsofphp/php-cs-fixer": "^3.0"
     },
     "autoload": {
         "psr-4": { "PrivatePackagist\\ApiClient\\": "src/" }

composer.json

@@ -4,5 +4,4 @@
 
 class JobTimeoutException extends RuntimeException
 {
-
 }

src/Exception/JobTimeoutException.php

@@ -10,6 +10,7 @@
 namespace PrivatePackagist\ApiClient\Api;
 
 use Http\Client\HttpClient;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrivatePackagist\ApiClient\Client;
 use PrivatePackagist\ApiClient\HttpClient\HttpPluginClientBuilder;
@@ -22,11 +23,11 @@ abstract class ApiTestCase extends TestCase
     abstract protected function getApiClass();
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function getApiMock()
     {
-        /** @var HttpClient&\PHPUnit_Framework_MockObject_MockObject $httpClient */
+        /** @var HttpClient&MockObject $httpClient */
         $httpClient = $this->getMockBuilder(HttpClient::class)
             ->setMethods(['sendRequest'])
             ->getMock();

tests/Api/ApiTestCase.php

@@ -9,6 +9,8 @@
 
 namespace PrivatePackagist\ApiClient\Api;
 
+use PHPUnit\Framework\MockObject\MockObject;
+
 class CredentialsTest extends ApiTestCase
 {
     public function testAll()
@@ -24,7 +26,7 @@ public function testAll()
             ],
         ];
 
-        /** @var Customers&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var Credentials&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
@@ -45,7 +47,7 @@ public function testShow()
             'type' => 'http-basic',
         ];
 
-        /** @var Customers&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var Credentials&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
@@ -66,7 +68,7 @@ public function testCreate()
             'type' => 'http-basic',
         ];
 
-        /** @var Customers&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var Credentials&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('post')
@@ -87,7 +89,7 @@ public function testEdit()
             'type' => 'http-basic',
         ];
 
-        /** @var Customers&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var Credentials&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
@@ -101,7 +103,7 @@ public function testRemove()
     {
         $expected = [];
 
-        /** @var Customers&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var Credentials&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')

tests/Api/CredentialsTest.php

@@ -9,6 +9,7 @@
 
 namespace PrivatePackagist\ApiClient\Api\Customers;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PrivatePackagist\ApiClient\Api\ApiTestCase;
 
 class MagentoLegacyKeysTest extends ApiTestCase
@@ -22,7 +23,7 @@ public function testAll()
             ],
         ];
 
-        /** @var MagentoLegacyKeys&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var MagentoLegacyKeys&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
@@ -39,7 +40,7 @@ public function testCreate()
             'privateKey' => 'private-fjdgkfdgk233443554mn45',
         ];
 
-        /** @var MagentoLegacyKeys&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var MagentoLegacyKeys&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('post')
@@ -53,7 +54,7 @@ public function testRemove()
     {
         $expected = [];
 
-        /** @var MagentoLegacyKeys&\PHPUnit_Framework_MockObject_MockObject $api */
+        /** @var MagentoLegacyKeys&MockObject $api */
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')