Merge branch 'master' of github.com:Joomla/framework.joomla.org

# Conflicts: # composer.json # composer.lock # package-lock.json
joomla · Oct 19, 2023 · f6e253e · f6e253e
2 parents 2ca7bc4 + c81385c
commit f6e253e
Show file tree

Hide file tree

Showing 4 changed files with 2,121 additions and 9,719 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "homepage": "http://github.com/joomla/framework.joomla.org",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": "^7.2",
+        "php": "^7.4",
         "ext-json": "*",
         "ext-pdo": "*",
         "fig/link-util": "^1.1",
@@ -32,7 +32,7 @@
         "monolog/monolog": "^2.1",
         "psr/link": "^1.0",
         "ramsey/uuid": "^4.0.1",
-        "robmorgan/phinx": "^0.12.3",
+        "robmorgan/phinx": "^0.14.0",
         "symfony/asset": "^5.1.2",
         "symfony/process": "^5.1.2",
         "symfony/web-link": "^5.1.2",
@@ -41,7 +41,7 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.19.3",
+        "friendsofphp/php-cs-fixer": "^3.13.2",
         "squizlabs/php_codesniffer": "~3.0",
         "maximebf/debugbar": "^1.16.3"
     },
@@ -57,7 +57,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.2.5"
+            "php": "7.4.0"
         }
     }
 }