Upgrade to php83

Also update rector- and phpcsfixer-configs
usox · Nov 16, 2024 · 1231248 · 1231248
1 parent 51fb2d0
commit 1231248
Show file tree

Hide file tree

Showing 72 changed files with 351 additions and 344 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,16 +1,31 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
-    ->in(['src', 'tests'])
-;
-$config = new PhpCsFixer\Config();
-$config->setRules(
-    [
-        '@PSR12' => true,
-        '@PHP80Migration' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline', 'keep_multiple_spaces_after_comma' => false],
-    ]
-)->setFinder($finder);
+declare(strict_types=1);
 
-return $config;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+return (new PhpCsFixer\Config())
+    ->setRules(
+        [
+            '@PSR12' => true,
+            'array_syntax' => ['syntax' => 'short'],
+            'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline', 'keep_multiple_spaces_after_comma' => false],
+            'no_unused_imports' => true,
+            'ordered_imports' => [
+                'sort_algorithm' => 'alpha',
+                'imports_order' => ['const', 'class', 'function'],
+            ],
+            'fully_qualified_strict_types' => [
+                'import_symbols' => true,
+            ],
+            'trailing_comma_in_multiline' => [
+                'after_heredoc' => true,
+                'elements' => ['array_destructuring', 'arrays', 'parameters', 'arguments'],
+            ],
+        ],
+    )
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(['src', 'tests'])
+    );
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^8.2 || ^8.3",
+        "php": "^8.3",
         "ext-mbstring": "*",
         "aaronddm/xml-builder": "^2.0",
         "psr/http-message": "^1||^2"

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -5,17 +5,28 @@
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\Config\RectorConfig;
+use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector;
 
 return RectorConfig::configure()
-	->withPaths([
-		__DIR__ . '/src',
-		__DIR__ . '/tests',
-	])
-	->withRules([
-		InlineConstructorDefaultToPropertyRector::class,
-	])
-	->withPhpSets(php81: true)
-	->withPreparedSets(deadCode: true, codeQuality: true, codingStyle: true)
-	->withSkip([
-		FlipTypeControlToUseExclusiveTypeRector::class,
-	]);
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->withRules([
+        InlineConstructorDefaultToPropertyRector::class,
+    ])
+    ->withPhpSets(php83: true)
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        privatization: true,
+        earlyReturn: true,
+        strictBooleans: true,
+        phpunitCodeQuality: true,
+    )
+    ->withSkip([
+        FlipTypeControlToUseExclusiveTypeRector::class,
+        AddOverrideAttributeToOverriddenMethodsRector::class,
+    ]);
diff --git a/src/Authentication/AuthenticationManager.php b/src/Authentication/AuthenticationManager.php
@@ -12,10 +12,10 @@
 /**
  * Manages the authentication of subsonic api requests
  */
-final class AuthenticationManager implements AuthenticationManagerInterface
+final readonly class AuthenticationManager implements AuthenticationManagerInterface
 {
     public function __construct(
-        private readonly AuthenticationProviderInterface $authenticationProvider,
+        private AuthenticationProviderInterface $authenticationProvider,
     ) {
     }
 

diff --git a/src/FeatureSet/V1161/Contract/AlbumDataProviderInterface.php b/src/FeatureSet/V1161/Contract/AlbumDataProviderInterface.php
@@ -37,6 +37,6 @@ interface AlbumDataProviderInterface extends V1161DataProviderInterface
      * }
      */
     public function getAlbum(
-        string $albumId
+        string $albumId,
     ): ?array;
 }
diff --git a/src/FeatureSet/V1161/Contract/AlbumList2DataProviderInterface.php b/src/FeatureSet/V1161/Contract/AlbumList2DataProviderInterface.php
@@ -36,6 +36,6 @@ public function getAlbums(
         int $limit,
         int $offset,
         array $orderParameter,
-        ?string $musicFolderId
+        ?string $musicFolderId,
     ): Traversable;
 }
diff --git a/src/FeatureSet/V1161/Contract/ArtistDataProviderInterface.php b/src/FeatureSet/V1161/Contract/ArtistDataProviderInterface.php
@@ -31,6 +31,6 @@ interface ArtistDataProviderInterface extends V1161DataProviderInterface
      * }
      */
     public function getArtist(
-        string $artistId
+        string $artistId,
     ): ?array;
 }
