[TASK] php84 compatibility (#136)

Author: kszymukowicz

.ddev/config.yaml

@@ -3,8 +3,6 @@ type: php
 docroot: .test
 php_version: "8.3"
 webserver_type: apache-fpm
-router_http_port: "80"
-router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames:
     - 12.t3api
@@ -31,14 +29,13 @@ corepack_enable: false
 # name: <projectname> # Name of the project, automatically provides
 #   http://projectname.ddev.site and https://projectname.ddev.site
 
-# type: <projecttype>  # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
+# type: <projecttype>  # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, generic, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress
 # See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
 # information on the different project types
-# "drupal" covers recent Drupal 8+
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "8.2"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"
+# php_version: "8.3"  # PHP version to use, "5.6" through "8.4"
 
 # You can explicitly specify the webimage but this
 # is not recommended, as the images are often closely tied to DDEV's' behavior,
@@ -51,7 +48,7 @@ corepack_enable: false
 #   version: <version> # database version, like "10.11" or "8.0"
 #   MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
 #   MySQL versions can be 5.5-8.0.
-#   PostgreSQL versions can be 9-16.
+#   PostgreSQL versions can be 9-17.
 
 # router_http_port: <port>  # Port to be used for http (defaults to global configuration, usually 80)
 # router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
@@ -61,14 +58,33 @@ corepack_enable: false
 # "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
 # as leaving Xdebug enabled all the time is a big performance hit.
 
+# xhgui_https_port: 8142
+# Can be used to change the router https port for xhgui application
+# Very rarely used
+
+# xhgui_http_port: 8143
+# Can be used to change the router http port for xhgui application
+# Very rarely used
+
+# host_xhgui_port: 8142
+# Can be used to change the host binding port of the xhgui
+# application. Rarely used; only when port conflict and
+# bind_all_ports is used (normally with router disabled)
+
 # xhprof_enabled: false  # Set to true to enable Xhprof and "ddev start" or "ddev restart"
 # Note that for most people the commands
 # "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
 # as leaving Xhprof enabled all the time is a big performance hit.
 
-# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn
+# xhprof_mode: [prepend|xhgui|global]
+# Set to "xhgui" to enable XHGui features
+# "xhgui" will become default in a future major release
+
+# webserver_type: nginx-fpm, apache-fpm, generic
 
 # timezone: Europe/Berlin
+# If timezone is unset, DDEV will attempt to derive it from the host system timezone
+# using the $TZ environment variable or the /etc/localtime symlink.
 # This is the timezone used in the containers and by PHP;
 # it can be set to any valid timezone,
 # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
@@ -88,9 +104,9 @@ corepack_enable: false
 #   - preview
 #   - snapshot
 # Alternatively, an explicit Composer version may be specified, for example "2.2.18".
-# To reinstall Composer after the image was built, run "ddev debug refresh".
+# To reinstall Composer after the image was built, run "ddev debug rebuild".
 
-# nodejs_version: "20"
+# nodejs_version: "22"
 # change from the default system Node.js version to any other version.
 # See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
 # and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
@@ -216,8 +232,8 @@ corepack_enable: false
 
 # You can inject environment variables into the web container with:
 # web_environment:
-# - SOMEENV=somevalue
-# - SOMEOTHERENV=someothervalue
+#     - SOMEENV=somevalue
+#     - SOMEOTHERENV=someothervalue
 
 # no_project_mount: false
 # (Experimental) If true, DDEV will not mount the project into the web container;

.ddev/docker-compose.web.yaml

@@ -5,8 +5,8 @@ services:
       - PACKAGE_NAME=sourcebroker/t3api
 
       - TYPO3_VERSIONS=12 13
-      - TYPO3_VERSIONS_12_PHP=8.1 8.2 8.3
-      - TYPO3_VERSIONS_13_PHP=8.2 8.3
+      - TYPO3_VERSIONS_12_PHP=8.1 8.2 8.3 8.4
+      - TYPO3_VERSIONS_13_PHP=8.2 8.3 8.4
 
       - TYPO3_INSTALL_DB_DRIVER=mysqli
       - TYPO3_INSTALL_DB_USER=root

.github/workflows/TYPO3_12.yml

@@ -10,11 +10,11 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         typo3: ["12"]
-        php: ["8.1", "8.2", "8.3"]
+        php: ["8.1", "8.2", "8.3", "8.4"]
         composer: ["lowest", "highest"]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/TYPO3_13.yml

@@ -10,11 +10,11 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         typo3: ["13"]
-        php: ["8.2", "8.3"]
+        php: ["8.2", "8.3", "8.4"]
         composer: ["lowest", "highest"]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Classes/Serializer/ContextBuilder/DeserializationContextBuilder.php

@@ -24,7 +24,7 @@ public function create(): Context
      * @param null $targetObject
      * @return DeserializationContext
      */
-    public function createFromOperation(OperationInterface $operation, Request $request, $targetObject = null): Context
+    public function createFromOperation(OperationInterface $operation, Request $request, mixed $targetObject = null): Context
     {
         $context = $this->create();
 

Classes/Service/SerializerService.php

@@ -75,10 +75,7 @@ public static function isDebugMode(): bool
         return Environment::getContext()->isDevelopment();
     }
 
-    /**
-     * @param mixed $result
-     */
-    public function serialize($result, SerializationContext|null $serializationContext = null): string
+    public function serialize(mixed $result, ?SerializationContext $serializationContext = null): string
     {
         return $this->getSerializerBuilder()
             ->setSerializationContextFactory(function () use ($serializationContext): SerializationContext {
@@ -88,10 +85,7 @@ public function serialize($result, SerializationContext|null $serializationConte
             ->serialize($result, 'json');
     }
 
-    /**
-     * @return mixed
-     */
-    public function deserialize(string $data, string $type, DeserializationContext|null $deserializationContext = null)
+    public function deserialize(string $data, string $type, ?DeserializationContext $deserializationContext = null): mixed
     {
         return $this->getSerializerBuilder()
             ->setDeserializationContextFactory(function () use ($deserializationContext): DeserializationContext {

Tests/Functional/Domain/Repository/ApiResourceRepositoryTest.php

@@ -49,7 +49,7 @@ public function getAllDomainModelsReturnsAllClasses(): void
      * @return mixed
      * @throws \ReflectionException
      */
-    protected static function callProtectedMethod(string $methodName, array $arguments = [], object $object = null)
+    protected static function callProtectedMethod(string $methodName, array $arguments = [], ?object $object = null)
     {
         $serializerMetadataServiceReflection = new \ReflectionClass(ApiResourceRepository::class);
         $method = $serializerMetadataServiceReflection->getMethod($methodName);

Tests/Unit/Domain/Model/PaginationTest.php

@@ -165,7 +165,7 @@ public static function getNumberOfItemsPerPageReturnsCorrectValue(
         );
     }
 
-    protected static function getPaginationInstance(array $attributes = [], Request $request = null): Pagination
+    protected static function getPaginationInstance(array $attributes = [], ?Request $request = null): Pagination
     {
         $pagination = Pagination::create(
             array_merge(self::DEFAULT_API_RESOURCE_PAGINATION_ATTRIBUTES, $attributes)

composer.json

@@ -27,25 +27,21 @@
 		"symfony/property-info": "^6.4 || ^7.0",
 		"symfony/psr-http-message-bridge": "^6.4 || ^7.0",
 		"symfony/routing": "^6.4 || ^7.0",
-		"typo3/cms-core": "^12.4.16 || ^13.3",
+		"typo3/cms-core": "^13",
 		"typo3/cms-extbase": "^12.4.16 || ^13.3",
 		"typo3/cms-frontend": "^12.4.16 || ^13.3"
 	},
 	"require-dev": {
-		"ergebnis/composer-normalize": "^2.29.0",
-		"friendsofphp/php-cs-fixer": "^3.57.1",
+		"ergebnis/composer-normalize": "^2.47.0",
+		"friendsofphp/php-cs-fixer": "^3.75.0",
 		"phpstan/extension-installer": "^1.2.0",
-		"phpstan/phpstan": "^1.10.67",
-		"phpstan/phpstan-phpunit": "^1.3.16",
-		"phpstan/phpstan-strict-rules": "^1.5.5",
-		"phpunit/phpunit": "^10.5.17",
-		"saschaegerer/phpstan-typo3": "^1.10.0",
-		"seld/jsonlint": "^1.10.2",
-		"symfony/yaml": "^5.4 || ^6.0 || ^7.0",
+		"phpstan/phpstan": "^1.12.26",
+		"saschaegerer/phpstan-typo3": "~1.10.2",
+		"seld/jsonlint": "^1.11.0",
+		"symfony/yaml": "^6.0 || ^7.0",
 		"typo3/cms-install": "^12.4.16 || ^13.3",
 		"typo3/coding-standards": "^0.8",
-		"typo3/testing-framework": "^8.2.1",
-		"webmozart/assert": "^1.11.0"
+		"typo3/testing-framework": "^8.2.1"
 	},
 	"replace": {
 		"typo3-ter/t3api": "self.version"
@@ -90,7 +86,7 @@
 		],
 		"ci:composer:normalize": "@composer normalize --dry-run",
 		"ci:json:lint": "find ./composer.json ./Resources ./Configuration -name '*.json' | xargs -r php .Build/bin/jsonlint -q",
-		"ci:php:cs-fixer": ".Build/bin/php-cs-fixer fix --config .php-cs-fixer.php -v --dry-run --using-cache no --diff",
+		"ci:php:cs-fixer": "PHP_CS_FIXER_IGNORE_ENV=1 .Build/bin/php-cs-fixer fix --config .php-cs-fixer.php -v --dry-run --using-cache no --diff",
 		"ci:php:lint": "find . -name '*.php' -not -path './.Build/*' -not -path './.cache/*' -not -path './.ddev/*' -not -path './.test/*' -not -path './.Documentation/*'  -not -path './.Documentation-GENERATED-temp/*' -print0 | xargs -0 -n 1 -P 4 php -l > /dev/null",
 		"ci:php:stan": ".Build/bin/phpstan --no-progress",
 		"ci:tests:create-directories": "mkdir -p .Build/public/typo3temp/var/tests",
@@ -106,6 +102,6 @@
 			"@fix:composer:normalize"
 		],
 		"fix:composer:normalize": "@composer normalize",
-		"fix:php:cs-fixer": ".Build/bin/php-cs-fixer fix --config .php-cs-fixer.php"
+		"fix:php:cs-fixer": "PHP_CS_FIXER_IGNORE_ENV=1 .Build/bin/php-cs-fixer fix --config .php-cs-fixer.php"
 	}
 }

phpstan-baseline.neon

@@ -1,6 +1,5 @@
 parameters:
 	ignoreErrors:
-		- '#Construct empty\(\)#'
 		- '#Unsafe usage of new static\(\)#'
 		- '#Access to an undefined property Metadata\\PropertyMetadata::\$type.#'
 	typo3: