Merge branch '6.4' into 7.2

xabbuh · xabbuh · commit 17963ff16525 · 2025-06-02T13:41:06.000+02:00
* 6.4:
  skip interactive questions asked by Composer
  [SecurityBundle] Remove `AnonymousFactory` leftovers
  [Translation] Validate of pt_BR translation by a native speaker
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -240,7 +240,7 @@
         $passthruOrFail("$COMPOSER require --no-update --no-interaction ".$SYMFONY_PHPUNIT_REQUIRE);
     }
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
-        $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
+        $passthruOrFail("$COMPOSER require --no-update --no-interaction phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
 
     if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', \PHP_VERSION, '<')) {
@@ -256,13 +256,13 @@
         if (realpath($p) === realpath($path)) {
             $path = $p;
         }
-        $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
+        $passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*@dev\"");
         $passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
         if ('\\' === \DIRECTORY_SEPARATOR) {
             file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1    ".'"options": {"symlink": false},', file_get_contents('composer.json')));
         }
     } else {
-        $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
+        $passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*\"");
     }
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -319,7 +319,7 @@ private function createFirewalls(array $config, ContainerBuilder $container): vo
                 $authenticators[$name] = ServiceLocatorTagPass::register($container, $firewallAuthenticatorRefs);
             }
             $contextId = 'security.firewall.map.context.'.$name;
-            $isLazy = !$firewall['stateless'] && (!empty($firewall['anonymous']['lazy']) || $firewall['lazy']);
+            $isLazy = !$firewall['stateless'] && $firewall['lazy'];
             $context = new ChildDefinition($isLazy ? 'security.firewall.lazy_context' : 'security.firewall.context');
             $context = $container->setDefinition($contextId, $context);
             $context
@@ -681,7 +681,7 @@ private function getUserProvider(ContainerBuilder $container, string $id, array
             return $this->createMissingUserProvider($container, $id, $factoryKey);
         }
 
-        if ('remember_me' === $factoryKey || 'anonymous' === $factoryKey) {
+        if ('remember_me' === $factoryKey) {
             return 'security.user_providers';
         }
 
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf
@@ -468,7 +468,7 @@
             </trans-unit>
             <trans-unit id="121">
                 <source>This value is not a valid Twig template.</source>
-                <target state="needs-review-translation">Este valor não é um modelo Twig válido.</target>
+                <target>Este valor não é um modelo Twig válido.</target>
             </trans-unit>
         </body>
     </file>

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@`
`240`	`240`	`$passthruOrFail("$COMPOSER require --no-update --no-interaction ".$SYMFONY_PHPUNIT_REQUIRE);`
`241`	`241`	`}`
`242`	`242`	`if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {`
`243`		`- $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
	`243`	`+ $passthruOrFail("$COMPOSER require --no-update --no-interaction phpunit/phpunit-mock-objects \"~3.1.0\"");`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', \PHP_VERSION, '<')) {`
`@@ -256,13 +256,13 @@`
`256`	`256`	`if (realpath($p) === realpath($path)) {`
`257`	`257`	`$path = $p;`
`258`	`258`	`}`
`259`		`- $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");`
	`259`	`+ $passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*@dev\"");`
`260`	`260`	`$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));`
`261`	`261`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`262`	`262`	`file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1 ".'"options": {"symlink": false},', file_get_contents('composer.json')));`
`263`	`263`	`}`
`264`	`264`	`} else {`
`265`		`- $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");`
	`265`	`+ $passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*\"");`
`266`	`266`	`}`
`267`	`267`	`$prevRoot = getenv('COMPOSER_ROOT_VERSION');`
`268`	`268`	`putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ private function createFirewalls(array $config, ContainerBuilder $container): vo`
`319`	`319`	`$authenticators[$name] = ServiceLocatorTagPass::register($container, $firewallAuthenticatorRefs);`
`320`	`320`	`}`
`321`	`321`	`$contextId = 'security.firewall.map.context.'.$name;`
`322`		`- $isLazy = !$firewall['stateless'] && (!empty($firewall['anonymous']['lazy']) \|\| $firewall['lazy']);`
	`322`	`+ $isLazy = !$firewall['stateless'] && $firewall['lazy'];`
`323`	`323`	`$context = new ChildDefinition($isLazy ? 'security.firewall.lazy_context' : 'security.firewall.context');`
`324`	`324`	`$context = $container->setDefinition($contextId, $context);`
`325`	`325`	`$context`
`@@ -681,7 +681,7 @@ private function getUserProvider(ContainerBuilder $container, string $id, array`
`681`	`681`	`return $this->createMissingUserProvider($container, $id, $factoryKey);`
`682`	`682`	`}`
`683`	`683`
`684`		`- if ('remember_me' === $factoryKey \|\| 'anonymous' === $factoryKey) {`
	`684`	`+ if ('remember_me' === $factoryKey) {`
`685`	`685`	`return 'security.user_providers';`
`686`	`686`	`}`
`687`	`687`