Merge pull request #39 from j0k3r/php-8

Test on PHP 8
j0k3r · Dec 3, 2021 · 52ebcfc · 52ebcfc
2 parents 282e54f + 3801c0f
commit 52ebcfc
Show file tree

Hide file tree

Showing 22 changed files with 248 additions and 272 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - "7.3"
+          - "7.4"
 
     steps:
       - name: "Checkout"
@@ -27,7 +27,7 @@ jobs:
         with:
           coverage: "none"
           php-version: "${{ matrix.php }}"
-          tools: cs2pr, composer:v1
+          tools: composer:v2
           ini-values: "date.timezone=Europe/Paris"
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,4 +36,4 @@ jobs:
         uses: "ramsey/composer-install@v1"
 
       - name: "Run PHP CS Fixer"
-        run: "vendor/bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
+        run: "vendor/bin/php-cs-fixer fix --verbose --dry-run"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -25,6 +25,8 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -37,7 +39,7 @@ jobs:
         with:
           php-version: "${{ matrix.php }}"
           coverage: "none"
-          tools: composer:v1
+          tools: composer:v2
           extensions: curl
           ini-values: "date.timezone=Europe/Paris"
         env:
@@ -69,7 +71,7 @@ jobs:
         with:
           php-version: "${{ matrix.php }}"
           coverage: "pcov"
-          tools: composer:v1
+          tools: composer:v2
           extensions: curl
           ini-values: "date.timezone=Europe/Paris"
         env:
@@ -78,14 +80,19 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
 
+      - name: "Setup logs"
+        run: "mkdir -p build/logs"
+
       - name: "Run PHPUnit (with coverage)"
-        run: "php vendor/bin/simple-phpunit -v --coverage-clover=coverage.clover"
+        run: "php vendor/bin/simple-phpunit -v --coverage-clover build/logs/clover.xml"
 
-      - name: "Retrieve ocular.phar"
-        run: "wget https://scrutinizer-ci.com/ocular.phar"
+      - name: "Retrieve Coveralls phar"
+        run: "wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.2/php-coveralls.phar"
 
-      - name: "Enable ocular.phar"
-        run: "chmod +x ocular.phar"
+      - name: "Enable Coveralls phar"
+        run: "chmod +x php-coveralls.phar"
 
       - name: "Upload coverage"
-        run: "php ocular.phar code-coverage:upload --format=php-clover coverage.clover"
+        run: "php php-coveralls.phar -v -x build/logs/clover.xml"
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ vendor
 coverage
 build
 .php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,6 +1,4 @@
 tools:
