Skip to content

Commit 83f264b

Browse files
committed
Merge branch '3.x' into 4.x
* 3.x: Allow Symfony 8 packages in Twig extra packages Fix array typehint for $variants in HtmlExtension
2 parents 7489911 + 94a3635 commit 83f264b

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

extra/cache-extra/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
"require": {
1818
"php": ">=8.2",
19-
"symfony/cache": "^5.4|^6.4|^7.0",
19+
"symfony/cache": "^5.4|^6.4|^7.0|^8.0",
2020
"twig/twig": "^3.21|^4.0"
2121
},
2222
"autoload": {

extra/html-extra/HtmlExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static function htmlClasses(...$args): string
115115

116116
/**
117117
* @param string|list<string|null> $base
118-
* @param array<string, array<string, string|array<string>> $variants
118+
* @param array<string, array<string, string|array<string>>> $variants
119119
* @param array<array<string, string|array<string>>> $compoundVariants
120120
* @param array<string, string> $defaultVariant
121121
*

extra/html-extra/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"require": {
1818
"php": ">=8.2",
1919
"symfony/deprecation-contracts": "^2.5|^3",
20-
"symfony/mime": "^5.4|^6.4|^7.0",
20+
"symfony/mime": "^5.4|^6.4|^7.0|^8.0",
2121
"twig/twig": "^3.13|^4.0"
2222
},
2323
"autoload": {

extra/intl-extra/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"require": {
1818
"php": ">=8.2",
1919
"twig/twig": "^3.13|^4.0",
20-
"symfony/intl": "^5.4|^6.4|^7.0"
20+
"symfony/intl": "^5.4|^6.4|^7.0|^8.0"
2121
},
2222
"autoload": {
2323
"psr-4" : { "Twig\\Extra\\Intl\\" : "" },

extra/string-extra/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
"require": {
1818
"php": ">=8.2",
19-
"symfony/string": "^5.4|^6.4|^7.0",
19+
"symfony/string": "^5.4|^6.4|^7.0|^8.0",
2020
"symfony/translation-contracts": "^1.1|^2|^3",
2121
"twig/twig": "^3.13|^4.0"
2222
},

extra/twig-extra-bundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
],
1717
"require": {
1818
"php": ">=8.2",
19-
"symfony/framework-bundle": "^5.4|^6.4|^7.0",
20-
"symfony/twig-bundle": "^5.4|^6.4|^7.0",
19+
"symfony/framework-bundle": "^5.4|^6.4|^7.0|^8.0",
20+
"symfony/twig-bundle": "^5.4|^6.4|^7.0|^8.0",
2121
"twig/twig": "^3.2|^4.0"
2222
},
2323
"require-dev": {

0 commit comments

Comments
 (0)