Merge pull request #182 from eivydas/feature/php8.3

Allow PHP 8.3
Webador · Apr 5, 2024 · 6b2c3cb · 6b2c3cb
2 parents 8c76820 + 1fc5eec
commit 6b2c3cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,6 +19,7 @@ jobs:
                     - "8.0"
                     - "8.1"
                     - "8.2"
+                    - "8.3"
                 dependencies:
                     - "highest"
                     - "lowest"

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         }
     ],
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "laminas/laminas-eventmanager": "^3.4",
         "laminas/laminas-router": "^3.5",
         "slm/queue": "^3.1",
@@ -36,7 +36,7 @@
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "doctrine/doctrine-orm-module": "^4.1 || ^5.0",
+        "doctrine/doctrine-orm-module": "^4.1 || ^5.0 || ^6.0",
         "laminas/laminas-modulemanager": "^2.11",
         "laminas/laminas-view": "^2.13",
         "laminas/laminas-log": "^2.15",
@@ -47,6 +47,9 @@
         "phpunit/phpunit": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.2"
     },
+    "conflict": {
+        "doctrine/cache": ">=2.0"
+    },
     "suggest": {
         "doctrine/doctrine-orm-module": "If you use Doctrine in combination with Laminas",
         "roave/psr-container-doctrine": "Configures Doctrine services automatically."

diff --git a/tests/laminas-runner/composer.json b/tests/laminas-runner/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "slm/queue-doctrine": "*",
-        "doctrine/doctrine-orm-module": "^4.1 || ^5.0"
+        "doctrine/doctrine-orm-module": "^4.1 || ^5.0 || ^6.0"
     },
     "replace": {
         "laminas/laminas-cache-storage-adapter-apc": "*",

diff --git a/tests/mezzio-runner/composer.json b/tests/mezzio-runner/composer.json
@@ -4,7 +4,7 @@
         "mezzio/mezzio": "^3.2.1",
         "laminas/laminas-diactoros": "^2.3.0",
         "laminas/laminas-config-aggregator": "^1.2",
-        "doctrine/doctrine-orm-module": "^4.1 || ^5.0"
+        "doctrine/doctrine-orm-module": "^4.1 || ^5.0 || ^6.0"
     },
     "replace": {
         "laminas/laminas-cache-storage-adapter-apc": "*",
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ jobs: @@
                         - "8.0"
                         - "8.1"
                         - "8.2"
+                        - "8.3"
                     dependencies:
                         - "highest"
                         - "lowest"
@@ Expand Down @@