Merge branch '4.4'

* 4.4: (43 commits) [PhpunitBridge] Read environment variable from superglobals [Bridge/PhpUnit] Fix PHP5.5 compat [PhpUnitBridge] More accurate grouping fixed CS [Form] remove comment about to-be-removed method as it is used in master by ButtonBuilder Extract unrecoverable exception to interface [FrameworkBundle] Fix calling Client::getProfile() before sending a request Fix type error [Security/Core] require libsodium >= 1.0.14 [Workflow] re-add workflow.definition tag to workflow services [Security/Core] Don't use ParagonIE_Sodium_Compat revert #30525 due to performance penalty collect called listeners information only once [Lock] fix missing inherit docs in RedisStore [Messenger] fix retrying handlers using DoctrineTransactionMiddleware [Mailgun Mailer] fixed issue when using html body [Messenger] make all stamps final and mark stamp not meant to be sent [HttpClient] fix timing measurements with NativeHttpClient add return type declaration use proper return types in ErrorHandler and ArgumentResolver ...
symfony · TerjeBr · Jun 25, 2019 · Jun 25, 2019 · Jun 26, 2019 · Jun 26, 2019
commit f8ccc8105c64ca0aafab4bf7d5b49fea8a19ae19
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -41,6 +41,11 @@ DependencyInjection
        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
 ---------------
 

diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -146,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

diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -138,6 +138,9 @@ private function sanitizeQuery($connectionName, $query)
         if (!\is_array($query['params'])) {
             $query['params'] = [$query['params']];
         }
+        if (!\is_array($query['types'])) {
+            $query['types'] = [];
+        }
         foreach ($query['params'] as $j => $param) {
             if (isset($query['types'][$j])) {
                 // Transform the param according to the type

diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
@@ -13,7 +13,9 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Symfony\Component\Messenger\Middleware\StackInterface;
+use Symfony\Component\Messenger\Stamp\HandledStamp;
 
 /**
  * Wraps all handlers in a single doctrine transaction.
@@ -36,6 +38,12 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
         } catch (\Throwable $exception) {
             $entityManager->getConnection()->rollBack();
 
+            if ($exception instanceof HandlerFailedException) {
+                // Remove all HandledStamp from the envelope so the retry will execute all handlers again.
+                // When a handler fails, the queries of allegedly successful previous handlers just got rolled back.
+                throw new HandlerFailedException($exception->getEnvelope()->withoutAll(HandledStamp::class), $exception->getNestedExceptions());
+            }
+
             throw $exception;
         }
     }

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -102,6 +102,18 @@ public function testCollectQueryWithNoParams()
         $this->assertTrue($collectedQueries['default'][1]['explainable']);
     }
 
+    public function testCollectQueryWithNoTypes()
+    {
+        $queries = [
+            ['sql' => 'SET sql_mode=(SELECT REPLACE(@@sql_mode, \'ONLY_FULL_GROUP_BY\', \'\'))', 'params' => [], 'types' => null, 'executionMS' => 1],
+        ];
+        $c = $this->createCollector($queries);
+        $c->collect(new Request(), new Response());
+
+        $collectedQueries = $c->getQueries();
+        $this->assertSame([], $collectedQueries['default'][0]['types']);
+    }
+
     public function testReset()
     {
         $queries = [

diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -134,10 +134,13 @@ public function handleError($type, $msg, $file, $line, $context = [])
                 $group = 'unsilenced';
             } elseif ($deprecation->isLegacy(self::$utilPrefix)) {
                 $group = 'legacy';
-                } elseif (!$deprecation->isSelf()) {
-                $group = $deprecation->isIndirect() ? 'remaining indirect' : 'remaining direct';
             } else {
-                $group = 'remaining self';
+                $group = [
+                    Deprecation::TYPE_SELF => 'remaining self',
+                    Deprecation::TYPE_DIRECT => 'remaining direct',
+                    Deprecation::TYPE_INDIRECT => 'remaining indirect',
+                    Deprecation::TYPE_UNDETERMINED => 'other',
+                ][$deprecation->getType()];
             }
 
             if ($this->getConfiguration()->shouldDisplayStackTrace($msg)) {
@@ -211,7 +214,13 @@ private function getConfiguration()
             return $this->configuration;
         }
         if (false === $mode = $this->mode) {
-            $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
+            if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER'])) {
+                $mode = $_SERVER['SYMFONY_DEPRECATIONS_HELPER'];
+            } elseif (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER'])) {
+                $mode = $_ENV['SYMFONY_DEPRECATIONS_HELPER'];
+            } else {
+                $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
+            }
         }
         if ('strict' === $mode) {
             return $this->configuration = Configuration::inStrictMode();

diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -18,6 +18,15 @@
  */
 class Deprecation
 {
+    const PATH_TYPE_VENDOR = 'path_type_vendor';
+    const PATH_TYPE_SELF = 'path_type_internal';
+    const PATH_TYPE_UNDETERMINED = 'path_type_undetermined';
+
+    const TYPE_SELF = 'type_self';
+    const TYPE_DIRECT = 'type_direct';
+    const TYPE_INDIRECT = 'type_indirect';
+    const TYPE_UNDETERMINED = 'type_undetermined';
+
     /**
      * @var array
      */
@@ -39,13 +48,21 @@ class Deprecation
     private $originMethod;
 
     /**
-     * @var bool
+     * @var string one of the PATH_TYPE_* constants
      */
-    private $self;
+    private $triggeringFilePathType;
 
     /** @var string[] absolute paths to vendor directories */
     private static $vendors;
 
+    /**
+     * @var string[] absolute paths to source or tests of the project. This
+     *               excludes cache directories, because it is based on
+     *               autoloading rules and cache systems typically do not use
+     *               those.
+     */
+    private static $internalPaths;
+
     /**
      * @param string $message
      * @param string $file
@@ -59,7 +76,7 @@ public function __construct($message, array $trace, $file)
             // No-op
         }
         $line = $trace[$i];
-        $this->self = !$this->pathOriginatesFromVendor($file);
+        $this->trigerringFilePathType = $this->getPathType($file);
         if (isset($line['object']) || isset($line['class'])) {
             if (isset($line['class']) && 0 === strpos($line['class'], SymfonyTestsListenerFor::class)) {
                 $parsedMsg = unserialize($this->message);
@@ -70,8 +87,9 @@ public function __construct($message, array $trace, $file)
                 // \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
                 // then we need to use the serialized information to determine
                 // if the error has been triggered from vendor code.
-                $this->self = isset($parsedMsg['triggering_file'])
-                    && $this->pathOriginatesFromVendor($parsedMsg['triggering_file']);
+                if (isset($parsedMsg['triggering_file'])) {
+                    $this->trigerringFilePathType = $this->getPathType($parsedMsg['triggering_file']);
+                }
 
                 return;
             }
@@ -101,14 +119,6 @@ public function originatesFromAnObject()
         return isset($this->originClass);
     }
 
-    /**
-     * @return bool
-     */
-    public function isSelf()
-    {
-        return $this->self;
-    }
-
     /**
      * @return string
      */
@@ -163,10 +173,16 @@ public function isLegacy($utilPrefix)
      * Tells whether both the calling package and the called package are vendor
      * packages.
      *
-     * @return bool
+     * @return string
      */
-    public function isIndirect()
+    public function getType()
     {
+        if (self::PATH_TYPE_SELF === $this->trigerringFilePathType) {
+            return self::TYPE_SELF;
+        }
+        if (self::PATH_TYPE_UNDETERMINED === $this->trigerringFilePathType) {
+            return self::TYPE_UNDETERMINED;
+        }
         $erroringFile = $erroringPackage = null;
         foreach ($this->trace as $line) {
             if (\in_array($line['function'], ['require', 'require_once', 'include', 'include_once'], true)) {
@@ -179,25 +195,28 @@ public function isIndirect()
             if ('-' === $file || 'Standard input code' === $file || !realpath($file)) {
                 continue;
             }
-            if (!$this->pathOriginatesFromVendor($file)) {
-                return false;
+            if (self::PATH_TYPE_SELF === $this->getPathType($file)) {
+                return self::TYPE_DIRECT;
+            }
+            if (self::PATH_TYPE_UNDETERMINED === $this->getPathType($file)) {
+                return self::TYPE_UNDETERMINED;
             }
             if (null !== $erroringFile && null !== $erroringPackage) {
                 $package = $this->getPackage($file);
                 if ('composer' !== $package && $package !== $erroringPackage) {
-                    return true;
+                    return self::TYPE_INDIRECT;
                 }
                 continue;
             }
             $erroringFile = $file;
             $erroringPackage = $this->getPackage($file);
         }
 
-        return false;
+        return self::TYPE_DIRECT;
     }
 
     /**
-     * pathOriginatesFromVendor() should always be called prior to calling this method.
+     * getPathType() should always be called prior to calling this method.
      *
      * @param string $path
      *
@@ -237,6 +256,15 @@ private static function getVendors()
                     $v = \dirname(\dirname($r->getFileName()));
                     if (file_exists($v.'/composer/installed.json')) {
                         self::$vendors[] = $v;
+                        $loader = require $v.'/autoload.php';
+                        $paths = self::getSourcePathsFromPrefixes(array_merge($loader->getPrefixes(), $loader->getPrefixesPsr4()));
+                    }
+                }
+            }
+            foreach ($paths as $path) {
+                foreach (self::$vendors as $vendor) {
+                    if (0 !== strpos($path, $vendor)) {
+                        self::$internalPaths[] = $path;
                     }
                 }
             }
@@ -245,24 +273,41 @@ private static function getVendors()
         return self::$vendors;
     }
 
+    private static function getSourcePathsFromPrefixes(array $prefixesByNamespace)
+    {
+        foreach ($prefixesByNamespace as $prefixes) {
+            foreach ($prefixes as $prefix) {
+                if (false !== realpath($prefix)) {
+                    yield realpath($prefix);
+                }
+            }
+        }
+    }
+
     /**
      * @param string $path
      *
-     * @return bool
+     * @return string
      */
-    private function pathOriginatesFromVendor($path)
+    private function getPathType($path)
     {
         $realPath = realpath($path);
         if (false === $realPath && '-' !== $path && 'Standard input code' !== $path) {
-            return true;
+            return self::PATH_TYPE_UNDETERMINED;
         }
         foreach (self::getVendors() as $vendor) {
             if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
-                return true;
+                return self::PATH_TYPE_VENDOR;
             }
         }
 
-        return false;
+        foreach (self::$internalPaths as $internalPath) {
+            if (0 === strpos($realPath, $internalPath)) {
+                return self::PATH_TYPE_SELF;
+            }
+        }
+
+        return self::PATH_TYPE_UNDETERMINED;
     }
 
     /**
@@ -281,19 +326,4 @@ public function toString()
         "\n".str_replace(' '.getcwd().\DIRECTORY_SEPARATOR, ' ', $exception->getTraceAsString()).
         "\n";
     }
-
-    private function getPackageFromLine(array $line)
-    {
-        if (!isset($line['file'])) {
-            return 'internal function';
-        }
-        if (!$this->pathOriginatesFromVendor($line['file'])) {
-            return 'source code';
-        }
-        try {
-            return $this->getPackage($line['file']);
-        } catch (\RuntimeException $e) {
-            return 'unknown';
-        }
-    }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -27,7 +27,7 @@ public function testItCanDetermineTheClassWhereTheDeprecationHappened()
     public function testItCanTellWhetherItIsInternal()
     {
         $deprecation = new Deprecation('💩', $this->debugBacktrace(), __FILE__);
-        $this->assertTrue($deprecation->isSelf());
+        $this->assertSame(Deprecation::TYPE_SELF, $deprecation->getType());
     }
 
     public function testLegacyTestMethodIsDetectedAsSuch()
@@ -46,7 +46,7 @@ public function testItCanBeConvertedToAString()
     public function testItRulesOutFilesOutsideVendorsAsIndirect()
     {
         $deprecation = new Deprecation('💩', $this->debugBacktrace(), __FILE__);
-        $this->assertFalse($deprecation->isIndirect());
+        $this->assertNotSame(Deprecation::TYPE_INDIRECT, $deprecation->getType());
     }
 
     /**

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -73,15 +73,13 @@ Unsilenced deprecation notices (3)
   1x: unsilenced bar deprecation
     1x in FooTestCase::testNonLegacyBar
 
-Remaining self deprecation notices (1)
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
 Legacy deprecation notices (1)
 
-Other deprecation notices (1)
+Other deprecation notices (2)
 
   1x: root deprecation
 
+  1x: silenced bar deprecation
+    1x in FooTestCase::testNonLegacyBar
+
 I get precedence over any exit statements inside the deprecation error handler.
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test DeprecationErrorHandler in weak mode
+Test DeprecationErrorHandler in disabled mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
+$_SERVER['SYMFONY_DEPRECATIONS_HELPER'] = 'disabled';
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test DeprecationErrorHandler in disabled mode (via putenv)
+--FILE--
+<?php
+
+$_ENV['SYMFONY_DEPRECATIONS_HELPER'] = 'disabled';
+putenv('ANSICON');
+putenv('ConEmuANSI');
+putenv('TERM');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = dirname($vendor);
+}
+define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
+require PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__.'/../../bootstrap.php';
+
+echo (int) set_error_handler('var_dump');
+echo (int) class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler', false);
+
+?>
+--EXPECTF--
+00
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,11 @@ DependencyInjection @@
            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
     ---------------
@@ Expand Down @@