symfony · misterx · May 9, 2019 · May 9, 2019 · May 9, 2019 · May 10, 2019
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -0,0 +1,94 @@
+UPGRADE FROM 4.3 to 4.4
+=======================
+
+DependencyInjection
+-------------------
+
+ * Deprecated support for short factories and short configurators in Yaml
+
+   Before:
+   ```yaml
+   services:
+     my_service:
+       factory: factory_service:method
+   ```
+
+   After:
+   ```yaml
+   services:
+     my_service:
+       factory: ['@factory_service', method]
+   ```
+ * Deprecated `tagged` in favor of `tagged_iterator`
+
+   Before:
+   ```yaml
+   services:
+       App\Handler:
+           tags: ['app.handler']
+
+       App\HandlerCollection:
+           arguments: [!tagged app.handler]
+   ```
+
+   After:
+   ```yaml
+   services:
+       App\Handler:
+       tags: ['app.handler']
+
+   App\HandlerCollection:
+       arguments: [!tagged_iterator app.handler]
+   ```
+
+Form
+----
+
+ * Using `int` or `float` as data for the `NumberType` when the `input` option is set to `string` is deprecated.
+
+FrameworkBundle
+---------------
+
+ * Deprecated support for `templating` engine in `TemplateController`, use Twig instead
+ * The `$parser` argument of `ControllerResolver::__construct()` and `DelegatingLoader::__construct()`
+   has been deprecated.
+ * The `ControllerResolver` and `DelegatingLoader` classes have been marked as `final`.
+ * The `controller_name_converter` and `resolve_controller_name_subscriber` services have been deprecated.
+
+HttpClient
+----------
+
+ * Added method `cancel()` to `ResponseInterface`
+
+HttpKernel
+----------
+
+ * The `DebugHandlersListener` class has been marked as `final`
+
+Messenger
+---------
+
+ * Deprecated passing a `ContainerInterface` instance as first argument of the `ConsumeMessagesCommand` constructor,
+   pass a `RoutableMessageBus`  instance instead.
+
+MonologBridge
+--------------
+
+ * The `RouteProcessor` has been marked final.
+
+Security
+--------
+
+ * Implementations of `PasswordEncoderInterface` and `UserPasswordEncoderInterface` should add a new `needsRehash()` method
+
+TwigBridge
+----------
+
+ * Deprecated to pass `$rootDir` and `$fileLinkFormatter` as 5th and 6th argument respectively to the 
+   `DebugCommand::__construct()` method, swap the variables position.
+
+Validator
+---------
+
+ * Deprecated passing an `ExpressionLanguage` instance as the second argument of `ExpressionValidator::__construct()`. 
+   Pass it as the first argument instead.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -69,6 +69,43 @@ DependencyInjection
         env(NAME): '1.5'
    ```
 
+ * Removed support for short factories and short configurators in Yaml
+
+   Before:
+   ```yaml
+   services:
+     my_service:
+       factory: factory_service:method
+   ```
+
+   After:
+   ```yaml
+   services:
+     my_service:
+       factory: ['@factory_service', method]
+   ```
+ * Removed `tagged` in favor of `tagged_iterator`
+
+   Before:
+   ```yaml
+   services:
+       App\Handler:
+            tags: ['app.handler']
+
+        App\HandlerCollection:
+            arguments: [!tagged app.handler]
+   ```
+
+   After:
+   ```yaml
+   services:
+       App\Handler:
+           tags: ['app.handler']
+
+       App\HandlerCollection:
+           arguments: [!tagged_iterator app.handler]
+   ```
+
 DoctrineBridge
 --------------
 
@@ -109,6 +146,7 @@ Finder
 Form
 ----
 
+ * Removed support for using `int` or `float` as data for the `NumberType` when the `input` option is set to `string`.
  * Removed support for using the `format` option of `DateType` and `DateTimeType` when the `html5` option is enabled.
  * Using names for buttons that do not start with a letter, a digit, or an underscore leads to an exception.
  * Using names for buttons that do not contain only letters, digits, underscores, hyphens, and colons leads to an
@@ -203,6 +241,16 @@ FrameworkBundle
  * Removed support for legacy translations directories `src/Resources/translations/` and `src/Resources/<BundleName>/translations/`, use `translations/` instead.
  * Support for the legacy directory structure in `translation:update` and `debug:translation` commands has been removed.
  * Removed the "Psr\SimpleCache\CacheInterface" / "cache.app.simple" service, use "Symfony\Contracts\Cache\CacheInterface" / "cache.app" instead.
+ * Removed support for `templating` engine in `TemplateController`, use Twig instead
+
+HttpClient
+----------
+
+ * Added method `cancel()` to `ResponseInterface`
+ * The `$parser` argument of `ControllerResolver::__construct()` and `DelegatingLoader::__construct()`
+   has been removed.
+ * The `ControllerResolver` and `DelegatingLoader` classes have been made `final`.
+ * The `controller_name_converter` and `resolve_controller_name_subscriber` services have been removed.
 
 HttpFoundation
 --------------
@@ -238,6 +286,7 @@ HttpKernel
  * Removed `GetResponseForExceptionEvent`, use `ExceptionEvent` instead
  * Removed `PostResponseEvent`, use `TerminateEvent` instead
  * Removed `TranslatorListener` in favor of `LocaleAwareListener`
+ * The `DebugHandlersListener` class has been made `final`
 
 Intl
 ----
@@ -252,12 +301,19 @@ Messenger
 ---------
 
  * The `LoggingMiddleware` class has been removed, pass a logger to `SendMessageMiddleware` instead.
+ * Passing a `ContainerInterface` instance as first argument of the `ConsumeMessagesCommand` constructor now
+   throws as `\TypeError`, pass a `RoutableMessageBus`  instance instead.
 
 Monolog
 -------
 
  * The methods `DebugProcessor::getLogs()`, `DebugProcessor::countErrors()`, `Logger::getLogs()` and `Logger::countErrors()` have a new `$request` argument.
 
+MonologBridge
+--------------
+
+* The `RouteProcessor` class is final.
+
 Process
 -------
 
@@ -289,6 +345,7 @@ Routing
 Security
 --------
 
+ * Implementations of `PasswordEncoderInterface` and `UserPasswordEncoderInterface` must have a new `needsRehash()` method
  * The `Role` and `SwitchUserRole` classes have been removed.
  * The `getReachableRoles()` method of the `RoleHierarchy` class has been removed. It has been replaced by the new
    `getReachableRoleNames()` method.
@@ -389,13 +446,15 @@ TwigBundle
 TwigBridge
 ----------
 
+ * Removed argument `$rootDir` from the `DebugCommand::__construct()` method and the 5th argument must be an instance of `FileLinkFormatter`
  * removed the `$requestStack` and `$requestContext` arguments of the 
    `HttpFoundationExtension`, pass a `Symfony\Component\HttpFoundation\UrlHelper`
    instance as the only argument instead
 
 Validator
 --------
 
+ * An `ExpressionLanguage` instance or null must be passed as the first argument of `ExpressionValidator::__construct()`
  * The `checkMX` and `checkHost` options of the `Email` constraint were removed
  * The `Email::__construct()` 'strict' property has been removed. Use 'mode'=>"strict" instead.
  * Calling `EmailValidator::__construct()` method with a boolean parameter has been removed, use `EmailValidator("strict")` instead.

diff --git a/composer.json b/composer.json
@@ -111,6 +111,7 @@
         "monolog/monolog": "~1.11",
         "nyholm/psr7": "^1.0",
         "ocramius/proxy-manager": "^2.1",
+        "php-http/httplug": "^1.0|^2.0",
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
@@ -154,7 +155,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "4.3-dev"
+            "dev-master": "4.4-dev"
         }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.4.0
+-----
+
+ * added `DoctrineClearEntityManagerMiddleware`
+
+
 4.3.0
 -----
 

diff --git a/src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Messenger;
+
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+
+/**
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ *
+ * @internal
+ */
+abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
+{
+    protected $managerRegistry;
+    protected $entityManagerName;
+
+    public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
+    {
+        $this->managerRegistry = $managerRegistry;
+        $this->entityManagerName = $entityManagerName;
+    }
+
+    final public function handle(Envelope $envelope, StackInterface $stack): Envelope
+    {
+        try {
+            $entityManager = $this->managerRegistry->getManager($this->entityManagerName);
+        } catch (\InvalidArgumentException $e) {
+            throw new UnrecoverableMessageHandlingException($e->getMessage(), 0, $e);
+        }
+
+        return $this->handleForManager($entityManager, $envelope, $stack);
+    }
+
+    abstract protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope;
+}
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerMiddleware.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Messenger;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+
+/**
+ * Clears entity manager after calling all handlers.
+ *
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+class DoctrineClearEntityManagerMiddleware extends AbstractDoctrineMiddleware
+{
+    protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
+    {
+        try {
+            return $stack->next()->handle($envelope, $stack);
+        } finally {
+            $entityManager->clear();
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineCloseConnectionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineCloseConnectionMiddleware.php
@@ -11,10 +11,8 @@
 
 namespace Symfony\Bridge\Doctrine\Messenger;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
-use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Middleware\StackInterface;
 
 /**
@@ -24,28 +22,10 @@
  *
  * @experimental in 4.3
  */
-class DoctrineCloseConnectionMiddleware implements MiddlewareInterface
+class DoctrineCloseConnectionMiddleware extends AbstractDoctrineMiddleware
 {
-    private $managerRegistry;
-    private $entityManagerName;
-
-    public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
-    {
-        $this->managerRegistry = $managerRegistry;
-        $this->entityManagerName = $entityManagerName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Envelope $envelope, StackInterface $stack): Envelope
+    protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
     {
-        try {
-            $entityManager = $this->managerRegistry->getManager($this->entityManagerName);
-        } catch (\InvalidArgumentException $e) {
-            throw new UnrecoverableMessageHandlingException($e->getMessage(), 0, $e);
-        }
-
         try {
             $connection = $entityManager->getConnection();