diff --git a/src/FeatureSet/V1161/Contract/ArtistListDataProviderInterface.php b/src/FeatureSet/V1161/Contract/ArtistListDataProviderInterface.php
@@ -24,6 +24,6 @@ public function getIgnoredArticles(): array;
      * }>
      */
     public function getArtists(
-        ?string $musicFolderId
+        ?string $musicFolderId,
     ): iterable;
 }
diff --git a/src/FeatureSet/V1161/Contract/GetRandomSongsDataProviderInterface.php b/src/FeatureSet/V1161/Contract/GetRandomSongsDataProviderInterface.php
@@ -32,6 +32,6 @@ public function getRandomSongs(
         ?int $limit = 10,
         ?string $genreName = null,
         ?int $fromYear = null,
-        ?int $toYear = null
+        ?int $toYear = null,
     ): Traversable;
 }
diff --git a/src/FeatureSet/V1161/Contract/GetStarred2DataProviderInterface.php b/src/FeatureSet/V1161/Contract/GetStarred2DataProviderInterface.php
@@ -39,6 +39,6 @@ interface GetStarred2DataProviderInterface extends V1161DataProviderInterface
      * }
      */
     public function getStarred(
-        ?string $musicFolderId
+        ?string $musicFolderId,
     ): array;
 }
diff --git a/src/FeatureSet/V1161/FeatureSetFactory.php b/src/FeatureSet/V1161/FeatureSetFactory.php
@@ -23,40 +23,40 @@ public function getMethods(): array
     {
         return [
             'ping.view' => static fn (): Method\V1161MethodInterface => new Method\PingMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getLicense.view' => static fn (): Method\V1161MethodInterface => new Method\GetLicenseMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getAlbum.view' => static fn (): Method\V1161MethodInterface => new Method\GetAlbumMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getAlbumList2.view' => static fn (): Method\V1161MethodInterface => new Method\GetAlbumList2Method(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getArtists.view' => static fn (): Method\V1161MethodInterface => new Method\GetArtistsMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getCoverArt.view' => static fn (): Method\V1161MethodInterface => new Method\GetCoverArtMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getArtist.view' => static fn (): Method\V1161MethodInterface => new Method\GetArtistMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getGenres.view' => static fn (): Method\V1161MethodInterface => new Method\GetGenresMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getMusicFolders.view' => static fn (): Method\V1161MethodInterface => new Method\GetMusicFoldersMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'stream.view' => static fn (): Method\V1161MethodInterface => new Method\StreamMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getStarred2.view' => static fn (): Method\V1161MethodInterface => new Method\GetStarred2Method(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
             'getRandomSongs.view' => static fn (): Method\V1161MethodInterface => new Method\GetRandomSongsMethod(
-                new ResponderFactory()
+                new ResponderFactory(),
             ),
         ];
     }

diff --git a/src/FeatureSet/V1161/Method/GetAlbumList2Method.php b/src/FeatureSet/V1161/Method/GetAlbumList2Method.php
@@ -20,14 +20,14 @@
  *
  * @see http://www.subsonic.org/pages/api.jsp#getAlbumList2
  */
