From 91ca7fb14cd5dfa12f410304603599844011657d Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sun, 27 Oct 2024 07:46:44 +0100 Subject: [PATCH 01/32] Don't use `die()` in PHPT `--SKIPIF--` Unlocks a performance optimization in PHPUnit 11.x see https://staabm.github.io/2024/10/19/phpunit-codesprint-munich.html --- .../PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt | 2 +- src/Symfony/Bridge/PhpUnit/Tests/expectdeprecationfail.phpt | 2 +- src/Symfony/Bridge/PhpUnit/Tests/expectnotrisky.phpt | 4 ++-- src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt | 4 ++-- src/Symfony/Bridge/PhpUnit/Tests/symfonyextension.phpt | 2 +- .../Bridge/PhpUnit/Tests/symfonyextensionnotregistered.phpt | 2 +- .../Component/Console/Tests/phpt/alarm/command_exit.phpt | 2 +- .../Component/Console/Tests/phpt/signal/command_exit.phpt | 2 +- src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload.phpt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt index fe14db7c53da5..12f9ed454d6ba 100644 --- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt +++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt @@ -1,7 +1,7 @@ --TEST-- Test DeprecationErrorHandler with log file --SKIPIF-- -=')) die('Skipping on PHPUnit 10+'); +=')) echo 'Skipping on PHPUnit 10+'; --FILE-- =')) die('Skipping on PHPUnit 10+'); +=')) echo 'Skipping on PHPUnit 10+'; --FILE-- =')) die('Skipping on PHPUnit 10+'); +if ('\\' === DIRECTORY_SEPARATOR && !extension_loaded('mbstring')) echo 'Skipping on Windows without mbstring'; +if (!getenv('SYMFONY_PHPUNIT_VERSION') || version_compare(getenv('SYMFONY_PHPUNIT_VERSION'), '10.0', '>=')) echo 'Skipping on PHPUnit 10+'; --FILE-- =')) die('Skipping on PHPUnit 10+'); +if ('\\' === DIRECTORY_SEPARATOR && !extension_loaded('mbstring')) echo 'Skipping on Windows without mbstring'; +if (!getenv('SYMFONY_PHPUNIT_VERSION') || version_compare(getenv('SYMFONY_PHPUNIT_VERSION'), '10.0', '>=')) echo 'Skipping on PHPUnit 10+'; --FILE-- + --FILE-- + --FILE-- (new \ReflectionMethod(\Symfony\Component\Dotenv\Dotenv::class, 'bootEnv'))->getNumberOfParameters()) die('Skip because Dotenv version is too low'); + (new \ReflectionMethod(\Symfony\Component\Dotenv\Dotenv::class, 'bootEnv'))->getNumberOfParameters()) echo 'Skip because Dotenv version is too low'; --INI-- display_errors=1 --FILE-- From e44b3d6c26eff0165f52f5797aee7442132b5487 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 9 Oct 2024 11:06:51 +0200 Subject: [PATCH 02/32] run tests using PHPUnit 11.3 --- .appveyor.yml | 6 ++-- .github/workflows/integration-tests.yml | 2 +- .github/workflows/unit-tests.yml | 12 ++++--- .gitignore | 1 + phpunit | 3 +- phpunit.xml.dist | 35 +++++-------------- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Doctrine/phpunit.xml.dist | 26 +++++--------- src/Symfony/Bridge/Monolog/phpunit.xml.dist | 11 +++--- src/Symfony/Bridge/PhpUnit/phpunit.xml.dist | 10 ++++-- .../Bridge/PsrHttpMessage/composer.json | 8 +++-- .../Bridge/PsrHttpMessage/phpunit.xml.dist | 10 ++++-- src/Symfony/Bridge/Twig/phpunit.xml.dist | 10 ++++-- .../Bundle/DebugBundle/phpunit.xml.dist | 10 ++++-- .../Bundle/FrameworkBundle/composer.json | 9 ++++- .../Bundle/FrameworkBundle/phpunit.xml.dist | 10 ++++-- .../Bundle/SecurityBundle/composer.json | 12 +++++-- .../Bundle/SecurityBundle/phpunit.xml.dist | 10 ++++-- src/Symfony/Bundle/TwigBundle/composer.json | 12 +++++-- .../Bundle/TwigBundle/phpunit.xml.dist | 10 ++++-- .../Bundle/WebProfilerBundle/composer.json | 12 +++++-- .../Bundle/WebProfilerBundle/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Asset/phpunit.xml.dist | 10 ++++-- .../Component/AssetMapper/composer.json | 14 +++++--- .../Component/AssetMapper/phpunit.xml.dist | 10 ++++-- .../Component/BrowserKit/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Cache/phpunit.xml.dist | 28 +++++---------- src/Symfony/Component/Clock/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Config/phpunit.xml.dist | 10 ++++-- .../Component/Console/phpunit.xml.dist | 20 +++++------ .../Component/CssSelector/phpunit.xml.dist | 10 ++++-- .../DependencyInjection/composer.json | 2 +- .../DependencyInjection/phpunit.xml.dist | 10 ++++-- .../Component/DomCrawler/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Dotenv/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Emoji/phpunit.xml.dist | 10 ++++-- .../ErrorHandler/Tests/ErrorHandlerTest.php | 26 ++++++++++++++ .../Component/ErrorHandler/phpunit.xml.dist | 10 ++++-- .../EventDispatcher/phpunit.xml.dist | 10 ++++-- .../ExpressionLanguage/phpunit.xml.dist | 10 ++++-- .../Component/Filesystem/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Finder/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/Form/phpunit.xml.dist | 10 ++++-- .../Component/HtmlSanitizer/phpunit.xml.dist | 10 ++++-- .../Component/HttpClient/phpunit.xml.dist | 10 ++++-- .../cookie_urlencode.expected | 6 ++-- .../Storage/NativeSessionStorageTest.php | 33 ++++++++++++----- .../Component/HttpFoundation/phpunit.xml.dist | 10 ++++-- .../Component/HttpKernel/phpunit.xml.dist | 20 +++++------ src/Symfony/Component/Intl/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Ldap/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Lock/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Amazon/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Azure/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Brevo/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Google/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Infobip/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Mailchimp/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/MailerSend/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Mailgun/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Mailjet/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Mailomat/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Mailtrap/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Postal/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Postmark/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Resend/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Scaleway/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Sendgrid/phpunit.xml.dist | 10 ++++-- .../Mailer/Bridge/Sweego/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Mailer/phpunit.xml.dist | 10 ++++-- .../Bridge/AmazonSqs/phpunit.xml.dist | 10 ++++-- .../Messenger/Bridge/Amqp/phpunit.xml.dist | 10 ++++-- .../Bridge/Beanstalkd/phpunit.xml.dist | 10 ++++-- .../Bridge/Doctrine/phpunit.xml.dist | 10 ++++-- .../Bridge/Redis/Transport/Connection.php | 2 +- .../Messenger/Bridge/Redis/composer.json | 2 +- .../Messenger/Bridge/Redis/phpunit.xml.dist | 10 ++++-- .../Component/Messenger/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Mime/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/AllMySms/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Bluesky/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Brevo/phpunit.xml.dist | 10 ++++-- .../Bridge/Clickatell/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Discord/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Esendex/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/FakeChat/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/FakeSms/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Firebase/phpunit.xml.dist | 10 ++++-- .../Bridge/FreeMobile/phpunit.xml.dist | 10 ++++-- .../Bridge/GatewayApi/phpunit.xml.dist | 10 ++++-- .../Bridge/GoogleChat/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Infobip/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Iqsms/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Isendpro/phpunit.xml.dist | 10 ++++-- .../Bridge/JoliNotif/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/LightSms/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/LinkedIn/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Mastodon/phpunit.xml.dist | 10 ++++-- .../Bridge/Mattermost/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Mercure/phpunit.xml.dist | 10 ++++-- .../Bridge/MessageBird/phpunit.xml.dist | 10 ++++-- .../Bridge/MicrosoftTeams/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Mobyt/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Octopush/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/OvhCloud/phpunit.xml.dist | 10 ++++-- .../Bridge/PagerDuty/phpunit.xml.dist | 10 ++++-- .../Bridge/Primotexto/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Redlink/phpunit.xml.dist | 10 ++++-- .../Bridge/RocketChat/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Sinch/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Slack/phpunit.xml.dist | 10 ++++-- .../Bridge/SmsBiuras/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Smsapi/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/SpotHit/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Telegram/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Twilio/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Twitter/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Unifonic/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Zendesk/phpunit.xml.dist | 10 ++++-- .../Notifier/Bridge/Zulip/phpunit.xml.dist | 10 ++++-- .../Component/Notifier/phpunit.xml.dist | 10 ++++-- .../OptionsResolver/phpunit.xml.dist | 10 ++++-- .../Component/PasswordHasher/phpunit.xml.dist | 10 ++++-- .../Component/Process/phpunit.xml.dist | 10 ++++-- .../Component/PropertyAccess/phpunit.xml.dist | 10 ++++-- .../Component/PropertyInfo/phpunit.xml.dist | 10 ++++-- .../Component/RateLimiter/phpunit.xml.dist | 10 ++++-- .../Component/RemoteEvent/phpunit.xml.dist | 10 ++++-- .../Component/Routing/phpunit.xml.dist | 10 ++++-- .../Component/Runtime/phpunit.xml.dist | 10 ++++-- .../Component/Scheduler/phpunit.xml.dist | 10 ++++-- .../Component/Security/Core/phpunit.xml.dist | 10 ++++-- .../Component/Security/Csrf/phpunit.xml.dist | 10 ++++-- .../Component/Security/Http/phpunit.xml.dist | 10 ++++-- .../Component/Semaphore/phpunit.xml.dist | 10 ++++-- .../Component/Serializer/phpunit.xml.dist | 10 ++++-- .../Component/Stopwatch/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/String/phpunit.xml.dist | 10 ++++-- .../Bridge/Crowdin/phpunit.xml.dist | 10 ++++-- .../Translation/Bridge/Loco/phpunit.xml.dist | 10 ++++-- .../Bridge/Lokalise/phpunit.xml.dist | 10 ++++-- .../Bridge/Phrase/phpunit.xml.dist | 10 ++++-- .../Component/Translation/composer.json | 2 +- .../Component/Translation/phpunit.xml.dist | 10 ++++-- .../Component/TypeInfo/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Uid/phpunit.xml.dist | 20 +++++------ .../Component/Validator/phpunit.xml.dist | 10 ++++-- .../Tests/Caster/DoctrineCasterTest.php | 4 +-- .../Component/VarDumper/phpunit.xml.dist | 10 ++++-- .../Component/VarExporter/phpunit.xml.dist | 10 ++++-- .../Component/WebLink/phpunit.xml.dist | 10 ++++-- .../Component/Webhook/phpunit.xml.dist | 10 ++++-- .../Component/Workflow/phpunit.xml.dist | 10 ++++-- src/Symfony/Component/Yaml/phpunit.xml.dist | 10 ++++-- .../Service/Test/ServiceLocatorTest.php | 14 +++----- src/Symfony/Contracts/phpunit.xml.dist | 9 +++-- 157 files changed, 1081 insertions(+), 544 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 17723f34aa873..58a06da14da2a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,6 +30,7 @@ install: - echo date.timezone="America/Los_Angeles" >> php.ini-min - echo extension_dir=ext >> php.ini-min - echo extension=php_xsl.dll >> php.ini-min + - echo extension=php_mbstring.dll >> php.ini-min - copy /Y php.ini-min php.ini-max - echo zend_extension=php_opcache.dll >> php.ini-max - echo opcache.enable_cli=1 >> php.ini-max @@ -39,7 +40,6 @@ install: - echo extension=php_redis.dll >> php.ini-max - echo apc.enable_cli=1 >> php.ini-max - echo extension=php_intl.dll >> php.ini-max - - echo extension=php_mbstring.dll >> php.ini-max - echo extension=php_fileinfo.dll >> php.ini-max - echo extension=php_pdo_sqlite.dll >> php.ini-max - echo extension=php_curl.dll >> php.ini-max @@ -63,9 +63,9 @@ test_script: - copy /Y c:\php\php.ini-min c:\php\php.ini - IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) - mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - - php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel! + - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! - copy /Y c:\php\php.ini-max c:\php\php.ini - - php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel! + - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! - exit %X% diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 0265b619c8be6..314f39e18f717 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -231,7 +231,7 @@ jobs: git diff --exit-code src/ || (echo '::error::Run "php .github/sync-translations.php" to fix XLIFF files.' && exit 1) - name: Run tests - run: ./phpunit --group integration -v + run: ./phpunit --group integration env: INTEGRATION_FTP_URL: 'ftp://test:test@localhost' REDIS_HOST: 'localhost:16379' diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 0e8c7cc123143..4be5931b28d84 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -66,7 +66,7 @@ jobs: ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" echo COLUMNS=120 >> $GITHUB_ENV - echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data,integration" >> $GITHUB_ENV + echo PHPUNIT="$(pwd)/phpunit --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group integration" >> $GITHUB_ENV echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" != low-deps ]] && 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) @@ -130,7 +130,7 @@ jobs: [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true if [[ "${{ matrix.mode }}" = low-deps ]]; then - echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:^4.18" >> $GITHUB_ENV + echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:'^4.18|^5.0'" >> $GITHUB_ENV fi - name: Install dependencies @@ -238,12 +238,14 @@ jobs: mkdir -p /opt/php/lib echo memory_limit=-1 > /opt/php/lib/php.ini + ./phpunit install ./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process + env: + SYMFONY_PHPUNIT_VERSION: '9.6' - - name: Run PhpUnitBridge tests with PHPUnit 11 + - name: Run PhpUnitBridge tests with PHPUnit 9.6 if: '! matrix.mode' run: | ./phpunit src/Symfony/Bridge/PhpUnit env: - SYMFONY_PHPUNIT_VERSION: '11.3' - SYMFONY_DEPRECATIONS_HELPER: 'disabled' + SYMFONY_PHPUNIT_VERSION: '9.6' diff --git a/.gitignore b/.gitignore index 0c37517192aba..61ade23d815fb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ composer.lock phpunit.xml .php-cs-fixer.cache .php-cs-fixer.php +.phpunit.cache .phpunit.result.cache composer.phar package.tar diff --git a/phpunit b/phpunit index 94baca39735ba..07f618bf44eab 100755 --- a/phpunit +++ b/phpunit @@ -10,7 +10,8 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) { exit(1); } if (!getenv('SYMFONY_PHPUNIT_VERSION')) { - putenv('SYMFONY_PHPUNIT_VERSION=9.6'); + putenv('SYMFONY_PHPUNIT_VERSION=11.3'); + putenv('SYMFONY_DEPRECATIONS_HELPER=disabled'); } if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) { putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1'); diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6909669ee14a8..26414517c7879 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./src/Symfony/ @@ -54,7 +54,7 @@ ./src/Symfony/Bridge/*/Tests ./src/Symfony/Component/*/Tests ./src/Symfony/Component/*/*/Tests - ./src/Symfony/Contract/*/Tests + ./src/Symfony/Contracts/*/Tests ./src/Symfony/Bundle/*/Tests ./src/Symfony/Bundle/*/Resources ./src/Symfony/Component/*/Resources @@ -65,28 +65,11 @@ ./src/Symfony/Component/*/*/vendor ./src/Symfony/Contracts/*/vendor - + - - - - - - - Cache\IntegrationTests - Symfony\Bridge\Doctrine\Middleware\Debug - Symfony\Bridge\Doctrine\Middleware\IdleConnection - Symfony\Component\Cache - Symfony\Component\Cache\Tests\Fixtures - Symfony\Component\Cache\Tests\Traits - Symfony\Component\Cache\Traits - Symfony\Component\Console - Symfony\Component\HttpFoundation - Symfony\Component\Uid - - - - - - + + + + + diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 8c1ca761f7800..e873b2e00d1e6 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -30,7 +30,7 @@ "symfony/dependency-injection": "^6.4|^7.0", "symfony/doctrine-messenger": "^6.4|^7.0", "symfony/expression-language": "^6.4|^7.0", - "symfony/form": "^6.4.6|^7.0.6", + "symfony/form": "^7.2", "symfony/http-kernel": "^6.4|^7.0", "symfony/lock": "^6.4|^7.0", "symfony/messenger": "^6.4|^7.0", diff --git a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist index 0b1a67afd1249..57f4002cc1076 100644 --- a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist +++ b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist @@ -1,7 +1,6 @@ - - + ./ @@ -27,20 +26,11 @@ ./Tests ./vendor - + - - - - - - - Symfony\Bridge\Doctrine\Middleware\Debug - Symfony\Bridge\Doctrine\Middleware\IdleConnection - - - - - - + + + + + diff --git a/src/Symfony/Bridge/Monolog/phpunit.xml.dist b/src/Symfony/Bridge/Monolog/phpunit.xml.dist index ab47262381599..dc9d16f617507 100644 --- a/src/Symfony/Bridge/Monolog/phpunit.xml.dist +++ b/src/Symfony/Bridge/Monolog/phpunit.xml.dist @@ -1,7 +1,6 @@ - - + ./ @@ -27,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist b/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist index cde576e2c7536..41ec1cd4a3edd 100644 --- a/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist +++ b/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bridge/PsrHttpMessage/composer.json b/src/Symfony/Bridge/PsrHttpMessage/composer.json index a34dfb1008e5e..3c826484f9fba 100644 --- a/src/Symfony/Bridge/PsrHttpMessage/composer.json +++ b/src/Symfony/Bridge/PsrHttpMessage/composer.json @@ -24,8 +24,9 @@ "symfony/browser-kit": "^6.4|^7.0", "symfony/config": "^6.4|^7.0", "symfony/event-dispatcher": "^6.4|^7.0", - "symfony/framework-bundle": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", + "symfony/framework-bundle": "^6.4.13|^7.1.6", + "symfony/http-kernel": "^6.4.13|^7.1.6", + "symfony/runtime": "^6.4.13|^7.1.6", "nyholm/psr7": "^1.1", "php-http/discovery": "^1.15", "psr/log": "^1.1.4|^2|^3" @@ -36,7 +37,8 @@ }, "config": { "allow-plugins": { - "php-http/discovery": false + "php-http/discovery": false, + "symfony/runtime": false } }, "autoload": { diff --git a/src/Symfony/Bridge/PsrHttpMessage/phpunit.xml.dist b/src/Symfony/Bridge/PsrHttpMessage/phpunit.xml.dist index fdfe483f56346..22979f999b0ba 100644 --- a/src/Symfony/Bridge/PsrHttpMessage/phpunit.xml.dist +++ b/src/Symfony/Bridge/PsrHttpMessage/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bridge/Twig/phpunit.xml.dist b/src/Symfony/Bridge/Twig/phpunit.xml.dist index e5a59c8c5edec..f11ce29a7fcd3 100644 --- a/src/Symfony/Bridge/Twig/phpunit.xml.dist +++ b/src/Symfony/Bridge/Twig/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist b/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist index a81e38228ec4c..929bee224a8a6 100644 --- a/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 9b3e7c86ea3ff..c4d50197f22d7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -35,6 +35,7 @@ "require-dev": { "doctrine/persistence": "^1.3|^2|^3", "dragonmantank/cron-expression": "^3.1", + "nikic/php-parser": "^4.18|^5.0", "seld/jsonlint": "^1.10", "symfony/asset": "^6.4|^7.0", "symfony/asset-mapper": "^6.4|^7.0", @@ -56,6 +57,7 @@ "symfony/notifier": "^6.4|^7.0", "symfony/process": "^6.4|^7.0", "symfony/rate-limiter": "^6.4|^7.0", + "symfony/runtime": "^6.4.13|^7.1.6", "symfony/scheduler": "^6.4.4|^7.0.4", "symfony/security-bundle": "^6.4|^7.0", "symfony/semaphore": "^6.4|^7.0", @@ -113,5 +115,10 @@ "/Tests/" ] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "symfony/runtime": false + } + } } diff --git a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist index d00ee0f1e214e..510d4f8acea90 100644 --- a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -29,5 +29,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 8660196a11cf2..0505b068e005a 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -23,7 +23,7 @@ "symfony/config": "^6.4|^7.0", "symfony/dependency-injection": "^6.4.11|^7.1.4", "symfony/event-dispatcher": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", + "symfony/http-kernel": "^6.4.13|^7.1.6", "symfony/http-foundation": "^6.4|^7.0", "symfony/password-hasher": "^6.4|^7.0", "symfony/security-core": "^7.2", @@ -39,11 +39,12 @@ "symfony/dom-crawler": "^6.4|^7.0", "symfony/expression-language": "^6.4|^7.0", "symfony/form": "^6.4|^7.0", - "symfony/framework-bundle": "^6.4|^7.0", + "symfony/framework-bundle": "^6.4.13|^7.1.6", "symfony/http-client": "^6.4|^7.0", "symfony/ldap": "^6.4|^7.0", "symfony/process": "^6.4|^7.0", "symfony/rate-limiter": "^6.4|^7.0", + "symfony/runtime": "^6.4.13|^7.1.6", "symfony/serializer": "^6.4|^7.0", "symfony/translation": "^6.4|^7.0", "symfony/twig-bundle": "^6.4|^7.0", @@ -69,5 +70,10 @@ "/Tests/" ] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "symfony/runtime": false + } + } } diff --git a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist index b8b8a9adbedc1..2063e2e889951 100644 --- a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index f6e0e110cc686..254b6e6c9b10c 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -22,7 +22,7 @@ "symfony/dependency-injection": "^6.4|^7.0", "symfony/twig-bridge": "^6.4|^7.0", "symfony/http-foundation": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", + "symfony/http-kernel": "^6.4.13|^7.1.6", "twig/twig": "^3.12" }, "require-dev": { @@ -32,9 +32,10 @@ "symfony/finder": "^6.4|^7.0", "symfony/form": "^6.4|^7.0", "symfony/routing": "^6.4|^7.0", + "symfony/runtime": "^6.4.13|^7.1.6", "symfony/translation": "^6.4|^7.0", "symfony/yaml": "^6.4|^7.0", - "symfony/framework-bundle": "^6.4|^7.0", + "symfony/framework-bundle": "^6.4.13|^7.1.6", "symfony/web-link": "^6.4|^7.0" }, "conflict": { @@ -47,5 +48,10 @@ "/Tests/" ] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "symfony/runtime": false + } + } } diff --git a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist index 5b35c7666f2e5..92f12d1e00e6c 100644 --- a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index ce94b4b62ebbb..d7ff758e23654 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=8.2", "symfony/config": "^6.4|^7.0", - "symfony/framework-bundle": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", + "symfony/framework-bundle": "^6.4.13|^7.1.6", + "symfony/http-kernel": "^6.4.13|^7.1.6", "symfony/routing": "^6.4|^7.0", "symfony/twig-bundle": "^6.4|^7.0", "twig/twig": "^3.12" @@ -28,6 +28,7 @@ "symfony/browser-kit": "^6.4|^7.0", "symfony/console": "^6.4|^7.0", "symfony/css-selector": "^6.4|^7.0", + "symfony/runtime": "^6.4.13|^7.1.6", "symfony/stopwatch": "^6.4|^7.0" }, "conflict": { @@ -42,5 +43,10 @@ "/Tests/" ] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "symfony/runtime": false + } + } } diff --git a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist index 598b247ec4fbc..aae9a48bcdc90 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Asset/phpunit.xml.dist b/src/Symfony/Component/Asset/phpunit.xml.dist index 116798bdd3f3f..a244a4818e0a6 100644 --- a/src/Symfony/Component/Asset/phpunit.xml.dist +++ b/src/Symfony/Component/Asset/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/AssetMapper/composer.json b/src/Symfony/Component/AssetMapper/composer.json index 4db41cfaa4651..91550e956c696 100644 --- a/src/Symfony/Component/AssetMapper/composer.json +++ b/src/Symfony/Component/AssetMapper/composer.json @@ -25,12 +25,13 @@ "require-dev": { "symfony/asset": "^6.4|^7.0", "symfony/browser-kit": "^6.4|^7.0", - "symfony/console": "^6.4|^7.0", + "symfony/console": "^6.4.13|^7.1.6", "symfony/event-dispatcher-contracts": "^3.0", "symfony/finder": "^6.4|^7.0", - "symfony/framework-bundle": "^6.4|^7.0", + "symfony/framework-bundle": "^6.4.13|^7.1.6", "symfony/http-foundation": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", + "symfony/http-kernel": "^6.4.13|^7.1.6", + "symfony/runtime": "^6.4.13|^7.1.6", "symfony/web-link": "^6.4|^7.0" }, "conflict": { @@ -42,5 +43,10 @@ "/Tests/" ] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "symfony/runtime": false + } + } } diff --git a/src/Symfony/Component/AssetMapper/phpunit.xml.dist b/src/Symfony/Component/AssetMapper/phpunit.xml.dist index 21a1e9bf9ede4..2c4a2a7cc73d8 100644 --- a/src/Symfony/Component/AssetMapper/phpunit.xml.dist +++ b/src/Symfony/Component/AssetMapper/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/BrowserKit/phpunit.xml.dist b/src/Symfony/Component/BrowserKit/phpunit.xml.dist index 747ed25cfd7e5..6cae294a8967b 100644 --- a/src/Symfony/Component/BrowserKit/phpunit.xml.dist +++ b/src/Symfony/Component/BrowserKit/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Cache/phpunit.xml.dist b/src/Symfony/Component/Cache/phpunit.xml.dist index fb7c080562c45..1083eac6f31e4 100644 --- a/src/Symfony/Component/Cache/phpunit.xml.dist +++ b/src/Symfony/Component/Cache/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -32,23 +32,11 @@ ./Tests ./vendor - + - - - - - - - Cache\IntegrationTests - Symfony\Component\Cache - Symfony\Component\Cache\Tests\Fixtures - Symfony\Component\Cache\Tests\Traits - Symfony\Component\Cache\Traits - - - - - - + + + + + diff --git a/src/Symfony/Component/Clock/phpunit.xml.dist b/src/Symfony/Component/Clock/phpunit.xml.dist index 06071b21d2f63..13b32b6ecd8e7 100644 --- a/src/Symfony/Component/Clock/phpunit.xml.dist +++ b/src/Symfony/Component/Clock/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Config/phpunit.xml.dist b/src/Symfony/Component/Config/phpunit.xml.dist index 7ff2f3fb49d01..6193ae8469beb 100644 --- a/src/Symfony/Component/Config/phpunit.xml.dist +++ b/src/Symfony/Component/Config/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Console/phpunit.xml.dist b/src/Symfony/Component/Console/phpunit.xml.dist index 0e96921be86fe..e92960c93cca6 100644 --- a/src/Symfony/Component/Console/phpunit.xml.dist +++ b/src/Symfony/Component/Console/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,15 +27,11 @@ ./Tests ./vendor - + - - - - - Symfony\Component\Console - - - - + + + + + diff --git a/src/Symfony/Component/CssSelector/phpunit.xml.dist b/src/Symfony/Component/CssSelector/phpunit.xml.dist index 7d8f8391da6ac..d7819378226da 100644 --- a/src/Symfony/Component/CssSelector/phpunit.xml.dist +++ b/src/Symfony/Component/CssSelector/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index b5fda9bdeb990..a1a9e155556b5 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,7 +19,7 @@ "php": ">=8.2", "psr/container": "^1.1|^2.0", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/service-contracts": "^3.5", + "symfony/service-contracts": "^3.6", "symfony/var-exporter": "^6.4|^7.0" }, "require-dev": { diff --git a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist index da20ea70a65b2..d344cdd795840 100644 --- a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist +++ b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/DomCrawler/phpunit.xml.dist b/src/Symfony/Component/DomCrawler/phpunit.xml.dist index 473de6089dfb2..49a6060b33daf 100644 --- a/src/Symfony/Component/DomCrawler/phpunit.xml.dist +++ b/src/Symfony/Component/DomCrawler/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Dotenv/phpunit.xml.dist b/src/Symfony/Component/Dotenv/phpunit.xml.dist index 461dc69433f73..07aa5f0a79387 100644 --- a/src/Symfony/Component/Dotenv/phpunit.xml.dist +++ b/src/Symfony/Component/Dotenv/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Emoji/phpunit.xml.dist b/src/Symfony/Component/Emoji/phpunit.xml.dist index 5c74dab50b3ca..18c46988e4149 100644 --- a/src/Symfony/Component/Emoji/phpunit.xml.dist +++ b/src/Symfony/Component/Emoji/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php index 5f55cfb2c969d..2f8c328639290 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\ErrorHandler\Tests; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\WithoutErrorHandler; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -37,6 +39,7 @@ protected function tearDown(): void $r->setValue(null, 0); } + #[WithoutErrorHandler] public function testRegister() { $handler = ErrorHandler::register(); @@ -67,6 +70,7 @@ public function testRegister() } } + #[WithoutErrorHandler] public function testErrorGetLast() { $logger = $this->createMock(LoggerInterface::class); @@ -89,6 +93,7 @@ public function testErrorGetLast() } } + #[WithoutErrorHandler] public function testNotice() { ErrorHandler::register(); @@ -125,6 +130,7 @@ public static function triggerNotice($that) $that->assertSame('', $foo.$foo.$bar); } + #[WithoutErrorHandler] public function testFailureCall() { $this->expectException(\ErrorException::class); @@ -133,6 +139,7 @@ public function testFailureCall() ErrorHandler::call('fopen', 'unknown.txt', 'r'); } + #[WithoutErrorHandler] public function testCallRestoreErrorHandler() { $prev = set_error_handler('var_dump'); @@ -149,6 +156,7 @@ public function testCallRestoreErrorHandler() $this->assertSame('var_dump', $prev); } + #[WithoutErrorHandler] public function testCallErrorExceptionInfo() { try { @@ -167,6 +175,7 @@ public function testCallErrorExceptionInfo() } } + #[WithoutErrorHandler] public function testSuccessCall() { touch($filename = tempnam(sys_get_temp_dir(), 'sf_error_handler_')); @@ -176,6 +185,7 @@ public function testSuccessCall() unlink($filename); } + #[WithoutErrorHandler] public function testConstruct() { try { @@ -188,6 +198,7 @@ public function testConstruct() } } + #[WithoutErrorHandler] public function testDefaultLogger() { try { @@ -225,6 +236,7 @@ public function testDefaultLogger() } } + #[WithoutErrorHandler] public function testHandleError() { try { @@ -330,6 +342,7 @@ public function testHandleError() } } + #[WithoutErrorHandler] public function testHandleErrorWithAnonymousClass() { $anonymousObject = new class extends \stdClass { @@ -348,6 +361,7 @@ public function testHandleErrorWithAnonymousClass() $this->assertSame('User Warning: foo stdClass@anonymous bar', $e->getMessage()); } + #[WithoutErrorHandler] public function testHandleDeprecation() { $logArgCheck = function ($level, $message, $context) { @@ -373,6 +387,8 @@ public function testHandleDeprecation() /** * @dataProvider handleExceptionProvider */ + #[DataProvider('handleExceptionProvider')] + #[WithoutErrorHandler] public function testHandleException(string $expectedMessage, \Throwable $exception, ?string $enhancedMessage = null) { try { @@ -433,6 +449,7 @@ public static function handleExceptionProvider(): array ]; } + #[WithoutErrorHandler] public function testBootstrappingLogger() { $bootLogger = new BufferingLogger(); @@ -487,6 +504,7 @@ public function testBootstrappingLogger() $handler->setLoggers([\E_DEPRECATED => [$mockLogger, LogLevel::WARNING]]); } + #[WithoutErrorHandler] public function testSettingLoggerWhenExceptionIsBuffered() { $bootLogger = new BufferingLogger(); @@ -506,6 +524,7 @@ public function testSettingLoggerWhenExceptionIsBuffered() $handler->handleException($exception); } + #[WithoutErrorHandler] public function testHandleFatalError() { try { @@ -541,6 +560,7 @@ public function testHandleFatalError() } } + #[WithoutErrorHandler] public function testHandleErrorException() { $exception = new \Error("Class 'IReallyReallyDoNotExistAnywhereInTheRepositoryISwear' not found"); @@ -556,6 +576,7 @@ public function testHandleErrorException() $this->assertStringStartsWith("Attempted to load class \"IReallyReallyDoNotExistAnywhereInTheRepositoryISwear\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage()); } + #[WithoutErrorHandler] public function testCustomExceptionHandler() { $this->expectException(\Exception::class); @@ -568,6 +589,7 @@ public function testCustomExceptionHandler() $handler->handleException(new \Exception()); } + #[WithoutErrorHandler] public function testRenderException() { $handler = new ErrorHandler(); @@ -583,6 +605,8 @@ public function testRenderException() /** * @dataProvider errorHandlerWhenLoggingProvider */ + #[DataProvider('errorHandlerWhenLoggingProvider')] + #[WithoutErrorHandler] public function testErrorHandlerWhenLogging(bool $previousHandlerWasDefined, bool $loggerSetsAnotherHandler, bool $nextHandlerIsDefined) { try { @@ -634,6 +658,7 @@ public static function errorHandlerWhenLoggingProvider(): iterable } } + #[WithoutErrorHandler] public function testAssertQuietEval() { if ('-1' === \ini_get('zend.assertions')) { @@ -675,6 +700,7 @@ public function testAssertQuietEval() $this->assertSame('Warning: assert(): assert(false) failed', $logs[0][1]); } + #[WithoutErrorHandler] public function testHandleTriggerDeprecation() { try { diff --git a/src/Symfony/Component/ErrorHandler/phpunit.xml.dist b/src/Symfony/Component/ErrorHandler/phpunit.xml.dist index b23ccab51b8a7..b75dbd345036a 100644 --- a/src/Symfony/Component/ErrorHandler/phpunit.xml.dist +++ b/src/Symfony/Component/ErrorHandler/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist index 4d473936c6932..0489dbfdc0def 100644 --- a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist +++ b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist b/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist index 8e60a89da1f7c..6112aaf7aedec 100644 --- a/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist +++ b/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Filesystem/phpunit.xml.dist b/src/Symfony/Component/Filesystem/phpunit.xml.dist index e7418f42cd280..73169138dc917 100644 --- a/src/Symfony/Component/Filesystem/phpunit.xml.dist +++ b/src/Symfony/Component/Filesystem/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Finder/phpunit.xml.dist b/src/Symfony/Component/Finder/phpunit.xml.dist index a68bde58b834f..b8645cc293e54 100644 --- a/src/Symfony/Component/Finder/phpunit.xml.dist +++ b/src/Symfony/Component/Finder/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 40c021d915b22..9a189ea29fa38 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "doctrine/collections": "^1.0|^2.0", - "symfony/validator": "^6.4|^7.0", + "symfony/validator": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^6.4|^7.0", "symfony/expression-language": "^6.4|^7.0", "symfony/config": "^6.4|^7.0", diff --git a/src/Symfony/Component/Form/phpunit.xml.dist b/src/Symfony/Component/Form/phpunit.xml.dist index 148f8f58dd260..d240724fa8178 100644 --- a/src/Symfony/Component/Form/phpunit.xml.dist +++ b/src/Symfony/Component/Form/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/HtmlSanitizer/phpunit.xml.dist b/src/Symfony/Component/HtmlSanitizer/phpunit.xml.dist index bb03155b35ae2..8e08aa7d069f3 100644 --- a/src/Symfony/Component/HtmlSanitizer/phpunit.xml.dist +++ b/src/Symfony/Component/HtmlSanitizer/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/HttpClient/phpunit.xml.dist b/src/Symfony/Component/HttpClient/phpunit.xml.dist index afb49661d7976..e986d7ca679e1 100644 --- a/src/Symfony/Component/HttpClient/phpunit.xml.dist +++ b/src/Symfony/Component/HttpClient/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_urlencode.expected b/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_urlencode.expected index 17a9efc669043..1fbc95eef1ceb 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_urlencode.expected +++ b/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_urlencode.expected @@ -4,8 +4,8 @@ Array [0] => Content-Type: text/plain; charset=utf-8 [1] => Cache-Control: no-cache, private [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT - [3] => Set-Cookie: %3D%2C%3B%20%09%0D%0A%0B%0C=%3D%2C%3B%20%09%0D%0A%0B%0C; path=/ - [4] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/ - [5] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/ + [3] => Set-Cookie: %%3D%%2C%%3B%%20%%09%%0D%%0A%%0B%%0C=%%3D%%2C%%3B%%20%%09%%0D%%0A%%0B%%0C; path=/ + [4] => Set-Cookie: ?*():@&+$/%%#[]=%%3F%%2A%%28%%29%%3A%%40%%26%%2B%%24%%2F%%25%%23%%5B%%5D; path=/ + [5] => Set-Cookie: ?*():@&+$/%%#[]=%%3F%%2A%%28%%29%%3A%%40%%26%%2B%%24%%2F%%25%%23%%5B%%5D; path=/ ) shutdown diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php index 11c489f6b5c19..a931de9eb6a34 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -224,10 +224,12 @@ public function testCacheExpireOption() */ public function testTransSidTagsOption() { - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "trans_sid_tags" option is deprecated and will be ignored in Symfony 8.0.'); + $deprecations = []; - $previousErrorHandler = set_error_handler(function ($errno, $errstr) use (&$previousErrorHandler) { + $previousErrorHandler = set_error_handler(function ($errno, $errstr) use (&$previousErrorHandler, &$deprecations) { if ('ini_set(): Usage of session.trans_sid_tags INI setting is deprecated' !== $errstr) { + $deprecations[] = $errstr; + return $previousErrorHandler ? $previousErrorHandler(...\func_get_args()) : false; } }); @@ -240,6 +242,8 @@ public function testTransSidTagsOption() restore_error_handler(); } + $this->assertCount(1, $deprecations); + $this->assertSame('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "trans_sid_tags" option is deprecated and will be ignored in Symfony 8.0.', $deprecations[0]); $this->assertSame('a=href', \ini_get('session.trans_sid_tags')); } @@ -370,13 +374,15 @@ public function testSaveHandlesNullSessionGracefully() */ public function testPassingDeprecatedOptions() { - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "sid_length" option is deprecated and will be ignored in Symfony 8.0.'); - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "sid_bits_per_character" option is deprecated and will be ignored in Symfony 8.0.'); - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "referer_check" option is deprecated and will be ignored in Symfony 8.0.'); - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "use_only_cookies" option is deprecated and will be ignored in Symfony 8.0.'); - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "use_trans_sid" option is deprecated and will be ignored in Symfony 8.0.'); - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "trans_sid_hosts" option is deprecated and will be ignored in Symfony 8.0.'); - $this->expectUserDeprecationMessage('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "trans_sid_tags" option is deprecated and will be ignored in Symfony 8.0.'); + $deprecations = []; + + $previousErrorHandler = set_error_handler(function ($errno, $errstr) use (&$previousErrorHandler, &$deprecations) { + if (!preg_match('/^ini_set\(\):( Disabling| Usage of)? session\..+ is deprecated$/', $errstr)) { + $deprecations[] = $errstr; + + return $previousErrorHandler ? $previousErrorHandler(...\func_get_args()) : false; + } + }); $this->getStorage([ 'sid_length' => 42, @@ -387,5 +393,14 @@ public function testPassingDeprecatedOptions() 'trans_sid_hosts' => 'foo', 'trans_sid_tags' => 'foo', ]); + + $this->assertCount(7, $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "sid_length" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "sid_bits_per_character" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "referer_check" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "use_only_cookies" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "use_trans_sid" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "trans_sid_hosts" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); + $this->assertContains('Since symfony/http-foundation 7.2: NativeSessionStorage\'s "trans_sid_tags" option is deprecated and will be ignored in Symfony 8.0.', $deprecations); } } diff --git a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist index 66c8c18366de3..7e9ff08e75fef 100644 --- a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist +++ b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -28,5 +28,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist index 7e2c738f869f1..758b0d80bd04a 100644 --- a/src/Symfony/Component/HttpKernel/phpunit.xml.dist +++ b/src/Symfony/Component/HttpKernel/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,15 +26,11 @@ ./Tests ./vendor - + - - - - - Symfony\Component\HttpFoundation - - - - + + + + + diff --git a/src/Symfony/Component/Intl/phpunit.xml.dist b/src/Symfony/Component/Intl/phpunit.xml.dist index 25aa1c1abc590..fe1d3badb87a1 100644 --- a/src/Symfony/Component/Intl/phpunit.xml.dist +++ b/src/Symfony/Component/Intl/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -33,5 +33,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Ldap/phpunit.xml.dist b/src/Symfony/Component/Ldap/phpunit.xml.dist index 913a50b7fc5e5..881b0ced99508 100644 --- a/src/Symfony/Component/Ldap/phpunit.xml.dist +++ b/src/Symfony/Component/Ldap/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -28,5 +28,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Lock/phpunit.xml.dist b/src/Symfony/Component/Lock/phpunit.xml.dist index 4770c3a7cbe0e..28b4c6a6eb515 100644 --- a/src/Symfony/Component/Lock/phpunit.xml.dist +++ b/src/Symfony/Component/Lock/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -30,5 +30,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Amazon/phpunit.xml.dist index 97db010e60c6a..6e44cae240c79 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Azure/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Azure/phpunit.xml.dist index 806393ddcd0bd..8fa0dc7912b7d 100644 --- a/src/Symfony/Component/Mailer/Bridge/Azure/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Azure/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Brevo/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Brevo/phpunit.xml.dist index e7fba0dbaf8e8..191daf369f6f6 100644 --- a/src/Symfony/Component/Mailer/Bridge/Brevo/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Brevo/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Google/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Google/phpunit.xml.dist index e6d13ad20928f..5e0cefb974c9c 100644 --- a/src/Symfony/Component/Mailer/Bridge/Google/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Google/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Infobip/phpunit.xml.dist index c149a080d9427..1cb28eed96fe1 100644 --- a/src/Symfony/Component/Mailer/Bridge/Infobip/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Infobip/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Mailchimp/phpunit.xml.dist index b7443caa85a97..8fc649ada05c0 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist index 993980b956171..cb580f44d13ec 100644 --- a/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Mailgun/phpunit.xml.dist index dcc0a050cadf3..c0c8aece3ba2e 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Mailjet/phpunit.xml.dist index 50c885293bb6d..4f4c5ce8bd84b 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailjet/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Mailomat/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Mailomat/phpunit.xml.dist index 2f6ec572e2ecf..ca3a07cb9e8cb 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailomat/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Mailomat/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Mailtrap/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Mailtrap/phpunit.xml.dist index 66332ce2b9cb9..28033dab77cdc 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailtrap/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Mailtrap/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Postal/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Postal/phpunit.xml.dist index 8e264cdc7d0f4..c6b7128c4cafc 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postal/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Postal/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Postmark/phpunit.xml.dist index 0d56f703d4bbb..18df57a6e45a5 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Resend/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Resend/phpunit.xml.dist index bd5f5f35442ec..18a3ffadfa6a6 100644 --- a/src/Symfony/Component/Mailer/Bridge/Resend/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Resend/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Scaleway/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Scaleway/phpunit.xml.dist index 7600aa9b6c756..82ba52ed02bd8 100644 --- a/src/Symfony/Component/Mailer/Bridge/Scaleway/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Scaleway/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Sendgrid/phpunit.xml.dist index a01a20ed8b243..4d4f84b5d5635 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/Bridge/Sweego/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Sweego/phpunit.xml.dist index e31a5e51fcde6..fdf2025da41b0 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sweego/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/Bridge/Sweego/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mailer/phpunit.xml.dist b/src/Symfony/Component/Mailer/phpunit.xml.dist index 69e3cbef1ef44..0382ebfe6b4b4 100644 --- a/src/Symfony/Component/Mailer/phpunit.xml.dist +++ b/src/Symfony/Component/Mailer/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/phpunit.xml.dist b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/phpunit.xml.dist index 342aa77daa41d..9191d249360d8 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/phpunit.xml.dist +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/phpunit.xml.dist b/src/Symfony/Component/Messenger/Bridge/Amqp/phpunit.xml.dist index 943d59c877c73..e435b79ff2716 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/phpunit.xml.dist +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/phpunit.xml.dist b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/phpunit.xml.dist index e8becc762f599..1a7aee334dff1 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/phpunit.xml.dist +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/phpunit.xml.dist b/src/Symfony/Component/Messenger/Bridge/Doctrine/phpunit.xml.dist index 506b27836b795..69c0198de8ddf 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/phpunit.xml.dist +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php index c81deced41984..3ba1c0b26734e 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php @@ -193,7 +193,7 @@ private static function initializeRedis(\Redis|Relay $redis, string $host, int $ } $connect = isset($params['persistent_id']) ? 'pconnect' : 'connect'; - $redis->{$connect}($host, $port, $params['timeout'], $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...(\defined('Redis::SCAN_PREFIX') || \extension_loaded('relay')) ? [['stream' => $params['ssl'] ?? null]] : []); + @$redis->{$connect}($host, $port, $params['timeout'], $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...(\defined('Redis::SCAN_PREFIX') || \extension_loaded('relay')) ? [['stream' => $params['ssl'] ?? null]] : []); $redis->setOption($redis instanceof \Redis ? \Redis::OPT_SERIALIZER : Relay::OPT_SERIALIZER, $params['serializer']); diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/composer.json b/src/Symfony/Component/Messenger/Bridge/Redis/composer.json index f322f27c2107d..618a60eac941f 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/Redis/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.2", "ext-redis": "*", - "symfony/messenger": "^6.4|^7.0" + "symfony/messenger": "^6.4.13|^7.1.6" }, "require-dev": { "symfony/property-access": "^6.4|^7.0", diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/phpunit.xml.dist b/src/Symfony/Component/Messenger/Bridge/Redis/phpunit.xml.dist index 48dda66e6165f..fc630c5b31f0f 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/phpunit.xml.dist +++ b/src/Symfony/Component/Messenger/Bridge/Redis/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Messenger/phpunit.xml.dist b/src/Symfony/Component/Messenger/phpunit.xml.dist index 0686c84a14d33..582adf4344155 100644 --- a/src/Symfony/Component/Messenger/phpunit.xml.dist +++ b/src/Symfony/Component/Messenger/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Mime/phpunit.xml.dist b/src/Symfony/Component/Mime/phpunit.xml.dist index 9ccc292477a30..540bfc4a85c8e 100644 --- a/src/Symfony/Component/Mime/phpunit.xml.dist +++ b/src/Symfony/Component/Mime/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/AllMySms/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/AllMySms/phpunit.xml.dist index 804acd82f7ab9..342d75dcb79eb 100644 --- a/src/Symfony/Component/Notifier/Bridge/AllMySms/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/AllMySms/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Bluesky/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Bluesky/phpunit.xml.dist index 99623d7aefed3..6d592fb7c1041 100644 --- a/src/Symfony/Component/Notifier/Bridge/Bluesky/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Bluesky/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Brevo/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Brevo/phpunit.xml.dist index a185c4f2adf76..cf65487af705b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Brevo/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Brevo/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Clickatell/phpunit.xml.dist index be581a07a0bd3..c213d1ffc2089 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Discord/phpunit.xml.dist index e1d4d8d6006d2..b78cd1d5d4efe 100644 --- a/src/Symfony/Component/Notifier/Bridge/Discord/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Discord/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Esendex/phpunit.xml.dist index 68af2ab64b9b5..19eb80541a377 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/FakeChat/phpunit.xml.dist index 0a6f1ba4d80d6..08845e954b105 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/FakeSms/phpunit.xml.dist index 84f83534a9c36..6904a9f926716 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Firebase/phpunit.xml.dist index 0e54759cad975..739630914302f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Firebase/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Firebase/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/FreeMobile/phpunit.xml.dist index 2360c3a0d897e..f4f34fa178378 100644 --- a/src/Symfony/Component/Notifier/Bridge/FreeMobile/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/FreeMobile/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/GatewayApi/phpunit.xml.dist index 6360acbdbb33f..4e2ce01eeb174 100644 --- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/GoogleChat/phpunit.xml.dist index 336cf1c0b01ab..e51dde4e2324d 100644 --- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Infobip/phpunit.xml.dist index 62f204544a084..f0bbc65eaf216 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Iqsms/phpunit.xml.dist index daf7d4e94bd20..7cd6a305e3f70 100644 --- a/src/Symfony/Component/Notifier/Bridge/Iqsms/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Iqsms/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist index 11bcba3a27793..47ae3bb50ca44 100644 --- a/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/JoliNotif/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/JoliNotif/phpunit.xml.dist index 018d59bae1ff6..71bdfab1cb675 100644 --- a/src/Symfony/Component/Notifier/Bridge/JoliNotif/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/JoliNotif/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/LightSms/phpunit.xml.dist index 6b129743e07ea..75c2b4bdfe3fa 100644 --- a/src/Symfony/Component/Notifier/Bridge/LightSms/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/LightSms/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/LinkedIn/phpunit.xml.dist index d610bd58117fa..f3bef62a29304 100644 --- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist index 096fbc3c43f9d..0d5a57bcd94d9 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Mattermost/phpunit.xml.dist index ad154b89c5184..ec7ff8dc9bf80 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Mercure/phpunit.xml.dist index 9aed9cdbd7d82..ade3fbb59393a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/MessageBird/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/MessageBird/phpunit.xml.dist index 6e3e6531588be..9297f62bacba0 100644 --- a/src/Symfony/Component/Notifier/Bridge/MessageBird/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/MessageBird/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/phpunit.xml.dist index cc16599fac1ec..cf09620ca9b7d 100644 --- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Mobyt/phpunit.xml.dist index 9dcae49197e3e..dc14cd15b2eea 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mobyt/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Octopush/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Octopush/phpunit.xml.dist index fc27b3894ae58..0778ff71527fd 100644 --- a/src/Symfony/Component/Notifier/Bridge/Octopush/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Octopush/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/OvhCloud/phpunit.xml.dist index da72a6b1ea42e..d904e4bb2182f 100644 --- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist index 27af4d4b826a0..a93105d464edb 100644 --- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Primotexto/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Primotexto/phpunit.xml.dist index 53b0186de4e49..49ddbd3eb80e4 100644 --- a/src/Symfony/Component/Notifier/Bridge/Primotexto/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Primotexto/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Redlink/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Redlink/phpunit.xml.dist index ba9ade8a6b847..621cb9438dc3f 100644 --- a/src/Symfony/Component/Notifier/Bridge/Redlink/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Redlink/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/RocketChat/phpunit.xml.dist index f8be0a85a6d5f..1fcf7a01cf152 100644 --- a/src/Symfony/Component/Notifier/Bridge/RocketChat/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/RocketChat/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Sinch/phpunit.xml.dist index c501b350ee9a3..75bcfa708e2f6 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sinch/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Sinch/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Slack/phpunit.xml.dist index 8d03df4f3064c..cb3c3eaa0bdaa 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Slack/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/phpunit.xml.dist index 51687ee1d2a0b..4cbdde737025d 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsBiuras/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/SmsBiuras/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Smsapi/phpunit.xml.dist index e68e7a1bd2ba8..4364ae2166def 100644 --- a/src/Symfony/Component/Notifier/Bridge/Smsapi/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/SpotHit/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/SpotHit/phpunit.xml.dist index 80bd2d318d9e9..8ee21407a02e7 100644 --- a/src/Symfony/Component/Notifier/Bridge/SpotHit/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/SpotHit/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Telegram/phpunit.xml.dist index c6e0a30f8df83..2383ef6b2c498 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Twilio/phpunit.xml.dist index 229c7c5d9314b..1c4436b7a4c3b 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist index f486d936888b9..71fd694f21f27 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Unifonic/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Unifonic/phpunit.xml.dist index 92bdf6bb4d2c8..cda676e332e92 100644 --- a/src/Symfony/Component/Notifier/Bridge/Unifonic/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Unifonic/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Zendesk/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Zendesk/phpunit.xml.dist index 5bd9816e2cf8b..1017e47f80517 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zendesk/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Zendesk/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Zulip/phpunit.xml.dist index 0e2fb9c5febba..5e93606edd9e3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Zulip/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/Bridge/Zulip/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Notifier/phpunit.xml.dist b/src/Symfony/Component/Notifier/phpunit.xml.dist index 89aea157d7590..5d150aeaed2ab 100644 --- a/src/Symfony/Component/Notifier/phpunit.xml.dist +++ b/src/Symfony/Component/Notifier/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist index 3b3d1831d61b0..cc84670cdc164 100644 --- a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist +++ b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/PasswordHasher/phpunit.xml.dist b/src/Symfony/Component/PasswordHasher/phpunit.xml.dist index f9917cc3be3f3..31b6286669a2c 100644 --- a/src/Symfony/Component/PasswordHasher/phpunit.xml.dist +++ b/src/Symfony/Component/PasswordHasher/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Process/phpunit.xml.dist b/src/Symfony/Component/Process/phpunit.xml.dist index 13bd3f839a28a..d75b2af202d34 100644 --- a/src/Symfony/Component/Process/phpunit.xml.dist +++ b/src/Symfony/Component/Process/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist index db0be25f3f0d6..91f9c42227322 100644 --- a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist +++ b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/PropertyInfo/phpunit.xml.dist b/src/Symfony/Component/PropertyInfo/phpunit.xml.dist index 9ee482cf9b77e..ef916927fbdaa 100644 --- a/src/Symfony/Component/PropertyInfo/phpunit.xml.dist +++ b/src/Symfony/Component/PropertyInfo/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/RateLimiter/phpunit.xml.dist b/src/Symfony/Component/RateLimiter/phpunit.xml.dist index d26339d188781..84b8dd879ec30 100644 --- a/src/Symfony/Component/RateLimiter/phpunit.xml.dist +++ b/src/Symfony/Component/RateLimiter/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/RemoteEvent/phpunit.xml.dist b/src/Symfony/Component/RemoteEvent/phpunit.xml.dist index 80dd2bf19ffee..360993cf9ceab 100644 --- a/src/Symfony/Component/RemoteEvent/phpunit.xml.dist +++ b/src/Symfony/Component/RemoteEvent/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Routing/phpunit.xml.dist b/src/Symfony/Component/Routing/phpunit.xml.dist index 587ee4c001c47..13d70e7cee40e 100644 --- a/src/Symfony/Component/Routing/phpunit.xml.dist +++ b/src/Symfony/Component/Routing/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Runtime/phpunit.xml.dist b/src/Symfony/Component/Runtime/phpunit.xml.dist index fc2aa6e67073c..a4b1a75a01223 100644 --- a/src/Symfony/Component/Runtime/phpunit.xml.dist +++ b/src/Symfony/Component/Runtime/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Scheduler/phpunit.xml.dist b/src/Symfony/Component/Scheduler/phpunit.xml.dist index 5a9b7c647b600..7893506e555a7 100644 --- a/src/Symfony/Component/Scheduler/phpunit.xml.dist +++ b/src/Symfony/Component/Scheduler/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Security/Core/phpunit.xml.dist b/src/Symfony/Component/Security/Core/phpunit.xml.dist index 223091f3fabd9..7269c72d1512d 100644 --- a/src/Symfony/Component/Security/Core/phpunit.xml.dist +++ b/src/Symfony/Component/Security/Core/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Security/Csrf/phpunit.xml.dist b/src/Symfony/Component/Security/Csrf/phpunit.xml.dist index 012cb736ea123..f9fee0e0e4358 100644 --- a/src/Symfony/Component/Security/Csrf/phpunit.xml.dist +++ b/src/Symfony/Component/Security/Csrf/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Security/Http/phpunit.xml.dist b/src/Symfony/Component/Security/Http/phpunit.xml.dist index 96733956a3b1f..44c69ebcea02f 100644 --- a/src/Symfony/Component/Security/Http/phpunit.xml.dist +++ b/src/Symfony/Component/Security/Http/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Semaphore/phpunit.xml.dist b/src/Symfony/Component/Semaphore/phpunit.xml.dist index 53c6007ef61e1..aa85cac3237d6 100644 --- a/src/Symfony/Component/Semaphore/phpunit.xml.dist +++ b/src/Symfony/Component/Semaphore/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Serializer/phpunit.xml.dist b/src/Symfony/Component/Serializer/phpunit.xml.dist index fd66cdfcc351c..6174f247858ec 100644 --- a/src/Symfony/Component/Serializer/phpunit.xml.dist +++ b/src/Symfony/Component/Serializer/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Stopwatch/phpunit.xml.dist b/src/Symfony/Component/Stopwatch/phpunit.xml.dist index 355a660033b60..bdc3c7be82845 100644 --- a/src/Symfony/Component/Stopwatch/phpunit.xml.dist +++ b/src/Symfony/Component/Stopwatch/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/String/phpunit.xml.dist b/src/Symfony/Component/String/phpunit.xml.dist index 32741bdb243da..cde533201073f 100644 --- a/src/Symfony/Component/String/phpunit.xml.dist +++ b/src/Symfony/Component/String/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist b/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist index 1db54ec4d7b44..8ae6a38513698 100644 --- a/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Translation/Bridge/Loco/phpunit.xml.dist b/src/Symfony/Component/Translation/Bridge/Loco/phpunit.xml.dist index 5122f8e4b923c..bebcd0a68e360 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/Bridge/Loco/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/phpunit.xml.dist b/src/Symfony/Component/Translation/Bridge/Lokalise/phpunit.xml.dist index 367077240dbdc..469954b0130cb 100644 --- a/src/Symfony/Component/Translation/Bridge/Lokalise/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/Bridge/Lokalise/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Translation/Bridge/Phrase/phpunit.xml.dist b/src/Symfony/Component/Translation/Bridge/Phrase/phpunit.xml.dist index 3923cac64a102..9fe2f4c12cac2 100644 --- a/src/Symfony/Component/Translation/Bridge/Phrase/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/Bridge/Phrase/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -31,5 +31,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 1db1621590462..c56c520217499 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.5|^3.0", + "symfony/translation-contracts": "^2.5.3|^3.3", "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { diff --git a/src/Symfony/Component/Translation/phpunit.xml.dist b/src/Symfony/Component/Translation/phpunit.xml.dist index a3045329e2ef2..f25404bac05d4 100644 --- a/src/Symfony/Component/Translation/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/TypeInfo/phpunit.xml.dist b/src/Symfony/Component/TypeInfo/phpunit.xml.dist index 11b4d18ad464c..cac547b20622d 100644 --- a/src/Symfony/Component/TypeInfo/phpunit.xml.dist +++ b/src/Symfony/Component/TypeInfo/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Uid/phpunit.xml.dist b/src/Symfony/Component/Uid/phpunit.xml.dist index ae2399d0897cc..539a4e8d0552f 100644 --- a/src/Symfony/Component/Uid/phpunit.xml.dist +++ b/src/Symfony/Component/Uid/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,15 +26,11 @@ ./Tests/ ./vendor/ - + - - - - - Symfony\Component\Uid - - - - + + + + + diff --git a/src/Symfony/Component/Validator/phpunit.xml.dist b/src/Symfony/Component/Validator/phpunit.xml.dist index 8288431b6a355..6f824ac1b7b75 100644 --- a/src/Symfony/Component/Validator/phpunit.xml.dist +++ b/src/Symfony/Component/Validator/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DoctrineCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DoctrineCasterTest.php index 06b65ff1165c9..a1d7d5f2c5ce6 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/DoctrineCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/DoctrineCasterTest.php @@ -40,7 +40,7 @@ public function testCastPersistentCollection() %A -backRefFieldName: null -isDirty: false - -em: $entityManagerClass { …3} + -em: $entityManagerClass { …%d} -typeClass: Doctrine\ORM\Mapping\ClassMetadata { …} %A EODUMP; @@ -49,7 +49,7 @@ public function testCastPersistentCollection() $expected = << - + ./ @@ -30,5 +30,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/VarExporter/phpunit.xml.dist b/src/Symfony/Component/VarExporter/phpunit.xml.dist index 52e3cb005fcbf..b496a2ef3e6a8 100644 --- a/src/Symfony/Component/VarExporter/phpunit.xml.dist +++ b/src/Symfony/Component/VarExporter/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -27,5 +27,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/WebLink/phpunit.xml.dist b/src/Symfony/Component/WebLink/phpunit.xml.dist index 660c6b2d95694..1a58c9dea657d 100644 --- a/src/Symfony/Component/WebLink/phpunit.xml.dist +++ b/src/Symfony/Component/WebLink/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Webhook/phpunit.xml.dist b/src/Symfony/Component/Webhook/phpunit.xml.dist index ff3020250d20c..5b881f89bebc6 100644 --- a/src/Symfony/Component/Webhook/phpunit.xml.dist +++ b/src/Symfony/Component/Webhook/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Workflow/phpunit.xml.dist b/src/Symfony/Component/Workflow/phpunit.xml.dist index 15e5deb058413..3efb7aedacb67 100644 --- a/src/Symfony/Component/Workflow/phpunit.xml.dist +++ b/src/Symfony/Component/Workflow/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Component/Yaml/phpunit.xml.dist b/src/Symfony/Component/Yaml/phpunit.xml.dist index 3dc41d45ed45d..e13139c27be88 100644 --- a/src/Symfony/Component/Yaml/phpunit.xml.dist +++ b/src/Symfony/Component/Yaml/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -26,5 +26,9 @@ ./Tests ./vendor - + + + + + diff --git a/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php index 07d12b4a5bdd3..015ca71e187b4 100644 --- a/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php +++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php @@ -11,13 +11,9 @@ namespace Symfony\Contracts\Service\Test; -class_alias(ServiceLocatorTestCase::class, ServiceLocatorTest::class); - -if (false) { - /** - * @deprecated since PHPUnit 9.6 - */ - class ServiceLocatorTest - { - } +/** + * @deprecated since PHPUnit 9.6 + */ +class ServiceLocatorTest extends ServiceLocatorTestCase +{ } diff --git a/src/Symfony/Contracts/phpunit.xml.dist b/src/Symfony/Contracts/phpunit.xml.dist index 947db86d20ad9..d2e38161f810c 100644 --- a/src/Symfony/Contracts/phpunit.xml.dist +++ b/src/Symfony/Contracts/phpunit.xml.dist @@ -1,7 +1,7 @@ - + ./ @@ -30,6 +30,9 @@ ./Translation/Test/ ./vendor - + + + + From 9ec290f1f6e55fec781cddcb35291be342bc6d52 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:01:53 +0100 Subject: [PATCH 03/32] Port Appveyor to GitHub Actions --- .github/workflows/unit-tests.yml | 513 +++++++++++++++++++------------ 1 file changed, 308 insertions(+), 205 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 4be5931b28d84..1883a4d574b13 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -4,10 +4,6 @@ on: push: pull_request: -defaults: - run: - shell: bash - concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true @@ -17,26 +13,258 @@ permissions: jobs: - tests: - name: Unit Tests +# linux: +# name: Linux +# +# defaults: +# run: +# shell: bash +# +# env: +# extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay + +# strategy: +# matrix: +# include: +# - php: '8.2' +# - php: '8.2' +# mode: high-deps +# - php: '8.2' +# mode: low-deps +# - php: '8.3' +# - php: '8.4' +# #mode: experimental +# fail-fast: false + +# runs-on: ubuntu-20.04 + +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# with: +# fetch-depth: 2 + +# - name: Setup PHP +# uses: shivammathur/setup-php@v2 +# with: +# coverage: "none" +# ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1 +# php-version: "${{ matrix.php }}" +# extensions: "${{ matrix.extensions || env.extensions }}" +# tools: flex + +# - name: Configure environment +# run: | +# git config --global user.email "" +# git config --global user.name "Symfony" +# git config --global init.defaultBranch main +# git config --global advice.detachedHead false + +# (php --ri relay 2>&1 > /dev/null) || sudo rm -f /etc/php/*/cli/conf.d/20-relay.ini + +# COMPOSER_HOME="$(composer config home)" +# ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" + +# echo COLUMNS=120 >> $GITHUB_ENV +# echo PHPUNIT="$(pwd)/phpunit --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group integration" >> $GITHUB_ENV +# echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" != low-deps ]] && 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) +# SYMFONY_FEATURE_BRANCH=$(curl -s https://raw.githubusercontent.com/symfony/recipes/flex/main/index.json | jq -r '.versions."dev-name"') + +# # Install the phpunit-bridge from a PR if required +# # +# # To run a PR with a patched phpunit-bridge, first submit the patch for the +# # phpunit-bridge as a separate PR against the next feature-branch then +# # uncomment and update the following line with that PR number +# #SYMFONY_PHPUNIT_BRIDGE_PR=32886 + +# if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then +# git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head +# git rm -rq src/Symfony/Bridge/PhpUnit +# git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit +# SYMFONY_PHPUNIT_BRIDGE_REF=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref) +# sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_PHPUNIT_BRIDGE_REF'.x@dev"/' composer.json +# rm -rf .phpunit +# fi + +# # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components +# if [[ ! "${{ matrix.mode }}" = *-deps ]]; then +# php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit +# else +# echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV +# cp composer.json composer.json.orig +# echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json +# php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin) +# mv composer.json composer.json.phpunit +# mv composer.json.orig composer.json +# fi +# if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then +# git rm -fq -- src/Symfony/Bridge/PhpUnit/composer.json +# git diff --staged -- src/Symfony/Bridge/PhpUnit/ | git apply -R --index +# fi + +# # For the highest branch, in high-deps mode, the version before it is checked out and tested with the locally patched components +# if [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then +# echo FLIP='^' >> $GITHUB_ENV +# SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//) +# git fetch --depth=2 origin $SYMFONY_VERSION +# git checkout -m FETCH_HEAD +# echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h ') >> $GITHUB_ENV +# fi + +# # Skip the phpunit-bridge on bugfix-branches when not in *-deps mode +# if [[ ! "${{ matrix.mode }}" = *-deps && $SYMFONY_VERSION != $SYMFONY_FEATURE_BRANCH ]]; then +# echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' | xargs -I{} dirname {}) >> $GITHUB_ENV +# else +# echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist | xargs -I{} dirname {}) >> $GITHUB_ENV +# fi + +# # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one +# [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true + +# 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 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV +# [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true + +# if [[ "${{ matrix.mode }}" = low-deps ]]; then +# echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:'^4.18|^5.0'" >> $GITHUB_ENV +# fi + +# - name: Install dependencies +# run: | +# echo "::group::composer update" +# $COMPOSER_UP +# echo "::endgroup::" + +# echo "::group::install phpunit" +# ./phpunit install +# echo "::endgroup::" + +# - name: Patch return types +# if: "matrix.php == '8.2' && ! matrix.mode" +# run: | +# patch -sp1 < .github/expected-missing-return-types.diff +# git add . +# composer install -q --optimize-autoloader || composer install --optimize-autoloader +# SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php +# git checkout src/Symfony/Contracts/Service/ResetInterface.php +# SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent +# git checkout src/Symfony/Contracts/Service/ResetInterface.php +# git diff --exit-code + +# - name: Check return types +# if: "matrix.php == '8.2' && ! matrix.mode" +# run: | +# php .github/patch-types.php lint + +# - name: Run tests +# run: | +# _run_tests() { +# local ok=0 +# local title="$1$FLIP" +# local start=$(date -u +%s) +# OUTPUT=$(bash -xc "$2" 2>&1) || ok=$? +# local end=$(date -u +%s) + +# if [[ $ok -ne 0 ]]; then +# printf "\n%-70s%10s\n" $title $(($end-$start))s +# echo "$OUTPUT" +# echo "Job exited with: $ok" +# echo -e "\n::error::KO $title\\n" +# else +# printf "::group::%-68s%10s\n" $title $(($end-$start))s +# echo "$OUTPUT" +# echo -e "\n\\e[32mOK\\e[0m $title\\n\\n::endgroup::" +# fi + +# [[ "${{ matrix.mode }}" = experimental ]] || (exit $ok) +# } +# export -f _run_tests + +# if [[ ! "${{ matrix.mode }}" = *-deps ]]; then +# echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} '$PHPUNIT {}'" + +# exit 0 +# fi + +# if [[ "${{ matrix.mode }}" = low-deps ]]; then +# echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT'" + +# exit 0 +# fi + +# # matrix.mode = high-deps +# echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 + +# # get a list of the patched components (relies on .github/build-packages.php being called in the previous step) +# PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true) + +# # 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" +# export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev +# export SYMFONY_REQUIRE=">=$SYMFONY_VERSION" +# git fetch --depth=2 origin $SYMFONY_VERSION +# git checkout -m FETCH_HEAD +# PATCHED_COMPONENTS=$(echo "$PATCHED_COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true) +# if [[ $PATCHED_COMPONENTS ]]; then +# echo "::group::install phpunit" +# ./phpunit install +# echo "::endgroup::" +# echo "$PATCHED_COMPONENTS" | parallel -j +3 "_run_tests {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 +# fi +# fi + +# [[ ! $X ]] || (exit 1) + +# - name: Run TTY tests +# if: "! matrix.mode" +# run: | +# script -e -c './phpunit --group tty' /dev/null + +# - name: Run tests with SIGCHLD enabled PHP +# if: "matrix.php == '8.2' && ! matrix.mode" +# run: | +# mkdir build +# cd build +# wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-pcntl-sigchild.tar.bz2 +# tar -xjf php-8.2.0-pcntl-sigchild.tar.bz2 +# cd .. + +# mkdir -p /opt/php/lib +# echo memory_limit=-1 > /opt/php/lib/php.ini +# ./phpunit install +# ./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process +# env: +# SYMFONY_PHPUNIT_VERSION: '9.6' + +# - name: Run PhpUnitBridge tests with PHPUnit 9.6 +# if: '! matrix.mode' +# run: | +# ./phpunit src/Symfony/Bridge/PhpUnit +# env: +# SYMFONY_PHPUNIT_VERSION: '9.6' + + windows: + name: Windows + + defaults: + run: + shell: cmd + + runs-on: windows-2022 env: - extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay - - strategy: - matrix: - include: - - php: '8.2' - - php: '8.2' - mode: high-deps - - php: '8.2' - mode: low-deps - - php: '8.3' - - php: '8.4' - #mode: experimental - fail-fast: false - - runs-on: ubuntu-20.04 + PATH: 'c:\php;%PATH%' + COMPOSER_NO_INTERACTION: '1' + SYMFONY_DEPRECATIONS_HELPER: 'strict' + ANSICON: '121x90 (121x90)' + SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE: '1' steps: - name: Checkout @@ -45,13 +273,44 @@ jobs: fetch-depth: 2 - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - coverage: "none" - ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1 - php-version: "${{ matrix.php }}" - extensions: "${{ matrix.extensions || env.extensions }}" - tools: flex + shell: pwsh + run: | + mkdir c:\php && cd c:\php + iwr -outf php-8.2.0-Win32-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-Win32-vs16-x86.zip + 7z x php-8.2.0-Win32-vs16-x86.zip -y >nul + cd ext + iwr -outf php_apcu-5.1.22-8.2-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.22-8.2-ts-vs16-x86.zip + 7z x php_apcu-5.1.22-8.2-ts-vs16-x86.zip -y >nul + iwr -outf php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip + 7z x php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip -y >nul + cd .. + copy /Y php.ini-development php.ini-min + echo memory_limit=-1 >> php.ini-min + echo serialize_precision=-1 >> php.ini-min + echo max_execution_time=1200 >> php.ini-min + echo post_max_size=2047M >> php.ini-min + echo upload_max_filesize=2047M >> php.ini-min + echo date.timezone="America/Los_Angeles" >> php.ini-min + echo extension_dir=ext >> php.ini-min + echo extension=php_xsl.dll >> php.ini-min + echo extension=php_mbstring.dll >> php.ini-min + copy /Y php.ini-min php.ini-max + echo zend_extension=php_opcache.dll >> php.ini-max + echo opcache.enable_cli=1 >> php.ini-max + echo extension=php_openssl.dll >> php.ini-max + echo extension=php_apcu.dll >> php.ini-max + echo extension=php_igbinary.dll >> php.ini-max + echo extension=php_redis.dll >> php.ini-max + echo apc.enable_cli=1 >> php.ini-max + echo extension=php_intl.dll >> php.ini-max + echo extension=php_fileinfo.dll >> php.ini-max + echo extension=php_pdo_sqlite.dll >> php.ini-max + echo extension=php_curl.dll >> php.ini-max + echo extension=php_sodium.dll >> php.ini-max + copy /Y php.ini-max php.ini + cd c:\projects\symfony + iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar + mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json - name: Configure environment run: | @@ -60,192 +319,36 @@ jobs: git config --global init.defaultBranch main git config --global advice.detachedHead false - (php --ri relay 2>&1 > /dev/null) || sudo rm -f /etc/php/*/cli/conf.d/20-relay.ini - - COMPOSER_HOME="$(composer config home)" - ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" - - echo COLUMNS=120 >> $GITHUB_ENV - echo PHPUNIT="$(pwd)/phpunit --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group integration" >> $GITHUB_ENV - echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" != low-deps ]] && 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) - SYMFONY_FEATURE_BRANCH=$(curl -s https://raw.githubusercontent.com/symfony/recipes/flex/main/index.json | jq -r '.versions."dev-name"') - - # Install the phpunit-bridge from a PR if required - # - # To run a PR with a patched phpunit-bridge, first submit the patch for the - # phpunit-bridge as a separate PR against the next feature-branch then - # uncomment and update the following line with that PR number - #SYMFONY_PHPUNIT_BRIDGE_PR=32886 - - if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then - git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head - git rm -rq src/Symfony/Bridge/PhpUnit - git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit - SYMFONY_PHPUNIT_BRIDGE_REF=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref) - sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_PHPUNIT_BRIDGE_REF'.x@dev"/' composer.json - rm -rf .phpunit - fi - - # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components - if [[ ! "${{ matrix.mode }}" = *-deps ]]; then - php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit - else - echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV - cp composer.json composer.json.orig - echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json - php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin) - mv composer.json composer.json.phpunit - mv composer.json.orig composer.json - fi - if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then - git rm -fq -- src/Symfony/Bridge/PhpUnit/composer.json - git diff --staged -- src/Symfony/Bridge/PhpUnit/ | git apply -R --index - fi - - # For the highest branch, in high-deps mode, the version before it is checked out and tested with the locally patched components - if [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then - echo FLIP='^' >> $GITHUB_ENV - SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//) - git fetch --depth=2 origin $SYMFONY_VERSION - git checkout -m FETCH_HEAD - echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h ') >> $GITHUB_ENV - fi - - # Skip the phpunit-bridge on bugfix-branches when not in *-deps mode - if [[ ! "${{ matrix.mode }}" = *-deps && $SYMFONY_VERSION != $SYMFONY_FEATURE_BRANCH ]]; then - echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' | xargs -I{} dirname {}) >> $GITHUB_ENV - else - echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist | xargs -I{} dirname {}) >> $GITHUB_ENV - fi - - # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one - [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true - - 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 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV - [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true - - if [[ "${{ matrix.mode }}" = low-deps ]]; then - echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:'^4.18|^5.0'" >> $GITHUB_ENV - fi + FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) + php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit + SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev - name: Install dependencies run: | echo "::group::composer update" - $COMPOSER_UP + php composer.phar update --no-progress --ansi echo "::endgroup::" echo "::group::install phpunit" - ./phpunit install + php phpunit install echo "::endgroup::" - - name: Patch return types - if: "matrix.php == '8.2' && ! matrix.mode" - run: | - patch -sp1 < .github/expected-missing-return-types.diff - git add . - composer install -q --optimize-autoloader || composer install --optimize-autoloader - SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php - git checkout src/Symfony/Contracts/Service/ResetInterface.php - SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent - git checkout src/Symfony/Contracts/Service/ResetInterface.php - git diff --exit-code - - - name: Check return types - if: "matrix.php == '8.2' && ! matrix.mode" - run: | - php .github/patch-types.php lint + echo "::group::install memurai-developer" + choco install memurai-developer + echo "::endgroup::" - name: Run tests run: | - _run_tests() { - local ok=0 - local title="$1$FLIP" - local start=$(date -u +%s) - OUTPUT=$(bash -xc "$2" 2>&1) || ok=$? - local end=$(date -u +%s) - - if [[ $ok -ne 0 ]]; then - printf "\n%-70s%10s\n" $title $(($end-$start))s - echo "$OUTPUT" - echo "Job exited with: $ok" - echo -e "\n::error::KO $title\\n" - else - printf "::group::%-68s%10s\n" $title $(($end-$start))s - echo "$OUTPUT" - echo -e "\n\\e[32mOK\\e[0m $title\\n\\n::endgroup::" - fi - - [[ "${{ matrix.mode }}" = experimental ]] || (exit $ok) - } - export -f _run_tests - - if [[ ! "${{ matrix.mode }}" = *-deps ]]; then - echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} '$PHPUNIT {}'" - - exit 0 - fi - - if [[ "${{ matrix.mode }}" = low-deps ]]; then - echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT'" - - exit 0 - fi - - # matrix.mode = high-deps - echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 - - # get a list of the patched components (relies on .github/build-packages.php being called in the previous step) - PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true) - - # 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" - export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev - export SYMFONY_REQUIRE=">=$SYMFONY_VERSION" - git fetch --depth=2 origin $SYMFONY_VERSION - git checkout -m FETCH_HEAD - PATCHED_COMPONENTS=$(echo "$PATCHED_COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true) - if [[ $PATCHED_COMPONENTS ]]; then - echo "::group::install phpunit" - ./phpunit install - echo "::endgroup::" - echo "$PATCHED_COMPONENTS" | parallel -j +3 "_run_tests {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 - fi - fi - - [[ ! $X ]] || (exit 1) - - - name: Run TTY tests - if: "! matrix.mode" - run: | - script -e -c './phpunit --group tty' /dev/null - - - name: Run tests with SIGCHLD enabled PHP - if: "matrix.php == '8.2' && ! matrix.mode" - run: | - mkdir build - cd build - wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-pcntl-sigchild.tar.bz2 - tar -xjf php-8.2.0-pcntl-sigchild.tar.bz2 - cd .. - - mkdir -p /opt/php/lib - echo memory_limit=-1 > /opt/php/lib/php.ini - ./phpunit install - ./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process - env: - SYMFONY_PHPUNIT_VERSION: '9.6' - - - name: Run PhpUnitBridge tests with PHPUnit 9.6 - if: '! matrix.mode' - run: | - ./phpunit src/Symfony/Bridge/PhpUnit + SET X=0 + SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped + copy /Y c:\php\php.ini-min c:\php\php.ini + IF %BRANCH_NAME:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) + mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! + php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! + copy /Y c:\php\php.ini-max c:\php\php.ini + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! + php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! + exit %X% env: - SYMFONY_PHPUNIT_VERSION: '9.6' + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} From 1b9c57cc0fbb1b81d504cf8b7562421bdb1b8fb9 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:08:46 +0100 Subject: [PATCH 04/32] Fix PATH? --- .github/workflows/unit-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1883a4d574b13..9ff275ce51139 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -260,7 +260,6 @@ jobs: runs-on: windows-2022 env: - PATH: 'c:\php;%PATH%' COMPOSER_NO_INTERACTION: '1' SYMFONY_DEPRECATIONS_HELPER: 'strict' ANSICON: '121x90 (121x90)' @@ -275,6 +274,7 @@ jobs: - name: Setup PHP shell: pwsh run: | + $env:Path = 'c:\php;' + $env:Path mkdir c:\php && cd c:\php iwr -outf php-8.2.0-Win32-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-Win32-vs16-x86.zip 7z x php-8.2.0-Win32-vs16-x86.zip -y >nul @@ -325,6 +325,7 @@ jobs: - name: Install dependencies run: | + SET PATH=c:\php;%PATH% echo "::group::composer update" php composer.phar update --no-progress --ansi echo "::endgroup::" @@ -339,6 +340,7 @@ jobs: - name: Run tests run: | + SET PATH=c:\php;%PATH% SET X=0 SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped copy /Y c:\php\php.ini-min c:\php\php.ini @@ -351,4 +353,4 @@ jobs: php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! exit %X% env: - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} From 0a50b14b9c4f31dbe79e5ba6ae78497a8033f63c Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:16:24 +0100 Subject: [PATCH 05/32] Transform more syntax to powershell --- .github/workflows/unit-tests.yml | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 9ff275ce51139..dff56cdd65c16 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -284,30 +284,30 @@ jobs: iwr -outf php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip 7z x php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip -y >nul cd .. - copy /Y php.ini-development php.ini-min - echo memory_limit=-1 >> php.ini-min - echo serialize_precision=-1 >> php.ini-min - echo max_execution_time=1200 >> php.ini-min - echo post_max_size=2047M >> php.ini-min - echo upload_max_filesize=2047M >> php.ini-min - echo date.timezone="America/Los_Angeles" >> php.ini-min - echo extension_dir=ext >> php.ini-min - echo extension=php_xsl.dll >> php.ini-min - echo extension=php_mbstring.dll >> php.ini-min - copy /Y php.ini-min php.ini-max - echo zend_extension=php_opcache.dll >> php.ini-max - echo opcache.enable_cli=1 >> php.ini-max - echo extension=php_openssl.dll >> php.ini-max - echo extension=php_apcu.dll >> php.ini-max - echo extension=php_igbinary.dll >> php.ini-max - echo extension=php_redis.dll >> php.ini-max - echo apc.enable_cli=1 >> php.ini-max - echo extension=php_intl.dll >> php.ini-max - echo extension=php_fileinfo.dll >> php.ini-max - echo extension=php_pdo_sqlite.dll >> php.ini-max - echo extension=php_curl.dll >> php.ini-max - echo extension=php_sodium.dll >> php.ini-max - copy /Y php.ini-max php.ini + Copy php.ini-development php.ini-min + "memory_limit=-1" >> php.ini-min + "serialize_precision=-1" >> php.ini-min + "max_execution_time=1200" >> php.ini-min + "post_max_size=2047M" >> php.ini-min + "upload_max_filesize=2047M" >> php.ini-min + "date.timezone=`"America/Los_Angeles`"" >> php.ini-min + "extension_dir=ext" >> php.ini-min + "extension=php_xsl.dll" >> php.ini-min + "extension=php_mbstring.dll" >> php.ini-min + Copy php.ini-min php.ini-max + "zend_extension=php_opcache.dll" >> php.ini-max + "opcache.enable_cli=1" >> php.ini-max + "extension=php_openssl.dll" >> php.ini-max + "extension=php_apcu.dll" >> php.ini-max + "extension=php_igbinary.dll" >> php.ini-max + "extension=php_redis.dll" >> php.ini-max + "apc.enable_cli=1" >> php.ini-max + "extension=php_intl.dll" >> php.ini-max + "extension=php_fileinfo.dll" >> php.ini-max + "extension=php_pdo_sqlite.dll" >> php.ini-max + "extension=php_curl.dll" >> php.ini-max + "extension=php_sodium.dll" >> php.ini-max + Copy php.ini-max php.ini cd c:\projects\symfony iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json From 925bb7ffa0bf30e6eefd9eb060f86309015d388b Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:20:18 +0100 Subject: [PATCH 06/32] Fix project directory --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index dff56cdd65c16..5c64f4c7598c3 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -308,7 +308,7 @@ jobs: "extension=php_curl.dll" >> php.ini-max "extension=php_sodium.dll" >> php.ini-max Copy php.ini-max php.ini - cd c:\projects\symfony + cd D:\a\symfony\symfony iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json From c96184c3baa1d71fcf8351501f601efe33ce88a7 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:21:38 +0100 Subject: [PATCH 07/32] Fix more copy powershell commands --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 5c64f4c7598c3..b2e6eb989d81d 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -310,7 +310,7 @@ jobs: Copy php.ini-max php.ini cd D:\a\symfony\symfony iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar - mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json + mkdir %APPDATA%\Composer && Copy .github\composer-config.json %APPDATA%\Composer\config.json - name: Configure environment run: | From 49a23092230612c8eaddc0679d054d705d667b83 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:24:56 +0100 Subject: [PATCH 08/32] Disable unrelated tests --- .appveyor.yml => .appveyor.yml.disabled | 0 .github/workflows/integration-tests.yml | 6 +++--- .github/workflows/package-tests.yml | 8 ++++---- .github/workflows/psalm.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename .appveyor.yml => .appveyor.yml.disabled (100%) diff --git a/.appveyor.yml b/.appveyor.yml.disabled similarity index 100% rename from .appveyor.yml rename to .appveyor.yml.disabled diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 314f39e18f717..35eb8583909c2 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1,8 +1,8 @@ name: Integration -on: - push: - pull_request: +#on: +# push: +# pull_request: defaults: run: diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index bc6f8eec683c7..829ee3ec77a1e 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -1,9 +1,9 @@ name: Verify Packages -on: - pull_request: - paths: - - src/** +#on: +# pull_request: +# paths: +# - src/** permissions: contents: read diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index a165d0c7dc126..8a6d1a35b9a3a 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -1,7 +1,7 @@ name: Psalm -on: - pull_request: ~ +#on: +# pull_request: ~ defaults: run: From d95cc5be79d9007a800f5b87043491ce96055bb2 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 28 Oct 2024 23:30:42 +0100 Subject: [PATCH 09/32] Show SYMFONY_VERSION --- .github/workflows/unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b2e6eb989d81d..07efc56834ce3 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -322,6 +322,7 @@ jobs: FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev + echo %SYMFONY_VERSION% - name: Install dependencies run: | From d615a110904c0db3f0af1284ddf2532f218f3886 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:16:59 +0100 Subject: [PATCH 10/32] Show SYMFONY_VERSION in install job --- .github/workflows/unit-tests.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 07efc56834ce3..b4d7f835a1d74 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -322,22 +322,15 @@ jobs: FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev - echo %SYMFONY_VERSION% - name: Install dependencies run: | + echo %SYMFONY_VERSION% + echo %COMPOSER_ROOT_VERSION% SET PATH=c:\php;%PATH% - echo "::group::composer update" php composer.phar update --no-progress --ansi - echo "::endgroup::" - - echo "::group::install phpunit" php phpunit install - echo "::endgroup::" - - echo "::group::install memurai-developer" choco install memurai-developer - echo "::endgroup::" - name: Run tests run: | From aa4b7c0ca0012213496476fff562495b121a6097 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:22:01 +0100 Subject: [PATCH 11/32] Export variables between steps --- .github/workflows/unit-tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b4d7f835a1d74..23d77050694fd 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -321,12 +321,11 @@ jobs: FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev + echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV + echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV - name: Install dependencies run: | - echo %SYMFONY_VERSION% - echo %COMPOSER_ROOT_VERSION% SET PATH=c:\php;%PATH% php composer.phar update --no-progress --ansi php phpunit install From f523077fded004d77b40dfae00d934ecdf1a34cd Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:35:15 +0100 Subject: [PATCH 12/32] Use powershell for everything --- .github/workflows/unit-tests.yml | 34 +++++++++++++++++++------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 23d77050694fd..89513cc3db99c 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -255,7 +255,7 @@ jobs: defaults: run: - shell: cmd + shell: pwsh runs-on: windows-2022 @@ -272,7 +272,6 @@ jobs: fetch-depth: 2 - name: Setup PHP - shell: pwsh run: | $env:Path = 'c:\php;' + $env:Path mkdir c:\php && cd c:\php @@ -313,7 +312,9 @@ jobs: mkdir %APPDATA%\Composer && Copy .github\composer-config.json %APPDATA%\Composer\config.json - name: Configure environment + shell: cmd # todo: rewrite the parsing of Symfony version to powershell run: | + $env:Path = 'c:\php;' + $env:Path git config --global user.email "" git config --global user.name "Symfony" git config --global init.defaultBranch main @@ -326,24 +327,29 @@ jobs: - name: Install dependencies run: | - SET PATH=c:\php;%PATH% + $env:Path = 'c:\php;' + $env:Path php composer.phar update --no-progress --ansi php phpunit install choco install memurai-developer - name: Run tests run: | - SET PATH=c:\php;%PATH% - SET X=0 - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped - copy /Y c:\php\php.ini-min c:\php\php.ini - IF %BRANCH_NAME:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) + $env:Path = 'c:\php;' + $env:Path + $env:X = 0 + $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' + + if ($env:BRANCH_NAME -match '.x') { rm -Rf src\Symfony\Bridge\PhpUnit } + + # minimal extensions + Copy c:\php\php.ini-min c:\php\php.ini mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! - copy /Y c:\php\php.ini-max c:\php\php.ini - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! - exit %X% + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $env:X = $LASTEXITCODE + php phpunit src\Symfony\Component\HttpClient || $env:X = $LASTEXITCODE + + # all extensions + Copy c:\php\php.ini-max c:\php\php.ini + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $env:X = $LASTEXITCODE + php phpunit src\Symfony\Component\HttpClient || $env:X = $LASTEXITCODE + exit $X env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} From 1286f3cdd3d1a92075c15d50da85c780635b58d9 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:39:35 +0100 Subject: [PATCH 13/32] Debug --- .github/workflows/unit-tests.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 89513cc3db99c..377aa481070b7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -327,10 +327,21 @@ jobs: - name: Install dependencies run: | + $env:SYMFONY_VERSION >> $env:GITHUB_OUTPUT + $env:COMPOSER_ROOT_VERSION >> $env:GITHUB_OUTPUT + $env:Path = 'c:\php;' + $env:Path + "::group::composer update" >> $env:GITHUB_OUTPUT php composer.phar update --no-progress --ansi + "::endgroup::" >> $env:GITHUB_OUTPUT + + "::group::phpunit install" >> $env:GITHUB_OUTPUT php phpunit install + "::endgroup::" >> $env:GITHUB_OUTPUT + + "::group::memurai-developer install" >> $env:GITHUB_OUTPUT choco install memurai-developer + "::endgroup::" >> $env:GITHUB_OUTPUT - name: Run tests run: | From 5edb6654d3b19d1298ede1ca04ae4c724baa2cfb Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:42:16 +0100 Subject: [PATCH 14/32] - --- .github/workflows/unit-tests.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 377aa481070b7..dc84e2b92f6ab 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -314,7 +314,7 @@ jobs: - name: Configure environment shell: cmd # todo: rewrite the parsing of Symfony version to powershell run: | - $env:Path = 'c:\php;' + $env:Path + SET PATH=c:\php;%PATH% git config --global user.email "" git config --global user.name "Symfony" git config --global init.defaultBranch main @@ -327,21 +327,21 @@ jobs: - name: Install dependencies run: | - $env:SYMFONY_VERSION >> $env:GITHUB_OUTPUT - $env:COMPOSER_ROOT_VERSION >> $env:GITHUB_OUTPUT + echo $env:SYMFONY_VERSION >> $env:GITHUB_OUTPUT + echo $env:COMPOSER_ROOT_VERSION >> $env:GITHUB_OUTPUT $env:Path = 'c:\php;' + $env:Path - "::group::composer update" >> $env:GITHUB_OUTPUT + echo "::group::composer update" >> $env:GITHUB_OUTPUT php composer.phar update --no-progress --ansi - "::endgroup::" >> $env:GITHUB_OUTPUT + echo "::endgroup::" >> $env:GITHUB_OUTPUT - "::group::phpunit install" >> $env:GITHUB_OUTPUT + echo "::group::phpunit install" >> $env:GITHUB_OUTPUT php phpunit install - "::endgroup::" >> $env:GITHUB_OUTPUT + echo "::endgroup::" >> $env:GITHUB_OUTPUT - "::group::memurai-developer install" >> $env:GITHUB_OUTPUT + echo "::group::memurai-developer install" >> $env:GITHUB_OUTPUT choco install memurai-developer - "::endgroup::" >> $env:GITHUB_OUTPUT + echo "::endgroup::" >> $env:GITHUB_OUTPUT - name: Run tests run: | From 6447528ecc2d2696d9d08049249de14dfb3506af Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:44:29 +0100 Subject: [PATCH 15/32] - --- .github/workflows/unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index dc84e2b92f6ab..6a82ac551f58f 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -327,8 +327,7 @@ jobs: - name: Install dependencies run: | - echo $env:SYMFONY_VERSION >> $env:GITHUB_OUTPUT - echo $env:COMPOSER_ROOT_VERSION >> $env:GITHUB_OUTPUT + php -r 'var_dump($_SERVER);' $env:Path = 'c:\php;' + $env:Path echo "::group::composer update" >> $env:GITHUB_OUTPUT From 07c625ed672e43a9ce41fdaa32a2f75fe6106538 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:44:42 +0100 Subject: [PATCH 16/32] - --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6a82ac551f58f..d30f52cc18a78 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -327,9 +327,9 @@ jobs: - name: Install dependencies run: | + $env:Path = 'c:\php;' + $env:Path php -r 'var_dump($_SERVER);' - $env:Path = 'c:\php;' + $env:Path echo "::group::composer update" >> $env:GITHUB_OUTPUT php composer.phar update --no-progress --ansi echo "::endgroup::" >> $env:GITHUB_OUTPUT From 519775dd793942d4e015fd872a1a84d07a8c7c6e Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 22:59:48 +0100 Subject: [PATCH 17/32] - --- .github/workflows/unit-tests.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d30f52cc18a78..6b3d1034bdf1c 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -312,18 +312,19 @@ jobs: mkdir %APPDATA%\Composer && Copy .github\composer-config.json %APPDATA%\Composer\config.json - name: Configure environment - shell: cmd # todo: rewrite the parsing of Symfony version to powershell run: | - SET PATH=c:\php;%PATH% + $env:Path = 'c:\php;' + $env:Path git config --global user.email "" git config --global user.name "Symfony" git config --global init.defaultBranch main git config --global advice.detachedHead false - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) + + $env:SYMFONY_VERSION = ((Select-String -Path src\Symfony\Component\HttpKernel\Kernel.php -Raw -Pattern ' VERSION = ' | Select-String -Pattern '[0-9][0-9]*\.[0-9]')[0].Matches.Value) + echo $env:$SYMFONY_VERSION php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit - echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV - echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV + echo "SYMFONY_VERSION=" + $env:SYMFONY_VERSION >> $env:GITHUB_ENV + echo "COMPOSER_ROOT_VERSION=" + $env:SYMFONY_VERSION.x-dev >> $env:GITHUB_ENV - name: Install dependencies run: | From 0d911220f905ea0c69ad741386dd11091ea385f3 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 23:00:57 +0100 Subject: [PATCH 18/32] - --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6b3d1034bdf1c..55d6465335cb9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -321,7 +321,7 @@ jobs: $env:SYMFONY_VERSION = ((Select-String -Path src\Symfony\Component\HttpKernel\Kernel.php -Raw -Pattern ' VERSION = ' | Select-String -Pattern '[0-9][0-9]*\.[0-9]')[0].Matches.Value) - echo $env:$SYMFONY_VERSION + echo $env:SYMFONY_VERSION php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit echo "SYMFONY_VERSION=" + $env:SYMFONY_VERSION >> $env:GITHUB_ENV echo "COMPOSER_ROOT_VERSION=" + $env:SYMFONY_VERSION.x-dev >> $env:GITHUB_ENV From 22f8a5f2f3debc26c2a47ec5d8779b888e1cde21 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 23:03:05 +0100 Subject: [PATCH 19/32] - --- .github/workflows/unit-tests.yml | 33 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 55d6465335cb9..421b88bbc2432 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -311,37 +311,28 @@ jobs: iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar mkdir %APPDATA%\Composer && Copy .github\composer-config.json %APPDATA%\Composer\config.json - - name: Configure environment + - name: Install dependencies + shell: cmd run: | - $env:Path = 'c:\php;' + $env:Path + SET PATH=c:\php;%PATH% + mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json git config --global user.email "" git config --global user.name "Symfony" - git config --global init.defaultBranch main - git config --global advice.detachedHead false - - - $env:SYMFONY_VERSION = ((Select-String -Path src\Symfony\Component\HttpKernel\Kernel.php -Raw -Pattern ' VERSION = ' | Select-String -Pattern '[0-9][0-9]*\.[0-9]')[0].Matches.Value) - echo $env:SYMFONY_VERSION + FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit - echo "SYMFONY_VERSION=" + $env:SYMFONY_VERSION >> $env:GITHUB_ENV - echo "COMPOSER_ROOT_VERSION=" + $env:SYMFONY_VERSION.x-dev >> $env:GITHUB_ENV - - - name: Install dependencies - run: | - $env:Path = 'c:\php;' + $env:Path - php -r 'var_dump($_SERVER);' + SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev - echo "::group::composer update" >> $env:GITHUB_OUTPUT + echo "::group::composer update" php composer.phar update --no-progress --ansi - echo "::endgroup::" >> $env:GITHUB_OUTPUT + echo "::endgroup::" - echo "::group::phpunit install" >> $env:GITHUB_OUTPUT + echo "::group::phpunit install" php phpunit install - echo "::endgroup::" >> $env:GITHUB_OUTPUT + echo "::endgroup::" - echo "::group::memurai-developer install" >> $env:GITHUB_OUTPUT + echo "::group::memurai-developer install" choco install memurai-developer - echo "::endgroup::" >> $env:GITHUB_OUTPUT + echo "::endgroup::" - name: Run tests run: | From 978ca68e16acf3efc823f6e9079f7065768da4e9 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 23:06:09 +0100 Subject: [PATCH 20/32] - --- .github/workflows/unit-tests.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 421b88bbc2432..c068c81e323b1 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -322,17 +322,17 @@ jobs: php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev - echo "::group::composer update" + echo ::group::composer update php composer.phar update --no-progress --ansi - echo "::endgroup::" + echo ::endgroup:: - echo "::group::phpunit install" + echo ::group::phpunit install php phpunit install - echo "::endgroup::" + echo ::endgroup:: - echo "::group::memurai-developer install" + echo ::group::memurai-developer install choco install memurai-developer - echo "::endgroup::" + echo ::endgroup:: - name: Run tests run: | @@ -340,18 +340,15 @@ jobs: $env:X = 0 $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' - if ($env:BRANCH_NAME -match '.x') { rm -Rf src\Symfony\Bridge\PhpUnit } - # minimal extensions Copy c:\php\php.ini-min c:\php\php.ini mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $env:X = $LASTEXITCODE - php phpunit src\Symfony\Component\HttpClient || $env:X = $LASTEXITCODE + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows + php phpunit src\Symfony\Component\HttpClient # all extensions Copy c:\php\php.ini-max c:\php\php.ini - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $env:X = $LASTEXITCODE - php phpunit src\Symfony\Component\HttpClient || $env:X = $LASTEXITCODE - exit $X + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows + php phpunit src\Symfony\Component\HttpClient env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} From 7a518eb8f8b358c5f01c20172434b82788f00847 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 23:18:52 +0100 Subject: [PATCH 21/32] - --- .github/workflows/unit-tests.yml | 48 ++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index c068c81e323b1..635376cb30b6b 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -254,8 +254,7 @@ jobs: name: Windows defaults: - run: - shell: pwsh + run: cmd runs-on: windows-2022 @@ -272,6 +271,7 @@ jobs: fetch-depth: 2 - name: Setup PHP + shell: pwsh run: | $env:Path = 'c:\php;' + $env:Path mkdir c:\php && cd c:\php @@ -312,7 +312,6 @@ jobs: mkdir %APPDATA%\Composer && Copy .github\composer-config.json %APPDATA%\Composer\config.json - name: Install dependencies - shell: cmd run: | SET PATH=c:\php;%PATH% mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json @@ -334,21 +333,34 @@ jobs: choco install memurai-developer echo ::endgroup:: +# - name: Run tests +# run: | +# $env:Path = 'c:\php;' + $env:Path +# $env:X = 0 +# $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' + +# # minimal extensions +# Copy c:\php\php.ini-min c:\php\php.ini +# mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml +# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows +# php phpunit src\Symfony\Component\HttpClient + +# # all extensions +# Copy c:\php\php.ini-max c:\php\php.ini +# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows +# php phpunit src\Symfony\Component\HttpClient + - name: Run tests run: | - $env:Path = 'c:\php;' + $env:Path - $env:X = 0 - $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' - - # minimal extensions - Copy c:\php\php.ini-min c:\php\php.ini + SET PATH=c:\php;%PATH% + SET X=0 + SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped + copy /Y c:\php\php.ini-min c:\php\php.ini + IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows - php phpunit src\Symfony\Component\HttpClient - - # all extensions - Copy c:\php\php.ini-max c:\php\php.ini - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows - php phpunit src\Symfony\Component\HttpClient - env: - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! + php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! + copy /Y c:\php\php.ini-max c:\php\php.ini + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! + php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! + exit %X% From 1fbd61b5abee55c8438b386231fe632af938389b Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Tue, 29 Oct 2024 23:20:07 +0100 Subject: [PATCH 22/32] - --- .github/workflows/unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 635376cb30b6b..a2e9dae24e993 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -254,7 +254,8 @@ jobs: name: Windows defaults: - run: cmd + run: + shell: cmd runs-on: windows-2022 From 75cdb03397f9c037443ded2a9e4185ca77d10034 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 10:28:23 +0100 Subject: [PATCH 23/32] - --- .github/workflows/unit-tests.yml | 62 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a2e9dae24e993..d51653920d6d0 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -331,37 +331,41 @@ jobs: echo ::endgroup:: echo ::group::memurai-developer install - choco install memurai-developer + choco install --no-progress memurai-developer echo ::endgroup:: -# - name: Run tests -# run: | -# $env:Path = 'c:\php;' + $env:Path -# $env:X = 0 -# $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' - -# # minimal extensions -# Copy c:\php\php.ini-min c:\php\php.ini -# mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml -# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -# php phpunit src\Symfony\Component\HttpClient - -# # all extensions -# Copy c:\php\php.ini-max c:\php\php.ini -# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -# php phpunit src\Symfony\Component\HttpClient - - name: Run tests run: | - SET PATH=c:\php;%PATH% - SET X=0 - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped - copy /Y c:\php\php.ini-min c:\php\php.ini - IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) + $env:Path = 'c:\php;' + $env:Path + $env:X = 0 + $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' + + # minimal extensions + Copy c:\php\php.ini-min c:\php\php.ini mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! - copy /Y c:\php\php.ini-max c:\php\php.ini - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! - exit %X% + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows + php phpunit src\Symfony\Component\HttpClient + + # all extensions + Copy c:\php\php.ini-max c:\php\php.ini + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows + php phpunit src\Symfony\Component\HttpClient + + if ($Error.Count) { + throw "Test failures" + } + +# - name: Run tests +# run: | +# SET PATH=c:\php;%PATH% +# SET X=0 +# SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped +# copy /Y c:\php\php.ini-min c:\php\php.ini +# IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) +# mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml +# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! +# php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! +# copy /Y c:\php\php.ini-max c:\php\php.ini +# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! +# php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! +# exit %X% From 6dc12b1c6b6256c018acee66ce0cde9046306ab9 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 11:26:25 +0100 Subject: [PATCH 24/32] - --- .github/workflows/unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d51653920d6d0..e03273c9aa048 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -337,7 +337,6 @@ jobs: - name: Run tests run: | $env:Path = 'c:\php;' + $env:Path - $env:X = 0 $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' # minimal extensions @@ -351,7 +350,7 @@ jobs: php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows php phpunit src\Symfony\Component\HttpClient - if ($Error.Count) { + if ($Error) { throw "Test failures" } From 0561673a22368c2f9a614558d12b5de473e749ab Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 11:47:25 +0100 Subject: [PATCH 25/32] - --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index e03273c9aa048..26ad2bacc16dd 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -351,7 +351,7 @@ jobs: php phpunit src\Symfony\Component\HttpClient if ($Error) { - throw "Test failures" + throw } # - name: Run tests From 6c64b0c32ad922a6726c18de3f6dcfdd2c550981 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 15:28:53 +0100 Subject: [PATCH 26/32] - --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 26ad2bacc16dd..5d9b80a630ada 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -350,7 +350,7 @@ jobs: php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows php phpunit src\Symfony\Component\HttpClient - if ($Error) { + if ($Error.Count) { throw } From ee51c032ecb712f5124a797f28a759bde88d8306 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 16:09:03 +0100 Subject: [PATCH 27/32] - --- .github/workflows/unit-tests.yml | 515 +++++++++++++++---------------- 1 file changed, 254 insertions(+), 261 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 5d9b80a630ada..895a02393a4ba 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -13,242 +13,244 @@ permissions: jobs: -# linux: -# name: Linux -# -# defaults: -# run: -# shell: bash -# -# env: -# extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay - -# strategy: -# matrix: -# include: -# - php: '8.2' -# - php: '8.2' -# mode: high-deps -# - php: '8.2' -# mode: low-deps -# - php: '8.3' -# - php: '8.4' -# #mode: experimental -# fail-fast: false - -# runs-on: ubuntu-20.04 - -# steps: -# - name: Checkout -# uses: actions/checkout@v4 -# with: -# fetch-depth: 2 - -# - name: Setup PHP -# uses: shivammathur/setup-php@v2 -# with: -# coverage: "none" -# ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1 -# php-version: "${{ matrix.php }}" -# extensions: "${{ matrix.extensions || env.extensions }}" -# tools: flex - -# - name: Configure environment -# run: | -# git config --global user.email "" -# git config --global user.name "Symfony" -# git config --global init.defaultBranch main -# git config --global advice.detachedHead false - -# (php --ri relay 2>&1 > /dev/null) || sudo rm -f /etc/php/*/cli/conf.d/20-relay.ini - -# COMPOSER_HOME="$(composer config home)" -# ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" - -# echo COLUMNS=120 >> $GITHUB_ENV -# echo PHPUNIT="$(pwd)/phpunit --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group integration" >> $GITHUB_ENV -# echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" != low-deps ]] && 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) -# SYMFONY_FEATURE_BRANCH=$(curl -s https://raw.githubusercontent.com/symfony/recipes/flex/main/index.json | jq -r '.versions."dev-name"') - -# # Install the phpunit-bridge from a PR if required -# # -# # To run a PR with a patched phpunit-bridge, first submit the patch for the -# # phpunit-bridge as a separate PR against the next feature-branch then -# # uncomment and update the following line with that PR number -# #SYMFONY_PHPUNIT_BRIDGE_PR=32886 - -# if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then -# git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head -# git rm -rq src/Symfony/Bridge/PhpUnit -# git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit -# SYMFONY_PHPUNIT_BRIDGE_REF=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref) -# sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_PHPUNIT_BRIDGE_REF'.x@dev"/' composer.json -# rm -rf .phpunit -# fi - -# # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components -# if [[ ! "${{ matrix.mode }}" = *-deps ]]; then -# php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit -# else -# echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV -# cp composer.json composer.json.orig -# echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json -# php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin) -# mv composer.json composer.json.phpunit -# mv composer.json.orig composer.json -# fi -# if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then -# git rm -fq -- src/Symfony/Bridge/PhpUnit/composer.json -# git diff --staged -- src/Symfony/Bridge/PhpUnit/ | git apply -R --index -# fi - -# # For the highest branch, in high-deps mode, the version before it is checked out and tested with the locally patched components -# if [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then -# echo FLIP='^' >> $GITHUB_ENV -# SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//) -# git fetch --depth=2 origin $SYMFONY_VERSION -# git checkout -m FETCH_HEAD -# echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h ') >> $GITHUB_ENV -# fi - -# # Skip the phpunit-bridge on bugfix-branches when not in *-deps mode -# if [[ ! "${{ matrix.mode }}" = *-deps && $SYMFONY_VERSION != $SYMFONY_FEATURE_BRANCH ]]; then -# echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' | xargs -I{} dirname {}) >> $GITHUB_ENV -# else -# echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist | xargs -I{} dirname {}) >> $GITHUB_ENV -# fi - -# # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one -# [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true - -# 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 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV -# [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true - -# if [[ "${{ matrix.mode }}" = low-deps ]]; then -# echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:'^4.18|^5.0'" >> $GITHUB_ENV -# fi - -# - name: Install dependencies -# run: | -# echo "::group::composer update" -# $COMPOSER_UP -# echo "::endgroup::" - -# echo "::group::install phpunit" -# ./phpunit install -# echo "::endgroup::" - -# - name: Patch return types -# if: "matrix.php == '8.2' && ! matrix.mode" -# run: | -# patch -sp1 < .github/expected-missing-return-types.diff -# git add . -# composer install -q --optimize-autoloader || composer install --optimize-autoloader -# SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php -# git checkout src/Symfony/Contracts/Service/ResetInterface.php -# SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent -# git checkout src/Symfony/Contracts/Service/ResetInterface.php -# git diff --exit-code - -# - name: Check return types -# if: "matrix.php == '8.2' && ! matrix.mode" -# run: | -# php .github/patch-types.php lint - -# - name: Run tests -# run: | -# _run_tests() { -# local ok=0 -# local title="$1$FLIP" -# local start=$(date -u +%s) -# OUTPUT=$(bash -xc "$2" 2>&1) || ok=$? -# local end=$(date -u +%s) - -# if [[ $ok -ne 0 ]]; then -# printf "\n%-70s%10s\n" $title $(($end-$start))s -# echo "$OUTPUT" -# echo "Job exited with: $ok" -# echo -e "\n::error::KO $title\\n" -# else -# printf "::group::%-68s%10s\n" $title $(($end-$start))s -# echo "$OUTPUT" -# echo -e "\n\\e[32mOK\\e[0m $title\\n\\n::endgroup::" -# fi - -# [[ "${{ matrix.mode }}" = experimental ]] || (exit $ok) -# } -# export -f _run_tests - -# if [[ ! "${{ matrix.mode }}" = *-deps ]]; then -# echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} '$PHPUNIT {}'" - -# exit 0 -# fi - -# if [[ "${{ matrix.mode }}" = low-deps ]]; then -# echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT'" - -# exit 0 -# fi - -# # matrix.mode = high-deps -# echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 - -# # get a list of the patched components (relies on .github/build-packages.php being called in the previous step) -# PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true) - -# # 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" -# export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev -# export SYMFONY_REQUIRE=">=$SYMFONY_VERSION" -# git fetch --depth=2 origin $SYMFONY_VERSION -# git checkout -m FETCH_HEAD -# PATCHED_COMPONENTS=$(echo "$PATCHED_COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true) -# if [[ $PATCHED_COMPONENTS ]]; then -# echo "::group::install phpunit" -# ./phpunit install -# echo "::endgroup::" -# echo "$PATCHED_COMPONENTS" | parallel -j +3 "_run_tests {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 -# fi -# fi - -# [[ ! $X ]] || (exit 1) - -# - name: Run TTY tests -# if: "! matrix.mode" -# run: | -# script -e -c './phpunit --group tty' /dev/null - -# - name: Run tests with SIGCHLD enabled PHP -# if: "matrix.php == '8.2' && ! matrix.mode" -# run: | -# mkdir build -# cd build -# wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-pcntl-sigchild.tar.bz2 -# tar -xjf php-8.2.0-pcntl-sigchild.tar.bz2 -# cd .. - -# mkdir -p /opt/php/lib -# echo memory_limit=-1 > /opt/php/lib/php.ini -# ./phpunit install -# ./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process -# env: -# SYMFONY_PHPUNIT_VERSION: '9.6' - -# - name: Run PhpUnitBridge tests with PHPUnit 9.6 -# if: '! matrix.mode' -# run: | -# ./phpunit src/Symfony/Bridge/PhpUnit -# env: -# SYMFONY_PHPUNIT_VERSION: '9.6' + linux: + name: Linux + + if: false + + defaults: + run: + shell: bash + + env: + extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay + + strategy: + matrix: + include: + - php: '8.2' + - php: '8.2' + mode: high-deps + - php: '8.2' + mode: low-deps + - php: '8.3' + - php: '8.4' + #mode: experimental + fail-fast: false + + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + coverage: "none" + ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1 + php-version: "${{ matrix.php }}" + extensions: "${{ matrix.extensions || env.extensions }}" + tools: flex + + - name: Configure environment + run: | + git config --global user.email "" + git config --global user.name "Symfony" + git config --global init.defaultBranch main + git config --global advice.detachedHead false + + (php --ri relay 2>&1 > /dev/null) || sudo rm -f /etc/php/*/cli/conf.d/20-relay.ini + + COMPOSER_HOME="$(composer config home)" + ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" + + echo COLUMNS=120 >> $GITHUB_ENV + echo PHPUNIT="$(pwd)/phpunit --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group integration" >> $GITHUB_ENV + echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" != low-deps ]] && 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) + SYMFONY_FEATURE_BRANCH=$(curl -s https://raw.githubusercontent.com/symfony/recipes/flex/main/index.json | jq -r '.versions."dev-name"') + + # Install the phpunit-bridge from a PR if required + # + # To run a PR with a patched phpunit-bridge, first submit the patch for the + # phpunit-bridge as a separate PR against the next feature-branch then + # uncomment and update the following line with that PR number + #SYMFONY_PHPUNIT_BRIDGE_PR=32886 + + if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then + git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head + git rm -rq src/Symfony/Bridge/PhpUnit + git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit + SYMFONY_PHPUNIT_BRIDGE_REF=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref) + sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_PHPUNIT_BRIDGE_REF'.x@dev"/' composer.json + rm -rf .phpunit + fi + + # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components + if [[ ! "${{ matrix.mode }}" = *-deps ]]; then + php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit + else + echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV + cp composer.json composer.json.orig + echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json + php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin) + mv composer.json composer.json.phpunit + mv composer.json.orig composer.json + fi + if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then + git rm -fq -- src/Symfony/Bridge/PhpUnit/composer.json + git diff --staged -- src/Symfony/Bridge/PhpUnit/ | git apply -R --index + fi + + # For the highest branch, in high-deps mode, the version before it is checked out and tested with the locally patched components + if [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then + echo FLIP='^' >> $GITHUB_ENV + SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//) + git fetch --depth=2 origin $SYMFONY_VERSION + git checkout -m FETCH_HEAD + echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h ') >> $GITHUB_ENV + fi + + # Skip the phpunit-bridge on bugfix-branches when not in *-deps mode + if [[ ! "${{ matrix.mode }}" = *-deps && $SYMFONY_VERSION != $SYMFONY_FEATURE_BRANCH ]]; then + echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' | xargs -I{} dirname {}) >> $GITHUB_ENV + else + echo COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist | xargs -I{} dirname {}) >> $GITHUB_ENV + fi + + # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one + [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true + + 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 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV + [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true + + if [[ "${{ matrix.mode }}" = low-deps ]]; then + echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:'^4.18|^5.0'" >> $GITHUB_ENV + fi + + - name: Install dependencies + run: | + echo "::group::composer update" + $COMPOSER_UP + echo "::endgroup::" + + echo "::group::install phpunit" + ./phpunit install + echo "::endgroup::" + + - name: Patch return types + if: "matrix.php == '8.2' && ! matrix.mode" + run: | + patch -sp1 < .github/expected-missing-return-types.diff + git add . + composer install -q --optimize-autoloader || composer install --optimize-autoloader + SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php + git checkout src/Symfony/Contracts/Service/ResetInterface.php + SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent + git checkout src/Symfony/Contracts/Service/ResetInterface.php + git diff --exit-code + + - name: Check return types + if: "matrix.php == '8.2' && ! matrix.mode" + run: | + php .github/patch-types.php lint + + - name: Run tests + run: | + _run_tests() { + local ok=0 + local title="$1$FLIP" + local start=$(date -u +%s) + OUTPUT=$(bash -xc "$2" 2>&1) || ok=$? + local end=$(date -u +%s) + + if [[ $ok -ne 0 ]]; then + printf "\n%-70s%10s\n" $title $(($end-$start))s + echo "$OUTPUT" + echo "Job exited with: $ok" + echo -e "\n::error::KO $title\\n" + else + printf "::group::%-68s%10s\n" $title $(($end-$start))s + echo "$OUTPUT" + echo -e "\n\\e[32mOK\\e[0m $title\\n\\n::endgroup::" + fi + + [[ "${{ matrix.mode }}" = experimental ]] || (exit $ok) + } + export -f _run_tests + + if [[ ! "${{ matrix.mode }}" = *-deps ]]; then + echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} '$PHPUNIT {}'" + + exit 0 + fi + + if [[ "${{ matrix.mode }}" = low-deps ]]; then + echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT'" + + exit 0 + fi + + # matrix.mode = high-deps + echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 + + # get a list of the patched components (relies on .github/build-packages.php being called in the previous step) + PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true) + + # 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" + export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev + export SYMFONY_REQUIRE=">=$SYMFONY_VERSION" + git fetch --depth=2 origin $SYMFONY_VERSION + git checkout -m FETCH_HEAD + PATCHED_COMPONENTS=$(echo "$PATCHED_COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true) + if [[ $PATCHED_COMPONENTS ]]; then + echo "::group::install phpunit" + ./phpunit install + echo "::endgroup::" + echo "$PATCHED_COMPONENTS" | parallel -j +3 "_run_tests {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 + fi + fi + + [[ ! $X ]] || (exit 1) + + - name: Run TTY tests + if: "! matrix.mode" + run: | + script -e -c './phpunit --group tty' /dev/null + + - name: Run tests with SIGCHLD enabled PHP + if: "matrix.php == '8.2' && ! matrix.mode" + run: | + mkdir build + cd build + wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-pcntl-sigchild.tar.bz2 + tar -xjf php-8.2.0-pcntl-sigchild.tar.bz2 + cd .. + + mkdir -p /opt/php/lib + echo memory_limit=-1 > /opt/php/lib/php.ini + ./phpunit install + ./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process + env: + SYMFONY_PHPUNIT_VERSION: '9.6' + + - name: Run PhpUnitBridge tests with PHPUnit 9.6 + if: '! matrix.mode' + run: | + ./phpunit src/Symfony/Bridge/PhpUnit + env: + SYMFONY_PHPUNIT_VERSION: '9.6' windows: name: Windows @@ -334,37 +336,28 @@ jobs: choco install --no-progress memurai-developer echo ::endgroup:: - - name: Run tests + - name: Run tests (minimal extensions) run: | $env:Path = 'c:\php;' + $env:Path $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' + $x = 0 - # minimal extensions Copy c:\php\php.ini-min c:\php\php.ini mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows - php phpunit src\Symfony\Component\HttpClient + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $x = $LASTEXITCODE + php phpunit src\Symfony\Component\HttpClient || $x = $LASTEXITCODE - # all extensions - Copy c:\php\php.ini-max c:\php\php.ini - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows - php phpunit src\Symfony\Component\HttpClient + exit $x - if ($Error.Count) { - throw - } + - name: Run tests + run: | + $env:Path = 'c:\php;' + $env:Path + $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' + $x = 0 + + Copy c:\php\php.ini-max c:\php\php.ini + mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -ErrorAction Stop || $x = $LASTEXITCODE + php phpunit src\Symfony\Component\HttpClient -ErrorAction Stop || $x = $LASTEXITCODE -# - name: Run tests -# run: | -# SET PATH=c:\php;%PATH% -# SET X=0 -# SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped -# copy /Y c:\php\php.ini-min c:\php\php.ini -# IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit) -# mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml -# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! -# php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! -# copy /Y c:\php\php.ini-max c:\php\php.ini -# php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || SET X=!errorlevel! -# php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel! -# exit %X% + exit $x From 9d37fbbe23cf7ef6527f3280745bd8108a8a2325 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 16:25:41 +0100 Subject: [PATCH 28/32] - --- .github/workflows/unit-tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 895a02393a4ba..80c056025979a 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -315,6 +315,7 @@ jobs: mkdir %APPDATA%\Composer && Copy .github\composer-config.json %APPDATA%\Composer\config.json - name: Install dependencies + id: setup run: | SET PATH=c:\php;%PATH% mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json @@ -337,6 +338,7 @@ jobs: echo ::endgroup:: - name: Run tests (minimal extensions) + if: always() && steps.setup.outcome == 'success' run: | $env:Path = 'c:\php;' + $env:Path $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' @@ -347,9 +349,12 @@ jobs: php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $x = $LASTEXITCODE php phpunit src\Symfony\Component\HttpClient || $x = $LASTEXITCODE - exit $x + if ($x -ne 0) { + throw "Test failures" + } - name: Run tests + if: always() && steps.setup.outcome == 'success' run: | $env:Path = 'c:\php;' + $env:Path $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' @@ -360,4 +365,6 @@ jobs: php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -ErrorAction Stop || $x = $LASTEXITCODE php phpunit src\Symfony\Component\HttpClient -ErrorAction Stop || $x = $LASTEXITCODE - exit $x + if ($x -ne 0) { + throw "Test failures" + } From 6f65c6f7d5c433515eae39ee1c7fe9634048a468 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 16:37:53 +0100 Subject: [PATCH 29/32] - --- .github/workflows/unit-tests.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 80c056025979a..7f7ab3674eaea 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -257,7 +257,7 @@ jobs: defaults: run: - shell: cmd + shell: pwsh runs-on: windows-2022 @@ -274,7 +274,6 @@ jobs: fetch-depth: 2 - name: Setup PHP - shell: pwsh run: | $env:Path = 'c:\php;' + $env:Path mkdir c:\php && cd c:\php @@ -342,14 +341,13 @@ jobs: run: | $env:Path = 'c:\php;' + $env:Path $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped' - $x = 0 Copy c:\php\php.ini-min c:\php\php.ini mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows || $x = $LASTEXITCODE - php phpunit src\Symfony\Component\HttpClient || $x = $LASTEXITCODE + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows + php phpunit src\Symfony\Component\HttpClient - if ($x -ne 0) { + if ($Error) { throw "Test failures" } @@ -361,10 +359,9 @@ jobs: $x = 0 Copy c:\php\php.ini-max c:\php\php.ini - mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -ErrorAction Stop || $x = $LASTEXITCODE - php phpunit src\Symfony\Component\HttpClient -ErrorAction Stop || $x = $LASTEXITCODE + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -ErrorAction Stop + php phpunit src\Symfony\Component\HttpClient -ErrorAction Stop - if ($x -ne 0) { + if ($Error) { throw "Test failures" } From ad488dfae61e7f25073020776c176fd96c766b51 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 16:39:39 +0100 Subject: [PATCH 30/32] - --- .github/workflows/unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 7f7ab3674eaea..8e49441b9014e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -315,6 +315,7 @@ jobs: - name: Install dependencies id: setup + shell: cmd run: | SET PATH=c:\php;%PATH% mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json From 15a5ab6b35069b324b835cb366b920815be2baad Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 16:40:29 +0100 Subject: [PATCH 31/32] - --- .github/workflows/unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 8e49441b9014e..45bae6845545b 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -360,8 +360,8 @@ jobs: $x = 0 Copy c:\php\php.ini-max c:\php\php.ini - php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows -ErrorAction Stop - php phpunit src\Symfony\Component\HttpClient -ErrorAction Stop + php phpunit src\Symfony --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group network --exclude-group transient-on-windows + php phpunit src\Symfony\Component\HttpClient if ($Error) { throw "Test failures" From 6094eee3aa25c5651214bf8b5537e3ef9d67253b Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Wed, 30 Oct 2024 17:42:15 +0100 Subject: [PATCH 32/32] - --- .github/workflows/unit-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 45bae6845545b..0d9aea90240d7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -268,6 +268,12 @@ jobs: SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE: '1' steps: + - name: Setup Git + run: | + git config --global core.autocrlf false + git config --global user.email "" + git config --global user.name "Symfony" + - name: Checkout uses: actions/checkout@v4 with: @@ -319,8 +325,6 @@ jobs: run: | SET PATH=c:\php;%PATH% mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json - git config --global user.email "" - git config --global user.name "Symfony" FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F) php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev