Merge pull request #3 from vazaha-nl/gh-actions-test-scenarios

test more os and php versions
vazaha-nl · Nov 29, 2024 · b1574fb · b1574fb
2 parents aa5c2b9 + de90d1c
commit b1574fb
Show file tree

Hide file tree

Showing 132 changed files with 575 additions and 627 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -10,17 +10,21 @@ permissions:
   contents: read
 
 jobs:
-  build:
-
+  run:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        php-versions: ['8.2', '8.3']
+    name: PHP ${{ matrix.php-versions }} Test
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup PHP
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.2
+        php-version: ${{ matrix.php-versions }}
+    - name: Check PHP Version
+      run: php -v
 
     - name: Validate composer.json and composer.lock
       run: composer validate --strict

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -4,7 +4,7 @@
 
 use Ergebnis\PhpCsFixer\Config;
 
-$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php82());
+$config = Config\Factory::fromRuleSet(Config\RuleSet\Php82::create());
 
 $config->getFinder()->in(__DIR__)
     ->exclude([

diff --git a/src/Abstracts/Model.php b/src/Abstracts/Model.php
@@ -5,9 +5,6 @@
 namespace Vazaha\Mastodon\Abstracts;
 
 use Carbon\Carbon;
-use DateTimeInterface;
-use ReflectionClass;
-use ReflectionNamedType;
 use Vazaha\Mastodon\Interfaces\ModelInterface;
 
 abstract class Model implements ModelInterface
@@ -63,7 +60,7 @@ public function toArray(): array
                 continue;
             }
 
-            if ($value instanceof DateTimeInterface) {
+            if ($value instanceof \DateTimeInterface) {
                 $array['name'] = $value->format('Y-m-d\TH:i:s.vp');
 
                 continue;
@@ -111,7 +108,7 @@ protected static function resolvePropertyValue(string $property, $value)
             return $type::fromArray($value);
         }
 
-        if (is_a($type, DateTimeInterface::class, true)) {
+        if (is_a($type, \DateTimeInterface::class, true)) {
             if (is_int($value) || is_float($value)) {
                 return Carbon::createFromTimestamp($value);
             }
@@ -126,11 +123,11 @@ protected static function resolvePropertyValue(string $property, $value)
 
     protected static function getPropertyType(string $property): ?string
     {
-        $reflectionClass = new ReflectionClass(static::class);
+        $reflectionClass = new \ReflectionClass(static::class);
         $reflectionProperty = $reflectionClass->getProperty($property);
         $reflectionType = $reflectionProperty->getType();
 
-        if (!$reflectionType instanceof ReflectionNamedType) {
+        if (!$reflectionType instanceof \ReflectionNamedType) {
             return null;
         }
 

diff --git a/src/Abstracts/ModelCollection.php b/src/Abstracts/ModelCollection.php
@@ -20,14 +20,14 @@ abstract class ModelCollection extends Collection
     abstract public static function getModelClass(): string;
 
     /**
-     * @param array<int, mixed[]> $array
+     * @param list<array<string, mixed>> $array
      */
     public static function fromArray(array $array): static
     {
         $modelClass = static::getModelClass();
 
         $models = array_map(
-            static fn (array $modelData) => $modelClass::fromArray($modelData),
+            static fn (array $modelData): Model => $modelClass::fromArray($modelData),
             $array,
         );
 

diff --git a/src/Abstracts/Result.php b/src/Abstracts/Result.php
@@ -54,7 +54,7 @@ public function getBody(): string
      * @throws \RuntimeException
      * @throws \Vazaha\Mastodon\Exceptions\InvalidResponseException
      *
-     * @return null|array<int|string, mixed[]>
+     * @return null|array<int|string, list<mixed>>
      */
     public function getDecodedBody(): ?array
     {

diff --git a/src/Exceptions/ApiErrorException.php b/src/Exceptions/ApiErrorException.php
@@ -4,18 +4,16 @@
 
 namespace Vazaha\Mastodon\Exceptions;
 
-use Exception;
-use Throwable;
 use Vazaha\Mastodon\Models\ErrorModel;
 
-class ApiErrorException extends Exception
+class ApiErrorException extends \Exception
 {
     protected ?ErrorModel $error;
 
     public function __construct(
         string $message,
         int $statusCode,
-        ?Throwable $previous = null,
+        ?\Throwable $previous = null,
         ?ErrorModel $error = null,
     ) {
         parent::__construct($message, $statusCode, $previous);

diff --git a/src/Exceptions/BaseUriNotSetException.php b/src/Exceptions/BaseUriNotSetException.php
@@ -4,8 +4,6 @@
 
 namespace Vazaha\Mastodon\Exceptions;
 
-use Exception;
-
-class BaseUriNotSetException extends Exception
+class BaseUriNotSetException extends \Exception
 {
 }
diff --git a/src/Exceptions/InvalidResponseException.php b/src/Exceptions/InvalidResponseException.php
@@ -4,8 +4,6 @@
 
 namespace Vazaha\Mastodon\Exceptions;
 
-use Exception;
-
-class InvalidResponseException extends Exception
+class InvalidResponseException extends \Exception
 {
 }
diff --git a/src/Factories/ModelFactory.php b/src/Factories/ModelFactory.php
@@ -4,7 +4,6 @@
 
 namespace Vazaha\Mastodon\Factories;
 
-use LogicException;
 use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Interfaces\ModelInterface;
 
@@ -13,15 +12,15 @@ class ModelFactory
     /**
      * @template T of \Vazaha\Mastodon\Abstracts\Model
      *
-     * @param class-string<T> $className
-     * @param mixed[]         $modelData
+     * @param class-string<T>      $className
+     * @param array<string, mixed> $modelData
      *
      * @return T
      */
     public function build(string $className, array $modelData): ModelInterface
     {
         if (!is_a($className, Model::class, true)) {
-            throw new LogicException($className . ' is not a subclass of ' . Model::class);
+            throw new \LogicException($className . ' is not a subclass of ' . Model::class);
         }
 
         return $className::fromArray($modelData);

diff --git a/src/Factories/ResultFactory.php b/src/Factories/ResultFactory.php
@@ -4,7 +4,6 @@
 
 namespace Vazaha\Mastodon\Factories;
 
-use LogicException;
 use Psr\Http\Message\ResponseInterface;
 use Vazaha\Mastodon\Abstracts\Result;
 use Vazaha\Mastodon\ApiClient;
@@ -29,8 +28,9 @@ public function build(
         ResponseInterface $response,
     ): ResultInterface {
         if (!is_a($className, Result::class, true)) {
-            throw new LogicException($className . ' is not a subclass of ' . Result::class);
+            throw new \LogicException($className . ' is not a subclass of ' . Result::class);
         }
+
         $result = new $className();
         $result->init($client, $request, $response);
 

diff --git a/src/Helpers/MultipartFormData.php b/src/Helpers/MultipartFormData.php
@@ -4,8 +4,6 @@
 
 namespace Vazaha\Mastodon\Helpers;
 
-use InvalidArgumentException;
-
 class MultipartFormData
 {
     /**
@@ -87,6 +85,6 @@ protected function constructParts(
             ];
         }
 
-        throw new InvalidArgumentException('Invalid format in form params encountered for param ' . $baseName);
+        throw new \InvalidArgumentException('Invalid format in form params encountered for param ' . $baseName);
     }
 }
diff --git a/src/Helpers/PagingLinks.php b/src/Helpers/PagingLinks.php
@@ -17,15 +17,15 @@ public function __construct(
     }
 
     /**
-     * @return null|array<int|string,string>
+     * @return null|array<int|string, string>
      */
     public function getNextQueryParams(): ?array
     {
         return $this->getQueryParams($this->getNextUrl());
     }
 
     /**
-     * @return null|array<int|string,string>
+     * @return null|array<int|string, string>
      */
     public function getPreviousQueryParams(): ?array
     {

diff --git a/src/Helpers/UploadFile.php b/src/Helpers/UploadFile.php
@@ -4,8 +4,6 @@
 
 namespace Vazaha\Mastodon\Helpers;
 
-use InvalidArgumentException;
-
 /**
  * Helper class for files to be uploaded to the Mastodon API.
  */
@@ -20,15 +18,15 @@ public function __construct(
         protected string $filePath,
     ) {
         if (!file_exists($this->filePath)) {
-            throw new InvalidArgumentException('File does not exist: ' . $this->filePath);
+            throw new \InvalidArgumentException('File does not exist: ' . $this->filePath);
         }
 
         if (!is_file($this->filePath)) {
-            throw new InvalidArgumentException('Path is not a file: ' . $this->filePath);
+            throw new \InvalidArgumentException('Path is not a file: ' . $this->filePath);
         }
 
         if (!is_readable($this->filePath)) {
-            throw new InvalidArgumentException('Path is not readable: ' . $this->filePath);
+            throw new \InvalidArgumentException('Path is not readable: ' . $this->filePath);
         }
     }
 

diff --git a/src/Interfaces/RequestInterface.php b/src/Interfaces/RequestInterface.php
@@ -44,7 +44,7 @@ public function getResultClass(): string;
     public function getPagingParams(): array;
 
     /**
-     * @param array<int|string,string> $params
+     * @param array<int|string, string> $params
      */
     public function setPagingParams(array $params): static;
 

diff --git a/src/Interfaces/ResultInterface.php b/src/Interfaces/ResultInterface.php
@@ -18,7 +18,7 @@ public function getHttpResponse(): ResponseInterface;
     public function getBody(): string;
 
     /**
-     * @return null|array<int|string, mixed[]>
+     * @return null|array<int|string, list<mixed>>
      */
     public function getDecodedBody(): ?array;
 

diff --git a/src/Models/AccountModel.php b/src/Models/AccountModel.php
@@ -8,7 +8,6 @@
 
 namespace Vazaha\Mastodon\Models;
 
-use DateTimeInterface;
 use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Collections\CustomEmojiCollection;
 use Vazaha\Mastodon\Collections\FieldCollection;
@@ -130,12 +129,12 @@ class AccountModel extends Model
     /**
      * When the account was created.
      */
-    public DateTimeInterface $created_at;
+    public \DateTimeInterface $created_at;
 
     /**
      * When the most recent status was posted.
      */
-    public ?DateTimeInterface $last_status_at = null;
+    public ?\DateTimeInterface $last_status_at = null;
 
     /**
      * How many statuses are attached to this account.

diff --git a/src/Models/Admin/AccountModel.php b/src/Models/Admin/AccountModel.php
@@ -8,7 +8,6 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use DateTimeInterface;
 use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Collections\Admin\IpCollection;
 use Vazaha\Mastodon\Models\AccountModel as ModelsAccountModel;
@@ -39,7 +38,7 @@ class AccountModel extends Model
     /**
      * When the account was first discovered.
      */
-    public DateTimeInterface $created_at;
+    public \DateTimeInterface $created_at;
 
     /**
      * The email address associated with the account.

diff --git a/src/Models/Admin/CohortModel.php b/src/Models/Admin/CohortModel.php
@@ -8,7 +8,6 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use DateTimeInterface;
 use Vazaha\Mastodon\Abstracts\Model;
 use Vazaha\Mastodon\Collections\CohortDataCollection;
 
@@ -22,7 +21,7 @@ class CohortModel extends Model
     /**
      * The timestamp for the start of the period, at midnight.
      */
-    public DateTimeInterface $period;
+    public \DateTimeInterface $period;
 
     /**
      * The size of the bucket for the returned data.

diff --git a/src/Models/Admin/DimensionModel.php b/src/Models/Admin/DimensionModel.php
@@ -25,7 +25,7 @@ class DimensionModel extends Model
     /**
      * The data available for the requested dimension.
      *
-     * @var array<mixed>
+     * @var list<mixed>
      */
     public array $data;
 }
diff --git a/src/Models/Admin/DomainAllowModel.php b/src/Models/Admin/DomainAllowModel.php
@@ -8,7 +8,6 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use DateTimeInterface;
 use Vazaha\Mastodon\Abstracts\Model;
 
 /**
@@ -31,5 +30,5 @@ class DomainAllowModel extends Model
     /**
      * When the domain was allowed to federate.
      */
-    public DateTimeInterface $created_at;
+    public \DateTimeInterface $created_at;
 }
diff --git a/src/Models/Admin/DomainBlockModel.php b/src/Models/Admin/DomainBlockModel.php
@@ -8,7 +8,6 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use DateTimeInterface;
 use Vazaha\Mastodon\Abstracts\Model;
 
 /**
@@ -31,7 +30,7 @@ class DomainBlockModel extends Model
     /**
      * When the domain was blocked from federating.
      */
-    public DateTimeInterface $created_at;
+    public \DateTimeInterface $created_at;
 
     /**
      * The policy to be applied by this domain block.

diff --git a/src/Models/Admin/EmailDomainBlockModel.php b/src/Models/Admin/EmailDomainBlockModel.php
@@ -8,7 +8,6 @@
 
 namespace Vazaha\Mastodon\Models\Admin;
 
-use DateTimeInterface;
 use Vazaha\Mastodon\Abstracts\Model;
 
 /**
@@ -31,12 +30,12 @@ class EmailDomainBlockModel extends Model
     /**
      * When the email domain was disallowed from signups.
      */
-    public DateTimeInterface $created_at;
+    public \DateTimeInterface $created_at;
 
     /**
      * Usage statistics for given days (typically the past week).
      *
-     * @var array<mixed>
+     * @var list<mixed>
      */
     public array $history;
 }