[6.4] Allow 7.0 deps

vvoody- · May 23, 2023 · 9967e70 · 9967e70
1 parent 0098d40
commit 9967e70
Show file tree

Hide file tree

Showing 143 changed files with 594 additions and 594 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -64,7 +64,7 @@ jobs:
 
           echo COLUMNS=120 >> $GITHUB_ENV
           echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data,integration" >> $GITHUB_ENV
-          echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.php }}" = "8.2" ]] && echo ' --ignore-platform-req=php+') >> $GITHUB_ENV
+          echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" = experimental ]] && echo ' --ignore-platform-req=php+') >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
           SYMFONY_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | cut -d "'" -f2 | cut -d '.' -f 1-2)
@@ -123,7 +123,7 @@ jobs:
 
           echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV
           echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
-          echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 4.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
+          echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
           [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
 
       - name: Install dependencies
@@ -199,8 +199,8 @@ jobs:
           (cd src/Symfony/Component/Lock; mv composer.bak composer.json)
           PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
 
-          # for 5.4 LTS, checkout and test previous major with the patched components (only for patched components)
-          if [[ $PATCHED_COMPONENTS && $SYMFONY_VERSION = 5.4 ]]; then
+          # for 6.4 LTS, checkout and test previous major with the patched components (only for patched components)
+          if [[ $PATCHED_COMPONENTS && $SYMFONY_VERSION = 6.4 ]]; then
               export FLIP='^'
               SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
               echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"

diff --git a/composer.json b/composer.json
@@ -150,7 +150,7 @@
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "symfony/mercure-bundle": "^0.3",
-        "symfony/phpunit-bridge": "^5.4|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
         "symfony/runtime": "self.version",
         "symfony/security-acl": "~2.8|~3.0",
         "twig/cssinliner-extra": "^2.12|^3",

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -25,24 +25,24 @@
         "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
-        "symfony/cache": "^5.4|^6.0",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/dependency-injection": "^6.2",
-        "symfony/doctrine-messenger": "^5.4|^6.0",
-        "symfony/expression-language": "^5.4|^6.0",
-        "symfony/form": "^5.4.21|^6.2.7",
-        "symfony/http-kernel": "^6.3",
-        "symfony/lock": "^6.3",
-        "symfony/messenger": "^5.4|^6.0",
-        "symfony/property-access": "^5.4|^6.0",
-        "symfony/property-info": "^5.4|^6.0",
-        "symfony/proxy-manager-bridge": "^5.4|^6.0",
-        "symfony/security-core": "^6.0",
-        "symfony/stopwatch": "^5.4|^6.0",
-        "symfony/translation": "^5.4|^6.0",
-        "symfony/uid": "^5.4|^6.0",
-        "symfony/validator": "^5.4|^6.0",
-        "symfony/var-dumper": "^5.4|^6.0",
+        "symfony/cache": "^5.4|^6.0|^7.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^6.2|^7.0",
+        "symfony/doctrine-messenger": "^5.4|^6.0|^7.0",
+        "symfony/expression-language": "^5.4|^6.0|^7.0",
+        "symfony/form": "^5.4.21|^6.2.7|^7.0",
+        "symfony/http-kernel": "^6.3|^7.0",
+        "symfony/lock": "^6.3|^7.0",
+        "symfony/messenger": "^5.4|^6.0|^7.0",
+        "symfony/property-access": "^5.4|^6.0|^7.0",
+        "symfony/property-info": "^5.4|^6.0|^7.0",
+        "symfony/proxy-manager-bridge": "^5.4|^6.0|^7.0",
+        "symfony/security-core": "^6.0|^7.0",
+        "symfony/stopwatch": "^5.4|^6.0|^7.0",
+        "symfony/translation": "^5.4|^6.0|^7.0",
+        "symfony/uid": "^5.4|^6.0|^7.0",
+        "symfony/validator": "^5.4|^6.0|^7.0",
+        "symfony/var-dumper": "^5.4|^6.0|^7.0",
         "doctrine/annotations": "^1.13.1|^2",
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",

diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
@@ -19,16 +19,16 @@
         "php": ">=8.1",
         "monolog/monolog": "^1.25.1|^2|^3",
         "symfony/service-contracts": "^2.5|^3",
-        "symfony/http-kernel": "^5.4|^6.0"
+        "symfony/http-kernel": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
-        "symfony/console": "^5.4|^6.0",
-        "symfony/http-client": "^5.4|^6.0",
-        "symfony/security-core": "^6.0",
-        "symfony/var-dumper": "^5.4|^6.0",
-        "symfony/mailer": "^5.4|^6.0",
-        "symfony/mime": "^5.4|^6.0",
-        "symfony/messenger": "^5.4|^6.0"
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/http-client": "^5.4|^6.0|^7.0",
+        "symfony/security-core": "^6.0|^7.0",
+        "symfony/var-dumper": "^5.4|^6.0|^7.0",
+        "symfony/mailer": "^5.4|^6.0|^7.0",
+        "symfony/mime": "^5.4|^6.0|^7.0",
+        "symfony/messenger": "^5.4|^6.0|^7.0"
     },
     "conflict": {
         "symfony/console": "<5.4",

diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "symfony/deprecation-contracts": "^2.5|^3.0",
-        "symfony/error-handler": "^5.4|^6.0",
+        "symfony/error-handler": "^5.4|^6.0|^7.0",
         "symfony/polyfill-php81": "^1.27"
     },
     "conflict": {

diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -18,11 +18,11 @@
     "require": {
         "php": ">=8.1",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
-        "symfony/dependency-injection": "^6.3",
+        "symfony/dependency-injection": "^6.3|^7.0",
         "symfony/deprecation-contracts": "^2.5|^3"
     },
     "require-dev": {
-        "symfony/config": "^6.1"
+        "symfony/config": "^6.1|^7.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -25,31 +25,31 @@
         "egulias/email-validator": "^2.1.10|^3|^4",
         "league/html-to-markdown": "^5.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "symfony/asset": "^5.4|^6.0",
-        "symfony/asset-mapper": "^6.3",
-        "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/finder": "^5.4|^6.0",
-        "symfony/form": "^6.3",
-        "symfony/html-sanitizer": "^6.1",
-        "symfony/http-foundation": "^5.4|^6.0",
-        "symfony/http-kernel": "^6.2",
-        "symfony/intl": "^5.4|^6.0",
-        "symfony/mime": "^6.2",
+        "symfony/asset": "^5.4|^6.0|^7.0",
+        "symfony/asset-mapper": "^6.3|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+        "symfony/finder": "^5.4|^6.0|^7.0",
+        "symfony/form": "^6.3|^7.0",
+        "symfony/html-sanitizer": "^6.1|^7.0",
+        "symfony/http-foundation": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^6.2|^7.0",
+        "symfony/intl": "^5.4|^6.0|^7.0",
+        "symfony/mime": "^6.2|^7.0",
         "symfony/polyfill-intl-icu": "~1.0",
-        "symfony/property-info": "^5.4|^6.0",
-        "symfony/routing": "^5.4|^6.0",
-        "symfony/translation": "^6.1",
-        "symfony/yaml": "^5.4|^6.0",
+        "symfony/property-info": "^5.4|^6.0|^7.0",
+        "symfony/routing": "^5.4|^6.0|^7.0",
+        "symfony/translation": "^6.1|^7.0",
+        "symfony/yaml": "^5.4|^6.0|^7.0",
         "symfony/security-acl": "^2.8|^3.0",
-        "symfony/security-core": "^5.4|^6.0",
-        "symfony/security-csrf": "^5.4|^6.0",
-        "symfony/security-http": "^5.4|^6.0",
-        "symfony/serializer": "^6.2",
-        "symfony/stopwatch": "^5.4|^6.0",
-        "symfony/console": "^5.4|^6.0",
-        "symfony/expression-language": "^5.4|^6.0",
-        "symfony/web-link": "^5.4|^6.0",
-        "symfony/workflow": "^5.4|^6.0",
+        "symfony/security-core": "^5.4|^6.0|^7.0",
+        "symfony/security-csrf": "^5.4|^6.0|^7.0",
+        "symfony/security-http": "^5.4|^6.0|^7.0",
+        "symfony/serializer": "^6.2|^7.0",
+        "symfony/stopwatch": "^5.4|^6.0|^7.0",
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/expression-language": "^5.4|^6.0|^7.0",
+        "symfony/web-link": "^5.4|^6.0|^7.0",
+        "symfony/workflow": "^5.4|^6.0|^7.0",
         "twig/cssinliner-extra": "^2.12|^3",
         "twig/inky-extra": "^2.12|^3",
         "twig/markdown-extra": "^2.12|^3"

diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -18,14 +18,14 @@
     "require": {
         "php": ">=8.1",
         "ext-xml": "*",
-        "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
-        "symfony/twig-bridge": "^5.4|^6.0",
-        "symfony/var-dumper": "^5.4|^6.0"
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0",
+        "symfony/twig-bridge": "^5.4|^6.0|^7.0",
+        "symfony/var-dumper": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
-        "symfony/config": "^5.4|^6.0",
-        "symfony/web-profiler-bundle": "^5.4|^6.0"
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0"
     },
     "conflict": {
         "symfony/config": "<5.4",

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -19,56 +19,56 @@
         "php": ">=8.1",
         "composer-runtime-api": ">=2.1",
         "ext-xml": "*",
-        "symfony/cache": "^5.4|^6.0",
-        "symfony/config": "^6.1",
-        "symfony/dependency-injection": "^6.3",
+        "symfony/cache": "^5.4|^6.0|^7.0",
+        "symfony/config": "^6.1|^7.0",
+        "symfony/dependency-injection": "^6.3|^7.0",
         "symfony/deprecation-contracts": "^2.5|^3",
-        "symfony/error-handler": "^6.1",
-        "symfony/event-dispatcher": "^5.4|^6.0",
-        "symfony/http-foundation": "^6.3",
-        "symfony/http-kernel": "^6.3",
+        "symfony/error-handler": "^6.1|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+        "symfony/http-foundation": "^6.3|^7.0",
+        "symfony/http-kernel": "^6.3|^7.0",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/filesystem": "^5.4|^6.0",
-        "symfony/finder": "^5.4|^6.0",
-        "symfony/routing": "^5.4|^6.0"
+        "symfony/filesystem": "^5.4|^6.0|^7.0",
+        "symfony/finder": "^5.4|^6.0|^7.0",
+        "symfony/routing": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.13.1|^2",
         "doctrine/persistence": "^1.3|^2|^3",
-        "symfony/asset": "^5.4|^6.0",
-        "symfony/asset-mapper": "^6.3",
-        "symfony/browser-kit": "^5.4|^6.0",
-        "symfony/console": "^5.4.9|^6.0.9",
-        "symfony/clock": "^6.2",
-        "symfony/css-selector": "^5.4|^6.0",
-        "symfony/dom-crawler": "^6.3",
-        "symfony/dotenv": "^5.4|^6.0",
+        "symfony/asset": "^5.4|^6.0|^7.0",
+        "symfony/asset-mapper": "^6.3|^7.0",
+        "symfony/browser-kit": "^5.4|^6.0|^7.0",
+        "symfony/console": "^5.4.9|^6.0.9|^7.0",
+        "symfony/clock": "^6.2|^7.0",
+        "symfony/css-selector": "^5.4|^6.0|^7.0",
+        "symfony/dom-crawler": "^6.3|^7.0",
+        "symfony/dotenv": "^5.4|^6.0|^7.0",
         "symfony/polyfill-intl-icu": "~1.0",
-        "symfony/form": "^5.4|^6.0",
-        "symfony/expression-language": "^5.4|^6.0",
-        "symfony/html-sanitizer": "^6.1",
-        "symfony/http-client": "^6.3",
-        "symfony/lock": "^5.4|^6.0",
-        "symfony/mailer": "^5.4|^6.0",
-        "symfony/messenger": "^6.3",
-        "symfony/mime": "^6.2",
-        "symfony/notifier": "^5.4|^6.0",
-        "symfony/process": "^5.4|^6.0",
-        "symfony/rate-limiter": "^5.4|^6.0",
-        "symfony/scheduler": "^6.3",
-        "symfony/security-bundle": "^5.4|^6.0",
-        "symfony/semaphore": "^5.4|^6.0",
-        "symfony/serializer": "^6.3",
-        "symfony/stopwatch": "^5.4|^6.0",
-        "symfony/string": "^5.4|^6.0",
-        "symfony/translation": "^6.2.8",
-        "symfony/twig-bundle": "^5.4|^6.0",
-        "symfony/validator": "^6.3",
-        "symfony/workflow": "^5.4|^6.0",
-        "symfony/yaml": "^5.4|^6.0",
-        "symfony/property-info": "^5.4|^6.0",
-        "symfony/uid": "^5.4|^6.0",
-        "symfony/web-link": "^5.4|^6.0",
+        "symfony/form": "^5.4|^6.0|^7.0",
+        "symfony/expression-language": "^5.4|^6.0|^7.0",
+        "symfony/html-sanitizer": "^6.1|^7.0",
+        "symfony/http-client": "^6.3|^7.0",
+        "symfony/lock": "^5.4|^6.0|^7.0",
+        "symfony/mailer": "^5.4|^6.0|^7.0",
+        "symfony/messenger": "^6.3|^7.0",
+        "symfony/mime": "^6.2|^7.0",
+        "symfony/notifier": "^5.4|^6.0|^7.0",
+        "symfony/process": "^5.4|^6.0|^7.0",
+        "symfony/rate-limiter": "^5.4|^6.0|^7.0",
+        "symfony/scheduler": "^6.3|^7.0",
+        "symfony/security-bundle": "^5.4|^6.0|^7.0",
+        "symfony/semaphore": "^5.4|^6.0|^7.0",
+        "symfony/serializer": "^6.3|^7.0",
+        "symfony/stopwatch": "^5.4|^6.0|^7.0",
+        "symfony/string": "^5.4|^6.0|^7.0",
+        "symfony/translation": "^6.2.8|^7.0",
+        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+        "symfony/validator": "^6.3|^7.0",
+        "symfony/workflow": "^5.4|^6.0|^7.0",
+        "symfony/yaml": "^5.4|^6.0|^7.0",
+        "symfony/property-info": "^5.4|^6.0|^7.0",
+        "symfony/uid": "^5.4|^6.0|^7.0",
+        "symfony/web-link": "^5.4|^6.0|^7.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "twig/twig": "^2.10|^3.0"
     },

diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -19,35 +19,35 @@
         "php": ">=8.1",
         "composer-runtime-api": ">=2.1",
         "ext-xml": "*",
-        "symfony/config": "^6.1",
-        "symfony/dependency-injection": "^6.2",
-        "symfony/event-dispatcher": "^5.4|^6.0",
-        "symfony/http-kernel": "^6.2",
-        "symfony/http-foundation": "^6.2",
-        "symfony/password-hasher": "^5.4|^6.0",
-        "symfony/security-core": "^6.2",
-        "symfony/security-csrf": "^5.4|^6.0",
-        "symfony/security-http": "^6.3"
+        "symfony/config": "^6.1|^7.0",
+        "symfony/dependency-injection": "^6.2|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^6.2|^7.0",
+        "symfony/http-foundation": "^6.2|^7.0",
+        "symfony/password-hasher": "^5.4|^6.0|^7.0",
+        "symfony/security-core": "^6.2|^7.0",
+        "symfony/security-csrf": "^5.4|^6.0|^7.0",
+        "symfony/security-http": "^6.3|^7.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.10.4|^2",
-        "symfony/asset": "^5.4|^6.0",
-        "symfony/browser-kit": "^5.4|^6.0",
-        "symfony/console": "^5.4|^6.0",
-        "symfony/css-selector": "^5.4|^6.0",
-        "symfony/dom-crawler": "^5.4|^6.0",
-        "symfony/expression-language": "^5.4|^6.0",
-        "symfony/form": "^5.4|^6.0",
-        "symfony/framework-bundle": "^5.4|^6.0",
-        "symfony/ldap": "^5.4|^6.0",
-        "symfony/process": "^5.4|^6.0",
-        "symfony/rate-limiter": "^5.4|^6.0",
-        "symfony/serializer": "^5.4|^6.0",
-        "symfony/translation": "^5.4|^6.0",
-        "symfony/twig-bundle": "^5.4|^6.0",
-        "symfony/twig-bridge": "^5.4|^6.0",
-        "symfony/validator": "^5.4|^6.0",
-        "symfony/yaml": "^5.4|^6.0",
+        "symfony/asset": "^5.4|^6.0|^7.0",
+        "symfony/browser-kit": "^5.4|^6.0|^7.0",
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/css-selector": "^5.4|^6.0|^7.0",
+        "symfony/dom-crawler": "^5.4|^6.0|^7.0",
+        "symfony/expression-language": "^5.4|^6.0|^7.0",
+        "symfony/form": "^5.4|^6.0|^7.0",
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+        "symfony/ldap": "^5.4|^6.0|^7.0",
+        "symfony/process": "^5.4|^6.0|^7.0",
+        "symfony/rate-limiter": "^5.4|^6.0|^7.0",
+        "symfony/serializer": "^5.4|^6.0|^7.0",
+        "symfony/translation": "^5.4|^6.0|^7.0",
+        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+        "symfony/twig-bridge": "^5.4|^6.0|^7.0",
+        "symfony/validator": "^5.4|^6.0|^7.0",
+        "symfony/yaml": "^5.4|^6.0|^7.0",
         "twig/twig": "^2.13|^3.0.4",
         "web-token/jwt-checker": "^3.1",
         "web-token/jwt-signature-algorithm-hmac": "^3.1",