Skip to content

Commit ff6c584

Browse files
richard67richard67
authored
[6.0] Update Composer and NPM dependencies for 6.0.0-rc1 (joomla#46100)
1 parent 67aa8db commit ff6c584

File tree

8 files changed

+4635
-2749
lines changed

8 files changed

+4635
-2749
lines changed

‎administrator/components/com_admin/script.php‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,47 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
997997
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3_steps.ini',
998998
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini',
999999
'/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini',
1000+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/CachedWordInflector.php',
1001+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/GenericLanguageInflectorFactory.php',
1002+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Inflector.php',
1003+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/InflectorFactory.php',
1004+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Language.php',
1005+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/LanguageInflectorFactory.php',
1006+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/NoopWordInflector.php',
1007+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Inflectible.php',
1008+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/InflectorFactory.php',
1009+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Rules.php',
1010+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Uninflected.php',
1011+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Inflectible.php',
1012+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/InflectorFactory.php',
1013+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Rules.php',
1014+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Uninflected.php',
1015+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Inflectible.php',
1016+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/InflectorFactory.php',
1017+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Rules.php',
1018+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php',
1019+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Pattern.php',
1020+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Patterns.php',
1021+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php',
1022+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/InflectorFactory.php',
1023+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Rules.php',
1024+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php',
1025+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Ruleset.php',
1026+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php',
1027+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/InflectorFactory.php',
1028+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Rules.php',
1029+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php',
1030+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitution.php',
1031+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitutions.php',
1032+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformation.php',
1033+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformations.php',
1034+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php',
1035+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/InflectorFactory.php',
1036+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Rules.php',
1037+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php',
1038+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Word.php',
1039+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/RulesetInflector.php',
1040+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/WordInflector.php',
10001041
'/media/com_guidedtours/images/5_2/enhancedtourheader.png',
10011042
'/media/com_guidedtours/images/5_2/mailtemplate.png',
10021043
'/media/com_guidedtours/images/5_3/filesdirectory.jpg',
@@ -1056,6 +1097,16 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
10561097
'/media/com_guidedtours/images/5_4',
10571098
'/media/com_guidedtours/images/5_3',
10581099
'/media/com_guidedtours/images/5_2',
1100+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish',
1101+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish',
1102+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese',
1103+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal',
1104+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French',
1105+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English',
1106+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules',
1107+
'/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector',
1108+
'/libraries/vendor/doctrine/inflector/lib/Doctrine',
1109+
'/libraries/vendor/doctrine/inflector/lib',
10591110
];
10601111

10611112
$status['files_checked'] = $files;

‎build/build-modules-js/settings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,9 @@
746746
"qrcode-generator": {
747747
"name": "qrcode",
748748
"js": {
749-
"qrcode.js": "js/qrcode.js",
750-
"qrcode_SJIS.js": "js/qrcode_SJIS.js",
751-
"qrcode_UTF8.js": "js/qrcode_UTF8.js"
749+
"dist/qrcode.js": "js/qrcode.js",
750+
"dist/qrcode_SJIS.js": "js/qrcode_SJIS.js",
751+
"dist/qrcode_UTF8.js": "js/qrcode_UTF8.js"
752752
},
753753
"provideAssets": [
754754
{

‎composer.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
"joomla/string": "^4.0",
7070
"joomla/uri": "^4.0",
7171
"joomla/utilities": "^4.0",
72-
"algo26-matthias/idna-convert": "^4.0.4",
72+
"algo26-matthias/idna-convert": "^4.2.1",
7373
"defuse/php-encryption": "^2.4.0",
74-
"doctrine/inflector": "^2.0.10",
74+
"doctrine/inflector": "^2.1.0",
7575
"fig/link-util": "^1.2.0",
7676
"google/recaptcha": "^1.3.1",
7777
"laminas/laminas-diactoros": "^3.6.0",
@@ -82,9 +82,9 @@
8282
"symfony/error-handler": "^7",
8383
"symfony/ldap": "^7",
8484
"symfony/options-resolver": "^7",
85-
"symfony/polyfill-mbstring": "^1.32.0",
86-
"symfony/web-link": "^6.4.22",
87-
"symfony/yaml": "^6.4.23",
85+
"symfony/polyfill-mbstring": "^1.33.0",
86+
"symfony/web-link": "^6.4.24",
87+
"symfony/yaml": "^6.4.25",
8888
"wamania/php-stemmer": "^4.0.0",
8989
"tobscure/json-api": "dev-joomla-backports",
9090
"willdurand/negotiation": "^3.1.0",
@@ -94,7 +94,7 @@
9494
"ext-gd": "*",
9595
"web-auth/webauthn-lib": "4.5.2",
9696
"ext-dom": "*",
97-
"composer/ca-bundle": "^1.5.7",
97+
"composer/ca-bundle": "^1.5.8",
9898
"dragonmantank/cron-expression": "^3.4.0",
9999
"enshrined/svg-sanitize": "^0.22.0",
100100
"lcobucci/jwt": "^4.3.0",
@@ -105,12 +105,12 @@
105105
"php-debugbar/php-debugbar": "^2.2.4"
106106
},
107107
"require-dev": {
108-
"phpunit/phpunit": "^9.6.23",
109-
"friendsofphp/php-cs-fixer": "^3.84.0",
110-
"squizlabs/php_codesniffer": "^3.13.2",
108+
"phpunit/phpunit": "^9.6.27",
109+
"friendsofphp/php-cs-fixer": "^3.87.2",
110+
"squizlabs/php_codesniffer": "^3.13.4",
111111
"joomla/mediawiki": "^4.0",
112112
"joomla/test": "~4.0",
113-
"phpstan/phpstan": "^2.1.19",
113+
"phpstan/phpstan": "^2.1.28",
114114
"phpstan/phpstan-deprecation-rules": "^2.0.3"
115115
},
116116
"replace": {

0 commit comments

Comments
 (0)