Increase supported PHP version (#236)

sulu · Jul 17, 2024 · 93b87b8 · 93b87b8
1 parent 0b31497
commit 93b87b8
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 40 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -14,53 +14,48 @@ jobs:
 
         env:
             APP_ENV: test
-            DATABASE_URL: mysql://root:[email protected]:3306/su_content_test?serverVersion=5.7.32
+            DATABASE_URL: mysql://root:[email protected]:3306/su_content_test?serverVersion=8.0.29
             DATABASE_CHARSET: utf8mb4
             DATABASE_COLLATE: utf8mb4_unicode_ci
 
         strategy:
             fail-fast: false
             matrix:
                 include:
-                    - php-version: '7.3'
+                    - php-version: '8.0'
                       coverage: false
                       dependency-versions: 'lowest'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: disabled
 
-                    - php-version: '7.4'
+                    - php-version: '8.1'
                       coverage: false
                       dependency-versions: 'highest'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
-                    - php-version: '8.0'
+                    - php-version: '8.2'
                       coverage: false
                       dependency-versions: 'highest'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
-                    - php-version: '8.1'
+                    - php-version: '8.3'
                       coverage: true
                       dependency-versions: 'highest'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
-                    - php-version: '8.2'
-                      coverage: false
-                      dependency-versions: 'highest'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
-
-                    - php-version: '8.3'
+                    - php-version: '8.4'
+                      composer-options: '--ignore-platform-reqs'
                       coverage: false
                       dependency-versions: 'highest'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
         services:
             mysql:
-                image: mysql:5.7
+                image: mysql:8.0
                 env:
                     MYSQL_ROOT_PASSWORD: root
                 ports:

diff --git a/Content/Domain/Model/DimensionContentCollection.php b/Content/Domain/Model/DimensionContentCollection.php
@@ -95,8 +95,10 @@ public function getDimensionAttributes(): array
         return $this->dimensionAttributes;
     }
 
-    #[\ReturnTypeWillChange]
-    public function getIterator()
+    /**
+     * @return \Traversable<T>
+     */
+    public function getIterator(): \Traversable
     {
         return $this->dimensionContents;
     }

diff --git a/Content/Infrastructure/Sulu/Structure/ContentStructureBridge.php b/Content/Infrastructure/Sulu/Structure/ContentStructureBridge.php
@@ -329,8 +329,7 @@ public function toArray($complete = true): array
     /**
      * @return mixed[]
      */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->toArray(true);
     }

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,11 @@
 # Upgrade
 
+## 0.8.0
+
+### Require PHP 8.1
+
+The SuluContentBundle now requires atleast PHP 8.0.
+
 ## 0.7.0
 
 ### Route property name forced to `url`

diff --git a/composer.json b/composer.json
@@ -11,33 +11,33 @@
     "homepage": "https://github.com/sulu/SuluContentBundle",
     "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0",
         "doctrine/inflector": "^1.4.1 || ^2.0.1",
         "doctrine/collections": "^1.0",
         "doctrine/orm": "^2.5.3",
-        "doctrine/persistence": "^1.3 || ^2.0 || ^3.0",
-        "doctrine/doctrine-bundle": "^1.10 || ^2.0",
+        "doctrine/persistence": "^2.2",
+        "doctrine/doctrine-bundle": "^2.4",
         "friendsofsymfony/rest-bundle": "^2.6 || ^3.0",
         "massive/search-bundle": "^2.4",
         "ramsey/uuid": "^3.8 || ^4.0",
-        "sulu/sulu": "^2.4 || ^2.6@dev",
-        "symfony/config": "^4.4 || ^5.4 || ^6.0",
-        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
-        "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
-        "symfony/options-resolver": "^4.4 || ^5.4 || ^6.0",
-        "symfony/property-access": "^4.4 || ^5.4 || ^6.0",
-        "symfony/security-core": "^4.4 || ^5.4 || ^6.0",
-        "symfony/serializer": "^4.4 || ^5.4 || ^6.0",
+        "sulu/sulu": "^2.5.6 || ^2.6@dev",
+        "symfony/config": "^5.4 || ^6.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0",
+        "symfony/event-dispatcher": "^5.4 || ^6.0",
+        "symfony/http-foundation": "^5.4 || ^6.0",
+        "symfony/http-kernel": "^5.4 || ^6.0",
+        "symfony/options-resolver": "^5.4 || ^6.0",
+        "symfony/property-access": "^5.4 || ^6.0",
+        "symfony/security-core": "^5.4 || ^6.0",
+        "symfony/serializer": "^5.4 || ^6.0",
         "symfony/translation-contracts": "^1.0 || ^2.0 || ^3.0",
-        "symfony/workflow": "^4.4 || ^5.4 || ^6.0",
+        "symfony/workflow": "^5.4 || ^6.0",
         "webmozart/assert": "^1.3"
     },
     "require-dev": {
-        "coduo/php-matcher": "^5.0.1 || ^6.0",
+        "coduo/php-matcher": "^6.0",
         "doctrine/data-fixtures": "^1.3.3",
-        "doctrine/doctrine-fixtures-bundle": "^2.0 || ^3.0",
+        "doctrine/doctrine-fixtures-bundle": "^3.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "handcraftedinthealps/code-coverage-checker": "^0.2.1",
         "handcraftedinthealps/zendsearch": "^2.0",
@@ -53,20 +53,22 @@
         "phpstan/phpstan-symfony": "^1.0",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^8.5.33 || ^9.6.5",
-        "qossmic/deptrac-shim": "^0.11.1 || ^0.23.0 || ^1.0",
+        "qossmic/deptrac-shim": "^0.23 || ^1.0",
         "sulu/automation-bundle": "^2.0@dev",
-        "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0",
-        "symfony/console": "^4.4 || ^5.4 || ^6.0",
-        "symfony/dotenv": "^4.4 || ^5.4 || ^6.0",
-        "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0",
+        "symfony/browser-kit": "^5.4 || ^6.0",
+        "symfony/console": "^5.4 || ^6.0",
+        "symfony/dotenv": "^5.4 || ^6.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0",
         "symfony/monolog-bundle": "^3.1",
         "symfony/phpunit-bridge": "^5.4 || ^6.0",
-        "symfony/string": "^4.4 || ^5.4 || ^6.0",
+        "symfony/string": "^5.4 || ^6.0",
         "thecodingmachine/phpstan-strict-rules": "^1.0"
     },
     "conflict": {
         "coduo/php-matcher": "6.0.12",
-        "doctrine/persistence": "1.3.2"
+        "doctrine/persistence": "1.3.2",
+        "doctrine/phpcr-bundle": ">=3.0",
+        "symfony/security-bundle": ">=7.0"
     },
     "config": {
         "sort-packages": true,