symfony
diff --git a/‎.github/expected-missing-return-types.diff
Lines changed: 87 additions & 133 deletions b/‎.github/expected-missing-return-types.diff
Lines changed: 87 additions & 133 deletions
diff --git a/‎UPGRADE-7.0.md
Lines changed: 76 additions & 4 deletions b/‎UPGRADE-7.0.md
Lines changed: 76 additions & 4 deletions
diff --git a/‎composer.json
Lines changed: 0 additions & 1 deletion b/‎composer.json
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
Lines changed: 12 additions & 33 deletions b/‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
Lines changed: 12 additions & 33 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
Lines changed: 0 additions & 3 deletions b/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
Lines changed: 0 additions & 3 deletions
@@ -11,6 +11,11 @@ Cache
 
  * Add parameter `$isSameDatabase` to `DoctrineDbalAdapter::configureSchema()`
 
+Config
+------
+
+ * Require explicit argument when calling `NodeBuilder::setParent()`
+
 Console
 -------
 
@@ -41,7 +46,7 @@ Console
    }
    ```
 
- * Passing null to `*Command::setApplication()`, `*FormatterStyle::setForeground/setBackground()`, `Helper::setHelpSet()`, `Input*::setDefault()` and `Question::setAutocompleterCallback/setValidator()` must be done explicitly
+ * Require explicit argument when calling `*Command::setApplication()`, `*FormatterStyle::setForeground/setBackground()`, `Helper::setHelpSet()`, `Input*::setDefault()` and `Question::setAutocompleterCallback/setValidator()`
  * Remove `StringInput::REGEX_STRING`
  * Add method `__toString()` to `InputInterface`
 
@@ -52,7 +57,7 @@ DependencyInjection
  * Remove `ProxyHelper`, use `Symfony\Component\VarExporter\ProxyHelper` instead
  * Remove `ReferenceSetArgumentTrait`
  * Remove support of `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
- * Passing `null` to `ContainerAwareTrait::setContainer()` must be done explicitly
+ * Require explicit argument when calling `ContainerAwareTrait::setContainer()`
  * Remove `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use options `inline_factories` and `inline_class_loader` instead
  * Parameter names of `ParameterBag` cannot be numerics
  * Remove `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
@@ -82,10 +87,34 @@ Filesystem
 
  * Add argument `$lock` to `Filesystem::appendToFile()`
 
+Form
+----
+
+ * Throw when using `DateTime` or `DateTimeImmutable` model data with a different timezone than configured with the
+   `model_timezone` option in `DateType`, `DateTimeType`, and `TimeType`
+ * Make the "widget" option of date/time form types default to "single_text"
+ * Require explicit argument when calling `Button/Form::setParent()`, `ButtonBuilder/FormConfigBuilder::setDataMapper()`, `TransformationFailedException::setInvalidMessage()`
+
 FrameworkBundle
 ---------------
 
  * Remove command `translation:update`, use `translation:extract` instead
+ * Make the `http_method_override` config option default to `false`
+ * Remove the `Symfony\Component\Serializer\Normalizer\ObjectNormalizer` and
+   `Symfony\Component\Serializer\Normalizer\PropertyNormalizer` autowiring aliases, type-hint against
+   `Symfony\Component\Serializer\Normalizer\NormalizerInterface` or implement `NormalizerAwareInterface` instead
+ * Remove the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
+ * Remove `AbstractController::renderForm()`, use `render()` instead
+
+   *Before*
+   ```php
+   $this->renderForm(..., ['form' => $form]);
+   ```
+
+   *After*
+   ```php
+   $this->render(..., ['form' => $form]);
+   ```
 
 HttpFoundation
 --------------
@@ -99,6 +128,7 @@ HttpFoundation
  * Replace `ExpressionRequestMatcher` with `RequestMatcher\ExpressionRequestMatcher`
  * Remove `Request::getContentType()`, use `Request::getContentTypeFormat()` instead
  * Throw an `InvalidArgumentException` when calling `Request::create()` with a malformed URI
+ * Require explicit argument when calling `JsonResponse::setCallback()`, `Response::setExpires/setLastModified/setEtag()`, `MockArraySessionStorage/NativeSessionStorage::setMetadataBag()`, `NativeSessionStorage::setSaveHandler()`
 
 HttpClient
 ----------
@@ -114,27 +144,41 @@ HttpKernel
  * Remove `AbstractSurrogate::$phpEscapeMap`
  * Remove `HttpKernelInterface::MASTER_REQUEST`
  * Remove `terminate_on_cache_hit` option from `HttpCache`
