Merge pull request #46 from j0k3r/fix/typing

Fixing types

Author: j0k3r

.gitattributes

@@ -1,8 +1,8 @@
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.scrutinizer.yml export-ignore
-/.php_cs export-ignore
+/.php-cs-fixer.php export-ignore
+/phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
 /tests export-ignore
 /.github export-ignore

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/coding-standards.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -33,7 +33,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
 
       - name: "Run PHP CS Fixer"
         run: "vendor/bin/php-cs-fixer fix --verbose --dry-run"

.github/workflows/continuous-integration.yml

@@ -22,10 +22,11 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -41,7 +42,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
 
       - name: "Run PHPUnit"
         run: "php vendor/bin/simple-phpunit -v"
@@ -57,7 +58,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -73,7 +74,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
 
       - name: "Setup logs"
         run: "mkdir -p build/logs"

.scrutinizer.yml

@@ -2,7 +2,6 @@
 
 ![CI](https://github.com/j0k3r/php-imgur-api-client/workflows/CI/badge.svg)
 [![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)
 

README.md

@@ -97,7 +97,7 @@ public function getOption(string $name): ?string
     /**
      * @throws InvalidArgumentException
      */
-    public function setOption(string $name, $value): void
+    public function setOption(string $name, string $value = null): void
     {
         if (!\array_key_exists($name, $this->options)) {
             throw new InvalidArgumentException(sprintf('Undefined option called: "%s"', $name));

lib/Imgur/Client.php

@@ -89,9 +89,13 @@ protected function getApiTopicMock()
     }
 
     /**
-     * @param class-string $class
+     * @template T of object
+     *
+     * @param class-string<T> $className
+     *
+     * @return T&MockObject
      */
-    private function getApiMock($class)
+    private function getApiMock($className): object
     {
         $httpClient = $this->getMockBuilder('Imgur\HttpClient\HttpClient')
             ->disableOriginalConstructor()
@@ -111,7 +115,7 @@ private function getApiMock($class)
 
         $client = new Client(null, $httpClient);
 
-        return $this->getMockBuilder($class)
+        return $this->getMockBuilder($className)
             ->onlyMethods(['get', 'post', 'put', 'delete'])
             ->setConstructorArgs([$client])
             ->getMock();

tests/Api/ApiTestCase.php

@@ -139,7 +139,7 @@ public function testGetAuthenticationUrl(): void
         // $this->assertSame('https://api.imgur.com/oauth2/authorize?response_type=code&state=draft', $client->getAuthenticationUrl('code', 'draft'));
 
         $client = new Client();
-        $client->setOption('client_id', 123);
+        $client->setOption('client_id', '123');
         $client->setOption('client_secret', 'xx');
         $this->assertSame('https://api.imgur.com/oauth2/authorize?client_id=123&response_type=pin', $client->getAuthenticationUrl('pin'));
         $this->assertSame('https://api.imgur.com/oauth2/authorize?client_id=123&response_type=code', $client->getAuthenticationUrl());