ATTEMPT: reset php deps to main

MTES-MCT · Sep 19, 2023 · 6a0c624 · 6a0c624
1 parent aaebdb6
commit 6a0c624
Show file tree

Hide file tree

Showing 3 changed files with 330 additions and 254 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
           sudo apt install symfony-cli
 
       - name: CI
-        run: make ci CI=1 BIN_PHP="php" BIN_CONSOLE="php bin/console" BIN_COMPOSER="composer" BIN_NPM="npm" BIN_NPX="npx" PLAYWRIGHT_ARGS="-x --forbid-only --timeout=5000"
+        run: make ci CI=1 BIN_PHP="php" BIN_CONSOLE="php bin/console" BIN_COMPOSER="composer" BIN_NPM="npm" BIN_NPX="npx" PLAYWRIGHT_ARGS="-x --forbid-only"
 
       - uses: codecov/codecov-action@v3
         with:

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "ext-iconv": "*",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/doctrine-migrations-bundle": "^3.2",
-        "doctrine/orm": "< 2.15.5",
+        "doctrine/orm": "^2.13",
         "easycorp/easyadmin-bundle": "^4.7",
         "jsor/doctrine-postgis": "^2.1",
         "nelmio/security-bundle": "^3.0",
@@ -106,7 +106,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "< 6.3.2"
+            "require": "6.3.*"
         },
         "paas": {
             "php-config": [