Update to PHP 8.5

Author: thisismeonmounteverest

.github/workflows/ci.yml

@@ -77,11 +77,14 @@ jobs:
         run: composer install --prefer-dist --no-progress --no-suggest --no-interaction --no-scripts
 
       - name: Run phpunit tests
-        run: bin/phpunit --coverage-text --coverage-xml=build/logs/phpunit/coverage-xml --coverage-clover=build/logs/phpunit/clover.xml --log-junit=build/logs/phpunit/junit.xml --colors=never
+        run: bin/phpunit --coverage-text --coverage-xml=build/logs/phpunit/coverage-xml --coverage-clover=build/logs/phpunit/clover.xml --log-junit=build/logs/phpunit/unit.xml --colors=never --order-by=random --exclude-group=integration
 
       - name: Run Infection tests
         run: vendor/bin/infection --coverage=build/logs/phpunit --min-covered-msi=85 --threads=30
 
+      - name: Run Integration tests
+        run: bin/phpunit --log-junit=build/logs/phpunit/integration.xml --colors=never --order-by=random --group=integration
+
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # tag=v4.6.2
         if: ${{ always() }}
         with:

Dockerfile

@@ -4,7 +4,7 @@
 
 
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
-ARG PHP_VERSION=8.4
+ARG PHP_VERSION=8.5
 ARG NGINX_VERSION=1.29
 
 

Makefile

@@ -12,7 +12,7 @@ TIME_STAMP := $(shell git log -n 1 --format=%aI)
 
 all: phpci
 
-phpci: phpcpd phploc php-code-sniffer php-cs-fixer phpunit infection version
+phpci: phpcpd phploc php-code-sniffer php-cs-fixer phpunit infection int-test version
 
 install:
 	git rev-parse --short HEAD > VERSION
@@ -82,7 +82,10 @@ php-code-sniffer:
 	"./vendor/bin/phpcs"  --colors --warning-severity=Error
 
 phpunit:
-	"./bin/phpunit" --coverage-xml=build/logs/phpunit/coverage-xml --coverage-clover=build/logs/phpunit/clover.xml --log-junit=build/logs/phpunit/junit.xml --colors=never  --order-by=random
+	"./bin/phpunit" --coverage-xml=build/logs/phpunit/coverage-xml --coverage-clover=build/logs/phpunit/clover.xml --log-junit=build/logs/phpunit/junit.xml --colors=never  --order-by=random --exclude-group=integration
+
+int-test:
+	"./bin/phpunit" --log-junit=build/logs/phpunit/junit.xml --colors=never  --order-by=random --group=integration
 
 infection: phpunit
 	"./vendor/bin/infection" --coverage=build/logs/phpunit --min-covered-msi=85 --threads=30

composer.json

@@ -152,7 +152,7 @@
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "8.4"
+            "php": "8.5"
         },
         "allow-plugins": {
             "infection/extension-installer": true,

composer.lock

@@ -689,10 +689,10 @@
  *     },
  *     orm?: array{
  *         default_entity_manager?: scalar|null,
- *         enable_native_lazy_objects?: bool, // no-op, will be deprecated and removed in the future // Default: true
+ *         enable_native_lazy_objects?: bool, // Deprecated: The "enable_native_lazy_objects" option is deprecated and will be removed in DoctrineBundle 4.0, as native lazy objects are now always enabled. // Default: true
  *         controller_resolver?: bool|array{
  *             enabled?: bool, // Default: true
- *             auto_mapping?: bool, // Set to true to enable using route placeholders as lookup criteria when the primary key doesn't match the argument name // Default: false
+ *             auto_mapping?: bool, // Deprecated: The "auto_mapping" option is deprecated and will be removed in DoctrineBundle 4.0, as it only accepts `false` since 3.0. // Set to true to enable using route placeholders as lookup criteria when the primary key doesn't match the argument name // Default: false
  *             evict_cache?: bool, // Set to true to fetch the entity from the database instead of using the cache, if any // Default: false
  *         },
  *         entity_managers?: array<string, array{ // Default: []
@@ -1419,11 +1419,6 @@
  *     intercept_redirects?: bool, // Default: false
  *     excluded_ajax_paths?: scalar|null, // Default: "^/((index|app(_[\\w]+)?)\\.php/)?_wdt"
  * }
- * @psalm-type MakerConfig = array{
- *     root_namespace?: scalar|null, // Default: "App"
- *     generate_final_classes?: bool, // Default: true
- *     generate_final_entities?: bool, // Default: false
- * }
  * @psalm-type ExerciseHtmlPurifierConfig = array{
  *     default_cache_serializer_path?: scalar|null, // Default: "%kernel.cache_dir%/htmlpurifier"
  *     default_cache_serializer_permissions?: scalar|null, // Default: 493
@@ -1544,6 +1539,12 @@
  *         skip_same_as_origin?: bool,
  *     }>,
  * }
