Resolve merge conflicts

COmanage · Jun 16, 2022 · 20a630f · 20a630f
2 parents 0b463b8 + b80f483
commit 20a630f
Show file tree

Hide file tree

Showing 2,527 changed files with 51,526 additions and 59,396 deletions.
diff --git a/app/composer.json b/app/composer.json
@@ -5,17 +5,17 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
-        "cakephp/cakephp": "~4.2.0",
-        "cakephp/migrations": "^3.0",
+        "php": ">=8.0",
+        "cakephp/cakephp": "^4.3",
+        "cakephp/migrations": "^3.2",
         "cakephp/plugin-installer": "^1.3",
-	"doctrine/dbal": "^3.1",
+        "doctrine/dbal": "^3.3",
         "mobiledetect/mobiledetectlib": "^2.8"
     },
     "require-dev": {
-        "cakephp/bake": "^2.3",
-        "cakephp/cakephp-codesniffer": "~4.2.0",
-        "cakephp/debug_kit": "^4.4",
+        "cakephp/bake": "^2.6",
+        "cakephp/cakephp-codesniffer": "^4.5",
+        "cakephp/debug_kit": "^4.5",
         "josegonzalez/dotenv": "^3.2",
         "phpunit/phpunit": "~8.5.0 || ^9.3",
         "psy/psysh": "@stable"
@@ -50,6 +50,10 @@
     },
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "cakephp/plugin-installer": true
+        }
     }
 }