fancyweb · fancyweb · Nov 30, 2021 · Dec 2, 2021 · Dec 8, 2021 · Dec 11, 2021
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -62,9 +62,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 || SET X=!errorlevel!
+    - php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,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 || SET X=!errorlevel!
+    - php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
     - php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
     - exit %X%
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -6,7 +6,7 @@ head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
 (echo "$head" && echo && git diff -U2 composer.json src/) > .github/expected-missing-return-types.diff
 
 diff --git a/composer.json b/composer.json
-index 1bc576b112..589ef8c260 100644
+index 1750d55ee2..c18494167a 100644
 --- a/composer.json
 +++ b/composer.json
 @@ -175,5 +175,5 @@
@@ -16,8 +16,19 @@ index 1bc576b112..589ef8c260 100644
 +
          ]
      },
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+index d68ae4c8b3..8e980a9e70 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+@@ -88,5 +88,5 @@ abstract class KernelTestCase extends TestCase
+      * @return TestContainer
+      */
+-    protected static function getContainer(): ContainerInterface
++    protected static function getContainer(): TestContainer
+     {
+         if (!static::$booted) {
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index 152050159b..e2ec1aeea2 100644
+index 697e34cb77..9a1e4c5618 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 @@ -408,5 +408,5 @@ abstract class AbstractBrowser
@@ -144,7 +155,7 @@ index 6b1c6c5fbe..bb80ed461e 100644
 +    public function isFresh(ResourceInterface $resource, int $timestamp): bool;
  }
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index b582435f7d..3d5f064773 100644
+index 0ed5649b8a..6c814bf82c 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -218,5 +218,5 @@ class Application implements ResetInterface
@@ -197,7 +208,7 @@ index b582435f7d..3d5f064773 100644
      {
          foreach ($command->getHelperSet() as $helper) {
 diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
-index d6354b4ab1..b267917312 100644
+index 0bd3426c07..b38caf989e 100644
 --- a/src/Symfony/Component/Console/Command/Command.php
 +++ b/src/Symfony/Component/Console/Command/Command.php
 @@ -171,5 +171,5 @@ class Command
@@ -250,18 +261,18 @@ index 024da1884e..943790e875 100644
 
      /**
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
-index 1acec50de5..904e67a47b 100644
+index 326d8d4f5f..e62124c7af 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
-@@ -70,5 +70,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
+@@ -71,5 +71,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
       * @return mixed
       */
 -    protected function processValue(mixed $value, bool $isRoot = false)
 +    protected function processValue(mixed $value, bool $isRoot = false): mixed
      {
          if (\is_array($value)) {
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
-index 0532120adf..78fba5ef79 100644
+index b9dd838898..3a8cb63eac 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
 +++ b/src/Symfony/Component/DependencyInjection/Container.php
 @@ -108,5 +108,5 @@ class Container implements ContainerInterface, ResetInterface
@@ -535,7 +546,7 @@ index 1cb865fd66..f6f4efe7a7 100644
 +    public function getName(): string;
  }
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-index 8e7b80a909..d757429d36 100644
+index cf0e243c6b..292b907ea8 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 @@ -448,5 +448,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
@@ -544,9 +555,9 @@ index 8e7b80a909..d757429d36 100644
 -    protected function forward(Request $request, bool $catch = false, Response $entry = null)
 +    protected function forward(Request $request, bool $catch = false, Response $entry = null): Response
      {
-         if ($this->surrogate) {
+         $this->surrogate?->addSurrogateCapability($request);
 diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
-index f4773eb62a..0ba648b57f 100644
+index 3ecc2c739c..d50834b6d9 100644
 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 @@ -61,5 +61,5 @@ class HttpKernelBrowser extends AbstractBrowser
@@ -581,8 +592,25 @@ index 19ff0db181..f0f4a5829f 100644
 +    public function countErrors(Request $request = null): int;
 
      /**
+diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
+index bb1194ad1b..bd7fc440ff 100644
+--- a/src/Symfony/Component/Messenger/Envelope.php
++++ b/src/Symfony/Component/Messenger/Envelope.php
+@@ -13,4 +13,5 @@ namespace Symfony\Component\Messenger;
+
+ use Symfony\Component\Messenger\Stamp\StampInterface;
++use Symfony\Component\Messenger\Stamp\StampInterface as TStamp;
+
+ /**
+@@ -101,5 +102,5 @@ final class Envelope
+      * @return TStamp|null
+      */
+-    public function last(string $stampFqcn): ?StampInterface
++    public function last(string $stampFqcn): ?TStamp
+     {
+         return isset($this->stamps[$stampFqcn]) ? end($this->stamps[$stampFqcn]) : null;
 diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
-index fe77644762..09dcfe166b 100644
+index 205c15b4cd..e93e460ed1 100644
 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
 +++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
 @@ -486,5 +486,5 @@ class OptionsResolver implements Options
@@ -858,7 +886,7 @@ index b0a1f3218b..893fe59e2f 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index a241215133..2ed1af7a02 100644
+index 3e1e7edc8e..e025b2bc4a 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -136,5 +136,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -1002,3 +1030,35 @@ index d6dcdf178f..0ab8d9c10e 100644
 +    public function getTargets(): string|array
      {
          return self::PROPERTY_CONSTRAINT;
+diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php
+index cd7fab7896..b340eba38e 100644
+--- a/src/Symfony/Component/Workflow/Event/Event.php
++++ b/src/Symfony/Component/Workflow/Event/Event.php
+@@ -42,5 +42,5 @@ class Event extends BaseEvent
+      * @return Marking
+      */
+-    public function getMarking()
++    public function getMarking(): Marking
+     {
+         return $this->marking;
+@@ -50,5 +50,5 @@ class Event extends BaseEvent
+      * @return object
+      */
+-    public function getSubject()
++    public function getSubject(): object
+     {
+         return $this->subject;
+@@ -58,5 +58,5 @@ class Event extends BaseEvent
+      * @return Transition|null
+      */
+-    public function getTransition()
++    public function getTransition(): ?Transition
+     {
+         return $this->transition;
+@@ -71,5 +71,5 @@ class Event extends BaseEvent
+      * @return string
+      */
+-    public function getWorkflowName()
++    public function getWorkflowName(): string
+     {
+         return $this->workflow->getName();
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -72,7 +72,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" >> $GITHUB_ENV
+          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
@@ -146,7 +146,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Patch return types
-        if: "matrix.php == '8.1' && ! matrix.mode && matrix.os == 'ubuntu-20.04'"
+        if: "matrix.php == '8.1' && ! matrix.mode && matrix.os != 'macos-11'"
         run: |
           patch -sp1 < .github/expected-missing-return-types.diff
           git add .
@@ -224,7 +224,7 @@ jobs:
           [[ ! $X ]] || (exit 1)
 
       - name: Run tests with SIGCHLD enabled PHP
-        if: "matrix.php == '8.0' && ! matrix.mode"
+        if: "matrix.php == '8.0' && ! matrix.mode && matrix.os != 'macos-11'"
         run: |
           mkdir build
           cd build

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -11,6 +11,7 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'protected_to_private' => false,
+        'native_constant_invocation' => ['strict' => false],
         'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false],
         'modernize_strpos' => true,
     ])

diff --git a/composer.json b/composer.json
@@ -157,7 +157,7 @@
         "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "phpdocumentor/reflection-docblock": "<5.2",
-        "phpdocumentor/type-resolver": "<1.4.0",
+        "phpdocumentor/type-resolver": "<1.5.1",
         "ocramius/proxy-manager": "<2.1",
         "phpunit/phpunit": "<5.4.3"
     },

diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -56,7 +56,7 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
             return;
         }
 
-        $eventArgs = $eventArgs ?? EventArgs::getEmptyInstance();
+        $eventArgs ??= EventArgs::getEmptyInstance();
 
         if (!isset($this->initialized[$eventName])) {
             $this->initializeListeners($eventName);

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -134,8 +134,6 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
      * If this is a bundle controlled mapping all the missing information can be autodetected by this method.
      *
      * Returns false when autodetection failed, an array of the completed information otherwise.
-     *
-     * @return array|false
      */
     protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
     {

diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -37,9 +37,7 @@ public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch
      */
     public function startQuery($sql, array $params = null, array $types = null): void
     {
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->start('doctrine', 'doctrine');
-        }
+        $this->stopwatch?->start('doctrine', 'doctrine');
 
         if (null !== $this->logger) {
             $this->log($sql, null === $params ? [] : $this->normalizeParams($params));
@@ -51,9 +49,7 @@ public function startQuery($sql, array $params = null, array $types = null): voi
      */
     public function stopQuery(): void
     {
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->stop('doctrine');
-        }
+        $this->stopwatch?->stop('doctrine');
     }
 
     /**

diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
@@ -30,9 +30,6 @@ public function __construct(ManagerRegistry $registry)
 
     public function initialize(object $object)
     {
-        $manager = $this->registry->getManagerForClass(\get_class($object));
-        if (null !== $manager) {
-            $manager->initializeObject($object);
-        }
+        $this->registry->getManagerForClass(\get_class($object))?->initializeObject($object);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
         $className = $metadata->getClassName();
         try {
             $doctrineMetadata = $this->entityManager->getClassMetadata($className);
-        } catch (MappingException | OrmMappingException $exception) {
+        } catch (MappingException|OrmMappingException $exception) {
             return false;
         }
 

diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -100,7 +100,7 @@ public function getSession(): ?Session
         }
         $request = $this->getRequest();
 
-        return $request && $request->hasSession() ? $request->getSession() : null;
+        return $request?->hasSession() ? $request->getSession() : null;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -230,9 +230,7 @@ private function renderException(SymfonyStyle $output, string $template, Error $
     {
         $line = $exception->getTemplateLine();
 
-        if ($githubReporter) {
-            $githubReporter->error($exception->getRawMessage(), $file, $line <= 0 ? null : $line);
-        }
+        $githubReporter?->error($exception->getRawMessage(), $file, $line <= 0 ? null : $line);
 
         if ($file) {
             $output->text(sprintf('<error> ERROR </error> in %s (line %s)', $file, $line));

diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -68,9 +68,6 @@ class UndefinedCallableHandler
         'workflow' => 'enable "framework.workflows"',
     ];
 
-    /**
-     * @return TwigFilter|false
-     */
     public static function onUndefinedFilter(string $name): TwigFilter|false
     {
         if (!isset(self::FILTER_COMPONENTS[$name])) {
@@ -80,9 +77,6 @@ public static function onUndefinedFilter(string $name): TwigFilter|false
         throw new SyntaxError(self::onUndefined($name, 'filter', self::FILTER_COMPONENTS[$name]));
     }
 
-    /**
-     * @return TwigFunction|false
-     */
     public static function onUndefinedFunction(string $name): TwigFunction|false
     {
         if (!isset(self::FUNCTION_COMPONENTS[$name])) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.1
+---
+
+ * Environment variable `SYMFONY_IDE` is read by default when `framework.ide` config is not set.
+
 6.0
 ---
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php
@@ -55,9 +55,7 @@ public function warmUp(string $cacheDir): array
             try {
                 $this->dumpExtension($extension, $generator);
             } catch (\Exception $e) {
-                if ($this->logger) {
-                    $this->logger->warning('Failed to generate ConfigBuilder for extension {extensionClass}.', ['exception' => $e, 'extensionClass' => \get_class($extension)]);
-                }
+                $this->logger?->warning('Failed to generate ConfigBuilder for extension {extensionClass}.', ['exception' => $e, 'extensionClass' => \get_class($extension)]);
             }
         }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $secrets = $this->vault->list($reveal);
-        $localSecrets = null !== $this->localVault ? $this->localVault->list($reveal) : null;
+        $localSecrets = $this->localVault?->list($reveal);
 
         $rows = [];
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -36,7 +36,8 @@
 class WorkflowDumpCommand extends Command
 {
     /**
-     * string is the service id
+     * string is the service id.
+     *
      * @var array<string, Definition>
      */
     private array $workflows = [];

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -70,8 +70,6 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
 
     /**
      * Gets a container parameter by its name.
-     *
-     * @return array|bool|float|int|string|null
      */
     protected function getParameter(string $name): array|bool|float|int|string|null
     {

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -80,7 +80,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->info("Set true to enable support for the '_method' request parameter to determine the intended HTTP method on POST requests. Note: When using the HttpCache, you need to call the method in your front controller instead")
                     ->defaultTrue()
                 ->end()
-                ->scalarNode('ide')->defaultNull()->end()
+                ->scalarNode('ide')->defaultValue('%env(default::SYMFONY_IDE)%')->end()
                 ->booleanNode('test')->end()
                 ->scalarNode('default_locale')->defaultValue('en')->end()
                 ->booleanNode('set_locale_from_accept_language')
@@ -2038,6 +2038,9 @@ private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIf
                         ->scalarNode('time_based_uuid_node')
                             ->cannotBeEmpty()
                         ->end()
+                        ->arrayNode('argument_value_resolver')
+                            ->canBeEnabled()
+                        ->end()
                     ->end()
                 ->end()
             ->end()
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ public function getSession(): ?Session @@
             }
             $request = $this->getRequest();
-            return $request && $request->hasSession() ? $request->getSession() : null;
+            return $request?->hasSession() ? $request->getSession() : null;
         }
         /**
@@ Expand Down @@