+ * Require explicit argument when calling `ConfigDataCollector::setKernel()`, `RouterListener::setCurrentRequest()`
 
 Lock
 ----
 
  * Add parameter `$isSameDatabase` to `DoctrineDbalStore::configureSchema()`
 
+Mailer
+------
+
+ * Remove the OhMySmtp bridge in favor of the MailPace bridge
+
 Messenger
 ---------
 
  * Add parameter `$isSameDatabase` to `DoctrineTransport::configureSchema()`
+ * Remove `MessageHandlerInterface` and `MessageSubscriberInterface`, use `#[AsMessageHandler]` instead
+ * Remove `StopWorkerOnSigtermSignalListener` in favor of
+   `StopWorkerOnSignalsListener` and make it configurable with SIGINT and
+ * Remove `Symfony\Component\Messenger\Transport\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
 
 Mime
 ----
 
  * Remove `Email::attachPart()` method, use `Email::addPart()` instead
- * Parameter `$body` is now required (at least null) in `Message::setBody()`
+ * Require explicit argument when calling `Message::setBody()`
 
 PropertyAccess
 --------------
 
  * Add method `isNullSafe()` to `PropertyPathInterface`
+ * Require explicit argument when calling `PropertyAccessorBuilder::setCacheItemPool()`
 
 ProxyManagerBridge
 ------------------
@@ -151,6 +195,7 @@ Security
 
  * Add argument `$badgeFqcn` to `Passport::addBadge()`
  * Add argument `$lifetime` to `LoginLinkHandlerInterface::createLoginLink()`
+ * Require explicit argument when calling `TokenStorage::setToken()`
 
 SecurityBundle
 --------------
@@ -188,6 +233,7 @@ Serializer
        }
    }
    ```
+
  * Remove `CacheableSupportsMethodInterface`, use `NormalizerInterface` and `DenormalizerInterface` instead
 
    *Before*
@@ -232,9 +278,24 @@ Serializer
        // ...
    }
    ```
- * First argument of `AttributeMetadata::setSerializedName()` is now required
+
+ * Require explicit argument when calling `AttributeMetadata::setSerializedName()` and `ClassMetadata::setClassDiscriminatorMapping()`
  * Add argument `$context` to `NormalizerInterface::supportsNormalization()` and `DenormalizerInterface::supportsDenormalization()`
 
+Translation
+-----------
+
+ * Remove `PhpStringTokenParser`
+ * Remove `PhpExtractor` in favor of `PhpAstExtractor`
+
+TwigBundle
+----------
+
+ * Remove the `Twig_Environment` autowiring alias, use `Twig\Environment` instead
+ * Remove option `twig.autoescape`; create a class that implements your escaping strategy
+   (check `FileExtensionEscapingStrategy::guess()` for inspiration) and reference it using
+   the `twig.autoescape_service` option instead
+
 Validator
 ---------
 
@@ -249,3 +310,14 @@ VarDumper
 ---------
 
  * Add argument `$label` to `VarDumper::dump()`
+ * Require explicit argument when calling `VarDumper::setHandler()`
+
+Workflow
+--------
+
+ * Require explicit argument when calling `Definition::setInitialPlaces()`
+
+Yaml
+----
+
+ * Remove the `!php/const:` tag, use `!php/const` instead (without the colon)
@@ -141,7 +141,6 @@
         "pda/pheanstalk": "^4.0",
         "php-http/discovery": "^1.15",
         "php-http/httplug": "^1.0|^2.0",
-        "php-http/message-factory": "^1.0",
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpstan/phpdoc-parser": "^1.0",
         "predis/predis": "^1.1|^2.0",
 
@@ -22,7 +22,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Registers event listeners and subscribers to the available doctrine connections.
+ * Registers event listeners to the available doctrine connections.
  *
  * @author Jeremy Mikola <jmikola@gmail.com>
  * @author Alexander <iam.asm89@gmail.com>
@@ -44,7 +44,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
     /**
      * @param string $managerTemplate sprintf() template for generating the event
      *                                manager's service ID for a connection name
-     * @param string $tagPrefix       Tag prefix for listeners and subscribers
+     * @param string $tagPrefix       Tag prefix for listeners
      */
     public function __construct(string $connectionsParameter, string $managerTemplate, string $tagPrefix)
     {
@@ -72,18 +72,13 @@ public function process(ContainerBuilder $container): void
 
     private function addTaggedServices(ContainerBuilder $container): array
     {
-        $listenerTag = $this->tagPrefix.'.event_listener';
-        $subscriberTag = $this->tagPrefix.'.event_subscriber';
         $listenerRefs = [];
-        $taggedServices = $this->findAndSortTags($subscriberTag, $listenerTag, $container);
-
         $managerDefs = [];
-        foreach ($taggedServices as $taggedSubscriber) {
-            [$tagName, $id, $tag] = $taggedSubscriber;
+        foreach ($this->findAndSortTags($container) as [$id, $tag]) {
             $connections = isset($tag['connection'])
                 ? [$container->getParameterBag()->resolveValue($tag['connection'])]
                 : array_keys($this->connections);
-            if ($listenerTag === $tagName && !isset($tag['event'])) {
+            if (!isset($tag['event'])) {
                 throw new InvalidArgumentException(sprintf('Doctrine event listener "%s" must specify the "event" attribute.', $id));
             }
             foreach ($connections as $con) {
@@ -105,19 +100,10 @@ private function addTaggedServices(ContainerBuilder $container): array
                 if (ContainerAwareEventManager::class === $managerClass) {
                     $refs = $managerDef->getArguments()[1] ?? [];
                     $listenerRefs[$con][$id] = new Reference($id);
-                    if ($subscriberTag === $tagName) {
-                        trigger_deprecation('symfony/doctrine-bridge', '6.3', 'Using Doctrine subscribers as services is deprecated, declare listeners instead');
-                        $refs[] = $id;
-                    } else {
-                        $refs[] = [[$tag['event']], $id];
-                    }
+                    $refs[] = [[$tag['event']], $id];
                     $managerDef->setArgument(1, $refs);
                 } else {
-                    if ($subscriberTag === $tagName) {
-                        $managerDef->addMethodCall('addEventSubscriber', [new Reference($id)]);
-                    } else {
-                        $managerDef->addMethodCall('addEventListener', [[$tag['event']], new Reference($id)]);
-                    }
+                    $managerDef->addMethodCall('addEventListener', [[$tag['event']], new Reference($id)]);
                 }
             }
         }
@@ -144,21 +130,14 @@ private function getEventManagerDef(ContainerBuilder $container, string $name):
      * @see https://bugs.php.net/53710
      * @see https://bugs.php.net/60926
      */
-    private function findAndSortTags(string $subscriberTag, string $listenerTag, ContainerBuilder $container): array
+    private function findAndSortTags(ContainerBuilder $container): array
     {
         $sortedTags = [];
-        $taggedIds = [
-            $subscriberTag => $container->findTaggedServiceIds($subscriberTag, true),
-            $listenerTag => $container->findTaggedServiceIds($listenerTag, true),
-        ];
-        $taggedIds[$subscriberTag] = array_diff_key($taggedIds[$subscriberTag], $taggedIds[$listenerTag]);
-
-        foreach ($taggedIds as $tagName => $serviceIds) {
-            foreach ($serviceIds as $serviceId => $tags) {
-                foreach ($tags as $attributes) {
-                    $priority = $attributes['priority'] ?? 0;
-                    $sortedTags[$priority][] = [$tagName, $serviceId, $attributes];
-                }
+
+        foreach ($container->findTaggedServiceIds($this->tagPrefix.'.event_listener', true) as $serviceId => $tags) {
+            foreach ($tags as $attributes) {
+                $priority = $attributes['priority'] ?? 0;
+                $sortedTags[$priority][] = [$serviceId, $attributes];
             }
         }
 
 
@@ -57,9 +57,6 @@ protected function loadChoices(): iterable
             : $this->manager->getRepository($this->class)->findAll();
     }
 
-    /**
-     * @internal to be remove in Symfony 6
-     */
     protected function doLoadValuesForChoices(array $choices): array
     {
         // Optimize performance for single-field identifiers. We already
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,6 @@ protected function loadChoices(): iterable`
`57`	`57`	`: $this->manager->getRepository($this->class)->findAll();`
`58`	`58`	`}`
`59`	`59`
`60`		`- /**`
`61`		`- * @internal to be remove in Symfony 6`
`62`		`- */`
`63`	`60`	`protected function doLoadValuesForChoices(array $choices): array`
`64`	`61`	`{`
`65`	`62`	`// Optimize performance for single-field identifiers. We already`