Merge branch '2.x' into 3.x

* 2.x: Bump min deps
twigphp · Jul 29, 2023 · fa5f1d4 · fa5f1d4
2 parents 2e02866 + b60ed3e
commit fa5f1d4
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
+        "symfony/phpunit-bridge": "^5.4.9|^6.3",
         "psr/container": "^1.0|^2.0"
     },
     "autoload": {

diff --git a/extra/cssinliner-extra/composer.json b/extra/cssinliner-extra/composer.json
@@ -20,7 +20,7 @@
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+        "symfony/phpunit-bridge": "^5.4|^6.3"
     },
     "autoload": {
         "psr-4" : { "Twig\\Extra\\CssInliner\\" : "" },

diff --git a/extra/html-extra/composer.json b/extra/html-extra/composer.json
@@ -16,11 +16,11 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "symfony/mime": "^4.4|^5.0|^6.0",
+        "symfony/mime": "^5.4|^6.0",
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+        "symfony/phpunit-bridge": "^5.4|^6.3"
     },
     "autoload": {
         "psr-4" : { "Twig\\Extra\\Html\\" : "" },

diff --git a/extra/inky-extra/composer.json b/extra/inky-extra/composer.json
@@ -20,7 +20,7 @@
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+        "symfony/phpunit-bridge": "^5.4|^6.3"
     },
     "autoload": {
         "psr-4" : { "Twig\\Extra\\Inky\\" : "" },

diff --git a/extra/intl-extra/composer.json b/extra/intl-extra/composer.json
@@ -17,10 +17,10 @@
     "require": {
         "php": ">=7.1.3",
         "twig/twig": "^2.7|^3.0",
-        "symfony/intl": "^4.4|^5.0|^6.0"
+        "symfony/intl": "^5.4|^6.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+        "symfony/phpunit-bridge": "^5.4|^6.3"
     },
     "autoload": {
         "psr-4" : { "Twig\\Extra\\Intl\\" : "" },

diff --git a/extra/markdown-extra/composer.json b/extra/markdown-extra/composer.json
@@ -19,7 +19,7 @@
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.3",
         "erusev/parsedown": "^1.7",
         "league/commonmark": "^1.0|^2.0",
         "league/html-to-markdown": "^4.8|^5.0",

diff --git a/extra/string-extra/composer.json b/extra/string-extra/composer.json
@@ -16,12 +16,12 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "symfony/string": "^5.0|^6.0",
+        "symfony/string": "^5.4|^6.0",
         "symfony/translation-contracts": "^1.1|^2|^3",
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+        "symfony/phpunit-bridge": "^5.4|^6.3"
     },
     "autoload": {
         "psr-4" : { "Twig\\Extra\\String\\" : "" },

diff --git a/extra/twig-extra-bundle/composer.json b/extra/twig-extra-bundle/composer.json
@@ -16,13 +16,13 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "symfony/framework-bundle": "^4.4|^5.0|^6.0",
-        "symfony/twig-bundle": "^4.4|^5.0|^6.0",
+        "symfony/framework-bundle": "^5.4|^6.0",
+        "symfony/twig-bundle": "^5.4|^6.0",
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {
         "league/commonmark": "^1.0|^2.0",
-        "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.3",
         "twig/cache-extra": "^3.0",
         "twig/cssinliner-extra": "^2.12|^3.0",
         "twig/html-extra": "^2.12|^3.0",