-final class GetAlbumList2Method implements V1161MethodInterface
+final readonly class GetAlbumList2Method implements V1161MethodInterface
 {
     /**
      * List of allowed types for ordering
      *
      * @var string[]
      */
-    private const ORDER_TYPES = [
+    private const array ORDER_TYPES = [
         'random',
         'newest',
         'frequent',
@@ -42,15 +42,15 @@ final class GetAlbumList2Method implements V1161MethodInterface
     /**
      * @var int
      */
-    private const DEFAULT_LIMIT = 10;
+    private const int DEFAULT_LIMIT = 10;
 
     /**
      * @var int
      */
-    private const MAX_LIMIT = 500;
+    private const int MAX_LIMIT = 500;
 
     public function __construct(
-        private readonly ResponderFactoryInterface $responderFactory,
+        private ResponderFactoryInterface $responderFactory,
     ) {
     }
 
@@ -76,7 +76,7 @@ public function __invoke(
 
         if (!in_array($type, self::ORDER_TYPES, true)) {
             throw new MethodCallFailedException(
-                ErrorCodeEnum::MISSING_PARAMETER
+                ErrorCodeEnum::MISSING_PARAMETER,
             );
         }
 
@@ -88,7 +88,7 @@ public function __invoke(
 
             if ($fromYear === null || $toYear === null) {
                 throw new MethodCallFailedException(
-                    ErrorCodeEnum::MISSING_PARAMETER
+                    ErrorCodeEnum::MISSING_PARAMETER,
                 );
             }
 
@@ -99,7 +99,7 @@ public function __invoke(
             $genre = $queryParams['genre'] ?? null;
             if ($genre === null) {
                 throw new MethodCallFailedException(
-                    ErrorCodeEnum::MISSING_PARAMETER
+                    ErrorCodeEnum::MISSING_PARAMETER,
                 );
             }
 
@@ -115,7 +115,7 @@ public function __invoke(
         );
 
         return $this->responderFactory->createAlbumList2Responder(
-            $this->transformAlbums($albumList)
+            $this->transformAlbums($albumList),
         );
     }
 

diff --git a/src/FeatureSet/V1161/Method/GetAlbumMethod.php b/src/FeatureSet/V1161/Method/GetAlbumMethod.php
@@ -15,10 +15,10 @@
  *
  * This class covers the `getAlbum.view` method
  */
-final class GetAlbumMethod implements V1161MethodInterface
+final readonly class GetAlbumMethod implements V1161MethodInterface
 {
     public function __construct(
-        private readonly ResponderFactoryInterface $responderFactory,
+        private ResponderFactoryInterface $responderFactory,
     ) {
     }
 
@@ -39,7 +39,7 @@ public function __invoke(
 
         if ($album === null) {
             throw new MethodCallFailedException(
-                ErrorCodeEnum::NOT_FOUND
+                ErrorCodeEnum::NOT_FOUND,
             );
         }
 
@@ -72,9 +72,9 @@ public function __invoke(
                         'artistId' => $song['artistId'],
                         'playCount' => $song['playCount'],
                     ],
-                    $album['songs']
-                )
-            )
+                    $album['songs'],
+                ),
+            ),
         );
     }
 }
diff --git a/src/FeatureSet/V1161/Method/GetArtistMethod.php b/src/FeatureSet/V1161/Method/GetArtistMethod.php
@@ -15,10 +15,10 @@
  *
  * This class covers the `getArtist.view` method
  */
-final class GetArtistMethod implements V1161MethodInterface
+final readonly class GetArtistMethod implements V1161MethodInterface
 {
     public function __construct(
-        private readonly ResponderFactoryInterface $responderFactory,
+        private ResponderFactoryInterface $responderFactory,
     ) {
     }
 
@@ -39,7 +39,7 @@ public function __invoke(
 
         if ($artist === null) {
             throw new MethodCallFailedException(
-                ErrorCodeEnum::NOT_FOUND
+                ErrorCodeEnum::NOT_FOUND,
             );
         }
 
@@ -65,8 +65,8 @@ public function __invoke(
                     'year' => $album['year'] ?? '',
                     'genre' => $album['genre'] ?? '',
                 ],
-                $artist['albums']
-            )
+                $artist['albums'],
+            ),
         );
     }
 }
diff --git a/src/FeatureSet/V1161/Method/GetArtistsMethod.php b/src/FeatureSet/V1161/Method/GetArtistsMethod.php
@@ -15,10 +15,10 @@
  *
  * @see http://www.subsonic.org/pages/api.jsp#getArtists
  */
-final class GetArtistsMethod implements V1161MethodInterface
+final readonly class GetArtistsMethod implements V1161MethodInterface
 {
     public function __construct(
-        private readonly ResponderFactoryInterface $responderFactory,
+        private ResponderFactoryInterface $responderFactory,
     ) {
     }
 
@@ -79,7 +79,7 @@ public function __invoke(
             [
                 'ignoredArticles' => implode(' ', $artistListDataProvider->getIgnoredArticles()),
                 'index' => $data,
-            ]
+            ],
         );
     }
 }