+ * @psalm-type DamaDoctrineTestConfig = array{
+ *     enable_static_connection?: mixed, // Default: true
+ *     enable_static_meta_data_cache?: bool, // Default: true
+ *     enable_static_query_cache?: bool, // Default: true
+ *     connection_keys?: list<mixed>,
+ * }
  * @psalm-type GregwarCaptchaConfig = array{
  *     length?: scalar|null, // Default: 5
  *     width?: scalar|null, // Default: 130
@@ -1808,11 +1809,10 @@
  *     skip_translation_on_load?: bool, // Default: false
  *     metadata_cache_pool?: scalar|null, // Default: null
  * }
- * @psalm-type DamaDoctrineTestConfig = array{
- *     enable_static_connection?: mixed, // Default: true
- *     enable_static_meta_data_cache?: bool, // Default: true
- *     enable_static_query_cache?: bool, // Default: true
- *     connection_keys?: list<mixed>,
+ * @psalm-type MakerConfig = array{
+ *     root_namespace?: scalar|null, // Default: "App"
+ *     generate_final_classes?: bool, // Default: true
+ *     generate_final_entities?: bool, // Default: false
  * }
  * @psalm-type ConfigType = array{
  *     imports?: ImportsConfig,

config/reference.php

@@ -2,6 +2,3 @@ services:
     _defaults:
         autowire: true
         autoconfigure: true
-
-    App\Tests\Behat\:
-        resource: '../tests/Behat/*'

config/services_test.yaml

@@ -4,7 +4,7 @@
             "src/Model"
         ]
     },
-    "timeout": 20,
+    "timeout": 30,
     "logs": {
         "text": "infection.log"
     },

infection.json.dist infection.json5.distinfection.json.dist renamed to infection.json5.dist

@@ -1,27 +1,28 @@
-<?php
-
-use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\SetList;
-
-return RectorConfig::configure()
-    ->withSets([
-        SetList::PHP_53,
-        SetList::PHP_54,
-        SetList::PHP_55,
-        SetList::PHP_56,
-        SetList::PHP_70,
-        SetList::PHP_71,
-        SetList::PHP_72,
-        SetList::PHP_73,
-        SetList::PHP_80,
-        SetList::PHP_81,
-        SetList::PHP_82,
-        SetList::PHP_83,
-        SetList::PHP_84,
-    ])
-//    ->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
-    ->withPaths([
-        __DIR__ . '/src',
-        __DIR__ . '/tests',
-    ])
-    ;
+<?php
+
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\SetList;
+
+return RectorConfig::configure()
+    ->withSets([
+        SetList::PHP_53,
+        SetList::PHP_54,
+        SetList::PHP_55,
+        SetList::PHP_56,
+        SetList::PHP_70,
+        SetList::PHP_71,
+        SetList::PHP_72,
+        SetList::PHP_73,
+        SetList::PHP_80,
+        SetList::PHP_81,
+        SetList::PHP_82,
+        SetList::PHP_83,
+        SetList::PHP_84,
+        SetList::PHP_85,
+    ])
+    ->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ;