chore: v12 only, code-style

.code-quality/phpstan-baseline.neon

@@ -28,26 +28,6 @@ parameters:
 				message: "#^Method Aoe\\\\Restler\\\\System\\\\Restler\\\\RestlerExtended\\:\\:postCall\\(\\) has no return type specified\\.$#"
 				count: 1
 				path: ../Classes/System/Restler/RestlerExtended.php
-			-
-				message: "#^Dead catch \\- Error is never thrown in the try block\\.$#"
-				count: 1
-				path: ../Classes/System/Restler/Builder.php
-			-
-				message: "#^Anonymous variable in a `\\$request\\-\\>getAttribute\\('site'\\)\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
-				count: 1
-				path: ../Classes/System/Dispatcher.php
-			-
-				message: "#^Anonymous variable in a `\\$request\\-\\>getAttribute\\('site'\\)\\-\\>getBase\\(\\)\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
-				count: 1
-				path: ../Classes/System/Dispatcher.php
-			-
-				message: "#^Anonymous variable in a `\\$this\\-\\>request\\-\\>getAttribute\\('site'\\)\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
-				count: 1
-				path: ../Classes/System/Restler/RestlerExtended.php
-			-
-				message: "#^Anonymous variable in a `\\$this\\-\\>request\\-\\>getAttribute\\('site'\\)\\-\\>getBase\\(\\)\\-\\>\\.\\.\\.\\(\\)` method call can lead to false dead methods\\. Make sure the variable type is known$#"
-				count: 1
-				path: ../Classes/System/Restler/RestlerExtended.php
 			-
 				message: "#^Method Aoe\\\\Restler\\\\System\\\\RestApi\\\\RestApiRequest\\:\\:composeHeaders\\(\\) has no return type specified\\.$#"
 				count: 1
@@ -64,3 +44,7 @@ parameters:
 				message: "#^Comparison operation \"\\>\" between int\\<1, max\\> and 0 is always true\\.$#"
 				count: 1
 				path: ../Classes/System/Restler/Format/HalJsonFormat.php
+			-
+				message: "#^Interface (.*) has only single implementer. Consider using the class directly as there is no point in using the interface.$#"
+				count: 1
+				path: ../Classes/System/Restler/ConfigurationInterface.php

.code-quality/phpstan.neon

@@ -8,9 +8,10 @@ parameters:
     paths:
         - "../Classes/"
 
+    ignoreErrors:
+        - identifier: missingType.iterableValue
+
     inferPrivatePropertyTypeFromConstructor: true
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     checkAlwaysTrueCheckTypeFunctionCall: false
     checkAlwaysTrueStrictComparison: false
 

.code-quality/rector.php

@@ -5,12 +5,10 @@
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
-use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector;
 use Rector\Set\ValueObject\SetList;
 use Rector\PHPUnit\Set\PHPUnitSetList;
-use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictSetUpRector;
 
@@ -35,8 +33,6 @@
         PHPUnitSetList::PHPUNIT_CODE_QUALITY
     ])
     ->withSkip([
-        FinalizeClassesWithoutChildrenRector::class,
-        ChangeAndIfToEarlyReturnRector::class,
         TypedPropertyFromStrictSetUpRector::class,
         AddMethodCallBasedStrictParamTypeRector::class,
         FlipTypeControlToUseExclusiveTypeRector::class,

.github/workflows/tests.yml

@@ -1,18 +1,6 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - '**'
-      - '!TYPO3_V10'
-      - '!TYPO3V8'
-      - '!TYPO3V9'
-  pull_request:
-    branches:
-      - '**'
-      - '!TYPO3_V10'
-      - '!TYPO3V8'
-      - '!TYPO3V9'
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -22,12 +10,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        typo3: [ ^11.5, ^12.4 ]
-        php: [ '8.0', '8.1', '8.2', '8.3' ]
+        typo3: [ ^12.4 ]
+        php: [ '8.1', '8.2', '8.3' ]
         experimental: [false]
-        exclude:
-          - typo3: ^12.4
-            php: '8.0'
+
 
     continue-on-error: ${{ matrix.experimental }}
 

.scrutinizer.yml

@@ -1,6 +1,9 @@
 build:
     nodes:
         analysis:
+            image: default-bionic
+            environment:
+                php: 8.3.0
             tests:
                 override:
                     - php-scrutinizer-run

Classes/Controller/BeUserAuthenticationController.php

@@ -63,11 +63,9 @@ class BeUserAuthenticationController implements iAuthenticate
      */
     public $restler;
 
-    private Loader $typo3Loader;
-
-    public function __construct(Loader $typo3Loader)
-    {
-        $this->typo3Loader = $typo3Loader;
+    public function __construct(
+        private readonly Loader $typo3Loader
+    ) {
         $this->restler = Scope::get('Restler');
     }
 

Classes/Controller/FeUserAuthenticationController.php

@@ -89,11 +89,9 @@ class FeUserAuthenticationController implements iAuthenticate
      */
     public $restler;
 
-    private Loader $typo3Loader;
-
-    public function __construct(Loader $typo3Loader)
-    {
-        $this->typo3Loader = $typo3Loader;
+    public function __construct(
+        private readonly Loader $typo3Loader
+    ) {
         $this->restler = Scope::get('Restler');
     }
 

Classes/System/Dispatcher.php

@@ -83,7 +83,15 @@ protected function extractSiteUrl(ServerRequestInterface $request): string
         }
 
         if ($siteBasePath) {
-            return '/' . rtrim(preg_replace('%^' . preg_quote($siteBasePath, '%') . '%', '', $request->getUri()->getPath()), '/');
+            return '/' . rtrim(
+                (string) preg_replace(
+                    '%^' . preg_quote((string) $siteBasePath, '%') . '%',
+                    '',
+                    $request->getUri()
+                        ->getPath()
+                ),
+                '/'
+            );
         }
 
         return $request->getUri()

Classes/System/RestApi/RestApiClient.php

@@ -37,24 +37,15 @@
 
 class RestApiClient implements SingletonInterface
 {
-    private Cache $typo3Cache;
-
-    private ExtensionConfiguration $extensionConfiguration;
-
     private bool $isExecutingRequest = false;
 
     private bool $isRequestPrepared = false;
 
-    private RestApiRequestScope $restApiRequestScope;
-
     public function __construct(
-        ExtensionConfiguration $extensionConfiguration,
-        RestApiRequestScope $restApiRequestScope,
-        Cache $typo3Cache
+        private readonly ExtensionConfiguration $extensionConfiguration,
+        private readonly RestApiRequestScope $restApiRequestScope,
+        private readonly Cache $typo3Cache
     ) {
-        $this->extensionConfiguration = $extensionConfiguration;
-        $this->restApiRequestScope = $restApiRequestScope;
-        $this->typo3Cache = $typo3Cache;
     }
 
     public function isExecutingRequest(): bool

Classes/System/RestApi/RestApiJsonFormat.php

@@ -53,13 +53,13 @@ public function decode($data)
         }
 
         try {
-            $decoded = json_decode($data, false, 512, $options);
+            $decoded = json_decode((string) $data, false, 512, $options);
             $this->handleJsonError();
         } catch (\RuntimeException $runtimeException) {
             throw new RestException('400', $runtimeException->getMessage());
         }
 
-        if (strlen($data) && $decoded === null || $decoded === $data) {
+        if (strlen((string) $data) && $decoded === null || $decoded === $data) {
             throw new RestException('400', 'Error parsing JSON');
         }
 

Classes/System/RestApi/RestApiRequest.php

@@ -88,10 +88,6 @@ class RestApiRequest extends Restler
      */
     private string $restApiRequestMethod;
 
-    private RestApiRequestScope $restApiRequestScope;
-
-    private Cache $typo3Cache;
-
     /***************************************************************************************************************************/
     /***************************************************************************************************************************/
     /* Block of methods, which MUST be overridden from parent-class (otherwise this class can not work) *************************/
@@ -101,10 +97,10 @@ class RestApiRequest extends Restler
      * Override parent method...because we don't want to call it!
      * The original method would set some properties (e.g. set this object into static properties of global classes)
      */
-    public function __construct(RestApiRequestScope $restApiRequestScope, Cache $typo3Cache)
-    {
-        $this->restApiRequestScope = $restApiRequestScope;
-        $this->typo3Cache = $typo3Cache;
+    public function __construct(
+        private readonly RestApiRequestScope $restApiRequestScope,
+        private readonly Cache $typo3Cache
+    ) {
     }
 
     /**
@@ -235,7 +231,7 @@ protected function postCall()
                 $_GET,
                 $this->apiMethodInfo->metadata,
                 $this->responseData,
-                get_class($this->responseFormat),
+                $this->responseFormat::class,
                 [] // we don't know which headers would be 'normally' send - because this is an internal REST-API-call
             );
         }

Classes/System/Restler/AbstractExceptionHandler.php

@@ -26,7 +26,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use Aoe\Restler\Configuration\ExtensionConfiguration;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Restler;
 use Luracast\Restler\Scope;
@@ -37,13 +36,6 @@
  */
 abstract class AbstractExceptionHandler
 {
-    protected ExtensionConfiguration $extensionConfiguration;
-
-    public function __construct(ExtensionConfiguration $extensionConfiguration)
-    {
-        $this->extensionConfiguration = $extensionConfiguration;
-    }
-
     /**
      * handle HTTP-Status-Codes of type 1xx
      */

Classes/System/Restler/Builder.php

@@ -41,14 +41,10 @@
 
 class Builder implements SingletonInterface
 {
-    private ExtensionConfiguration $extensionConfiguration;
-
-    private CacheManager $cacheManager;
-
-    public function __construct(ExtensionConfiguration $extensionConfiguration, CacheManager $cacheManager)
-    {
-        $this->extensionConfiguration = $extensionConfiguration;
-        $this->cacheManager = $cacheManager;
+    public function __construct(
+        private readonly ExtensionConfiguration $extensionConfiguration,
+        private readonly CacheManager $cacheManager,
+    ) {
     }
 
     /**

Classes/System/Restler/Configuration.php

@@ -41,11 +41,9 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    private ExtensionConfiguration $extensionConfiguration;
-
-    public function __construct(ExtensionConfiguration $extensionConfiguration)
-    {
-        $this->extensionConfiguration = $extensionConfiguration;
+    public function __construct(
+        private readonly ExtensionConfiguration $extensionConfiguration
+    ) {
     }
 
     /**

Classes/System/Restler/Format/HalJsonFormat.php

@@ -114,7 +114,7 @@ public function encode($data, $humanReadable = false)
         if (self::$unEscapedUnicode) {
             $result = preg_replace_callback(
                 '/\\\u(\w\w\w\w)/',
-                static function (array $matches) {
+                static function (array $matches): string|false {
                     if (function_exists('mb_convert_encoding')) {
                         return mb_convert_encoding(pack('H*', $matches[1]), 'UTF-8', 'UTF-16BE');
                     }
@@ -154,13 +154,13 @@ public function decode($data): ?array
         }
 
         try {
-            $decoded = json_decode($data, false, 512, $options);
+            $decoded = json_decode((string) $data, false, 512, $options);
             $this->handleJsonError();
         } catch (\RuntimeException $runtimeException) {
             throw new RestException('400', $runtimeException->getMessage());
         }
 
-        if (strlen($data) && $decoded === null || $decoded === $data) {
+        if (strlen((string) $data) && $decoded === null || $decoded === $data) {
             throw new RestException('400', 'Error parsing JSON');
         }