Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 0d51271ecde4 · 2023-06-05T17:08:07.000+02:00
* 6.3: [PhpUnitBridge] Ignore deprecations about the annotation mapping driver when it's not possible to move to the attribute driver yet [SecurityBundle] Mark SignatureAlgorithmFactory as internal remove unusable cache pools GH-50526: Reverting ExecutionContextInterface void return types in favor of docblock annotations.
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -14,7 +14,7 @@
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 // Detect if we need to serialize deprecations to a file.
-if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true) && $file = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
+if (in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && $file = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
     DeprecationErrorHandler::collectDeprecations($file);
 
     return;
@@ -34,6 +34,11 @@
 
 if (class_exists(Deprecation::class)) {
     Deprecation::withoutDeduplication();
+
+    if (\PHP_VERSION_ID < 80000) {
+        // Ignore deprecations about the annotation mapping driver when it's not possible to move to the attribute driver yet
+        Deprecation::ignoreDeprecations('https://github.com/doctrine/orm/issues/10098');
+    }
 }
 
 if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -342,6 +342,8 @@ public function load(array $configs, ContainerBuilder $container)
             }
 
             $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));
+        } else {
+            $container->removeDefinition('cache.asset_mapper');
         }
 
         if ($this->readConfigEnabled('http_client', $container, $config['http_client'])) {
@@ -485,6 +487,7 @@ public function load(array $configs, ContainerBuilder $container)
             }
             $this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);
         } else {
+            $container->removeDefinition('cache.scheduler');
             $container->removeDefinition('console.command.scheduler_debug');
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SignatureAlgorithmFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SignatureAlgorithmFactory.php
@@ -19,6 +19,8 @@
 /**
  * Creates a signature algorithm for {@see OidcTokenHandler}.
  *
+ * @internal
+ *
  * @experimental
  */
 final class SignatureAlgorithmFactory
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -123,37 +123,44 @@ public function getObject(): ?object;
      *
      * @param object|null $object       The currently validated object
      * @param string      $propertyPath The property path to the current value
+     *
+     * @return void
      */
-    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void;
+    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath);
 
     /**
      * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string|null $group The validated group
+     *
+     * @return void
      */
-    public function setGroup(?string $group): void;
+    public function setGroup(?string $group);
 
     /**
      * Warning: Should not be called by user code, to be used by the validator engine only.
+     *
+     * @return void
      */
-    public function setConstraint(Constraint $constraint): void;
+    public function setConstraint(Constraint $constraint);
 
     /**
      * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey  The hash of the object
      * @param string $groupHash The group's name or hash, if it is group
      *                          sequence
+     *
+     * @return void
      */
-    public function markGroupAsValidated(string $cacheKey, string $groupHash): void;
+    public function markGroupAsValidated(string $cacheKey, string $groupHash);
 
     /**
      * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey  The hash of the object
      * @param string $groupHash The group's name or hash, if it is group
      *                          sequence
-     *
      */
     public function isGroupValidated(string $cacheKey, string $groupHash): bool;
 
@@ -162,15 +169,16 @@ public function isGroupValidated(string $cacheKey, string $groupHash): bool;
      *
      * @param string $cacheKey       The hash of the object
      * @param string $constraintHash The hash of the constraint
+     *
+     * @return void
      */
-    public function markConstraintAsValidated(string $cacheKey, string $constraintHash): void;
+    public function markConstraintAsValidated(string $cacheKey, string $constraintHash);
 
     /**
      * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey       The hash of the object
      * @param string $constraintHash The hash of the constraint
-     *
      */
     public function isConstraintValidated(string $cacheKey, string $constraintHash): bool;
 
@@ -188,7 +196,6 @@ public function markObjectAsInitialized(string $cacheKey): void;
      *
      * @param string $cacheKey The hash of the object
      *
-     *
      * @see ObjectInitializerInterface
      */
     public function isObjectInitialized(string $cacheKey): bool;

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,8 @@ public function load(array $configs, ContainerBuilder $container)`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`$this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));`
	`345`	`+ } else {`
	`346`	`+ $container->removeDefinition('cache.asset_mapper');`
`345`	`347`	`}`
`346`	`348`
`347`	`349`	`if ($this->readConfigEnabled('http_client', $container, $config['http_client'])) {`
`@@ -485,6 +487,7 @@ public function load(array $configs, ContainerBuilder $container)`
`485`	`487`	`}`
`486`	`488`	`$this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);`
`487`	`489`	`} else {`
	`490`	`+ $container->removeDefinition('cache.scheduler');`
`488`	`491`	`$container->removeDefinition('console.command.scheduler_debug');`
`489`	`492`	`}`
`490`	`493`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`/**`
`20`	`20`	`* Creates a signature algorithm for {@see OidcTokenHandler}.`
`21`	`21`	`*`
	`22`	`+ * @internal`
	`23`	`+ *`
`22`	`24`	`* @experimental`
`23`	`25`	`*/`
`24`	`26`	`final class SignatureAlgorithmFactory`