-    external_code_coverage:
-        timeout: 1200
     php_code_sniffer:
         config:
             standard: "PSR2"

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # PHP Imgur API Client
 
 ![CI](https://github.com/j0k3r/php-imgur-api-client/workflows/CI/badge.svg)
-[![Code Coverage](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/badges/coverage.png?branch=master)](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/?branch=master)
+[![Coverage Status](https://coveralls.io/repos/j0k3r/php-imgur-api-client/badge.svg?branch=master&service=github)](https://coveralls.io/github/j0k3r/php-imgur-api-client?branch=master)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/badges/quality-score.png?branch=master)](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/?branch=master)
 [![Total Downloads](https://poser.pugx.org/j0k3r/php-imgur-api-client/downloads)](https://packagist.org/packages/j0k3r/php-imgur-api-client)
 [![License](https://poser.pugx.org/j0k3r/php-imgur-api-client/license)](https://packagist.org/packages/j0k3r/php-imgur-api-client)

diff --git a/composer.json b/composer.json
@@ -41,5 +41,8 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
         "symfony/phpunit-bridge": "^5.0"
+    },
+    "config": {
+        "sort-packages": true
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,6 +16,11 @@
         </testsuite>
     </testsuites>
 
+    <php>
+        <!-- until all deps are compatible with PHP 8.1 -->
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+    </php>
+
     <filter>
         <whitelist>
             <directory>./lib/</directory>

diff --git a/tests/Api/AccountTest.php b/tests/Api/AccountTest.php
@@ -8,16 +8,16 @@
 use GuzzleHttp\Psr7\Response;
 use Imgur\Api\Account;
 use Imgur\Client;
+use Imgur\Exception\InvalidArgumentException;
 use Imgur\HttpClient\HttpClient;
 
 class AccountTest extends ApiTestCase
 {
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage Authentication required
-     */
     public function testBaseReal()
     {
+        $this->expectException(\Imgur\Exception\ErrorException::class);
+        $this->expectExceptionMessage('Authentication required');
+
         $guzzleClient = new GuzzleClient(['base_uri' => 'https://api.imgur.com/3/']);
         $httpClient = new HttpClient([], $guzzleClient);
         $client = new Client(null, $httpClient);
@@ -116,12 +116,11 @@ public function testGalleryFavorites()
         $this->assertSame($expectedValue, $api->galleryFavorites());
     }
 
-    /**
-     * @expectedException \Imgur\Exception\InvalidArgumentException
-     * @expectedExceptionMessage is wrong. Possible values are
-     */
     public function testGalleryFavoritesWrongValues()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('is wrong. Possible values are');
+
         $this->getApiMock()->galleryFavorites('me', 0, 'bad sort');
     }
 
@@ -409,12 +408,11 @@ public function testComments()
         $this->assertSame($expectedValue, $api->comments());
     }
 
-    /**
-     * @expectedException \Imgur\Exception\InvalidArgumentException
-     * @expectedExceptionMessage is wrong. Possible values are
-     */
     public function testCommentsWrongValues()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('is wrong. Possible values are');
+
         $this->getApiMock()->comments('me', 0, 'bad sort');
     }
 
@@ -460,12 +458,11 @@ public function testCommentIds()
         $this->assertSame($expectedValue, $api->commentIds());
     }
 
-    /**
-     * @expectedException \Imgur\Exception\InvalidArgumentException
-     * @expectedExceptionMessage is wrong. Possible values are
-     */
     public function testCommentIdsWrongValues()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('is wrong. Possible values are');
+
         $this->getApiMock()->commentIds('me', 0, 'bad sort');
     }
 

diff --git a/tests/Api/AlbumOrImageTest.php b/tests/Api/AlbumOrImageTest.php
@@ -8,6 +8,7 @@
 use GuzzleHttp\Psr7\Response;
 use Imgur\Api\AlbumOrImage;
 use Imgur\Client;
+use Imgur\Exception\ErrorException;
 use Imgur\HttpClient\HttpClient;
 use PHPUnit\Framework\TestCase;
 
@@ -54,12 +55,11 @@ public function testWithAlbumId()
         $this->assertSame('ok !', $api->find('8pCqe'));
     }
 
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage Unable to find an album OR an image with the id
-     */
     public function testWithBadId()
     {
+        $this->expectException(ErrorException::class);
+        $this->expectExceptionMessage('id');
+
         $mock = new MockHandler([
             new Response(404, ['Content-Type' => 'application/json'], json_encode([
                 'data' => [
@@ -91,12 +91,11 @@ public function testWithBadId()
         $api->find('xxxxxxx');
     }
 
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage oops
-     */
     public function testWithImageIdButBadResponse()
     {
+        $this->expectException(ErrorException::class);
+        $this->expectExceptionMessage('oops');
+
         $mock = new MockHandler([
             new Response(500, ['Content-Type' => 'application/json'], json_encode([
                 'data' => [
@@ -119,12 +118,11 @@ public function testWithImageIdButBadResponse()
         $api->find('ZOY11VC');
     }
 
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage oops
-     */
     public function testWithAlbumIdButBadResponse()
     {
+        $this->expectException(ErrorException::class);
+        $this->expectExceptionMessage('oops');
+
         $mock = new MockHandler([
             new Response(404, ['Content-Type' => 'application/json'], json_encode([
                 'data' => [

diff --git a/tests/Api/AlbumTest.php b/tests/Api/AlbumTest.php
@@ -12,12 +12,11 @@
 
 class AlbumTest extends ApiTestCase
 {
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage Authentication required
-     */
     public function testBaseReal()
     {
+        $this->expectException(\Imgur\Exception\ErrorException::class);
+        $this->expectExceptionMessage('Authentication required');
+
         $guzzleClient = new GuzzleClient(['base_uri' => 'https://api.imgur.com/3/']);
         $httpClient = new HttpClient([], $guzzleClient);
         $client = new Client(null, $httpClient);

diff --git a/tests/Api/CommentTest.php b/tests/Api/CommentTest.php
@@ -12,12 +12,11 @@
 
 class CommentTest extends ApiTestCase
 {
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage Authentication required
-     */
     public function testBaseReal()
     {
+        $this->expectException(\Imgur\Exception\ErrorException::class);
+        $this->expectExceptionMessage('Authentication required');
+
         $guzzleClient = new GuzzleClient(['base_uri' => 'https://api.imgur.com/3/']);
         $httpClient = new HttpClient([], $guzzleClient);
         $client = new Client(null, $httpClient);
@@ -115,12 +114,11 @@ public function testCreate()
         $this->assertSame($expectedValue, $api->create(['image_id' => 'ZOY11VC', 'comment' => 'I agree']));
     }
 
-    /**
-     * @expectedException \Imgur\Exception\MissingArgumentException
-     * @expectedExceptionMessage parameters is missing
-     */
     public function testCreateParamMissing()
     {
+        $this->expectException(\Imgur\Exception\MissingArgumentException::class);
+        $this->expectExceptionMessage('parameters is missing');
+
         $this->getApiMock()->create('726305564');
     }
 
@@ -177,12 +175,11 @@ public function testCreateReply()
         $this->assertSame($expectedValue, $api->createReply('726305565', ['image_id' => 'ZOY11VC', 'comment' => 'I agree']));
     }
 
-    /**
-     * @expectedException \Imgur\Exception\MissingArgumentException
-     * @expectedExceptionMessage parameters is missing
-     */
     public function testCreateReplyParamMissing()
     {
+        $this->expectException(\Imgur\Exception\MissingArgumentException::class);
+        $this->expectExceptionMessage('parameters is missing');
+
         $this->getApiMock()->createReply('726305564', []);
     }
 
@@ -203,12 +200,11 @@ public function testVote()
         $this->assertSame($expectedValue, $api->vote('726305564', 'up'));
     }
 
-    /**
-     * @expectedException \Imgur\Exception\InvalidArgumentException
-     * @expectedExceptionMessage is wrong. Possible values are
-     */
     public function testVoteWrongVoteValue()
     {
+        $this->expectException(\Imgur\Exception\InvalidArgumentException::class);
+        $this->expectExceptionMessage('is wrong. Possible values are');
+
         $this->getApiMock()->vote('726305564', 'bad vote');
     }
 

diff --git a/tests/Api/ConversationTest.php b/tests/Api/ConversationTest.php
@@ -12,12 +12,11 @@
 
 class ConversationTest extends ApiTestCase
 {
-    /**
-     * @expectedException \Imgur\Exception\ErrorException
-     * @expectedExceptionMessage Authentication required
-     */
     public function testBaseReal()
     {
+        $this->expectException(\Imgur\Exception\ErrorException::class);
+        $this->expectExceptionMessage('Authentication required');
+
         $guzzleClient = new GuzzleClient(['base_uri' => 'https://api.imgur.com/3/']);
         $httpClient = new HttpClient([], $guzzleClient);
         $client = new Client(null, $httpClient);
@@ -118,12 +117,11 @@ public function testMessageCreate()
         $this->assertSame($expectedValue, $api->messageCreate(['recipient' => 'imgur', 'body' => 'YO !']));
     }
 
-    /**
-     * @expectedException \Imgur\Exception\MissingArgumentException
-     * @expectedExceptionMessage parameters is missing
-     */
     public function testMessageCreateParamMissing()
     {
+        $this->expectException(\Imgur\Exception\MissingArgumentException::class);
+        $this->expectExceptionMessage('parameters is missing');
+
         $this->getApiMock()->messageCreate([]);
     }