Skip to content

Commit f6e253e

Browse files
committed
Merge branch 'master' of github.com:Joomla/framework.joomla.org
# Conflicts: # composer.json # composer.lock # package-lock.json
2 parents 2ca7bc4 + c81385c commit f6e253e

File tree

4 files changed

+2121
-9719
lines changed

4 files changed

+2121
-9719
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"homepage": "http://github.com/joomla/framework.joomla.org",
55
"license": "GPL-2.0-or-later",
66
"require": {
7-
"php": "^7.2",
7+
"php": "^7.4",
88
"ext-json": "*",
99
"ext-pdo": "*",
1010
"fig/link-util": "^1.1",
@@ -32,7 +32,7 @@
3232
"monolog/monolog": "^2.1",
3333
"psr/link": "^1.0",
3434
"ramsey/uuid": "^4.0.1",
35-
"robmorgan/phinx": "^0.12.3",
35+
"robmorgan/phinx": "^0.14.0",
3636
"symfony/asset": "^5.1.2",
3737
"symfony/process": "^5.1.2",
3838
"symfony/web-link": "^5.1.2",
@@ -41,7 +41,7 @@
4141
"twig/twig": "^3.0"
4242
},
4343
"require-dev": {
44-
"friendsofphp/php-cs-fixer": "^2.19.3",
44+
"friendsofphp/php-cs-fixer": "^3.13.2",
4545
"squizlabs/php_codesniffer": "~3.0",
4646
"maximebf/debugbar": "^1.16.3"
4747
},
@@ -57,7 +57,7 @@
5757
},
5858
"config": {
5959
"platform": {
60-
"php": "7.2.5"
60+
"php": "7.4.0"
6161
}
6262
}
6363
}

0 commit comments

Comments
 (0)