Merge branch '5.2' into 5.x

* 5.2:
  [PhpUnitBridge] CS fix
  [Notifier] Only use sprintf instead of sprintf and string concat
  [PhpUnitBridge] Fix PHP 5.5 compatibility
  Fix exception thrown by Form when converting UUID
  [Notifier] Remove trailing argument in tests
  [Serializer] Make fabbot happy with 5.2 tests CS
  Add missing param annotation abouts $fileLinkFormat
  [HttpClient] Use decoration instead of class replacement for mock factory
  [Form] Fixed StringUtil::trim() to trim ZERO WIDTH SPACE (U+200B) and SOFT HYPHEN (U+00AD)
  23412 Stop treating multiline resources as globs

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -2072,8 +2072,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         }
 
         if ($responseFactoryId = $config['mock_response_factory'] ?? null) {
-            $container->getDefinition($httpClientId)
-                ->setClass(MockHttpClient::class)
+            $container->register($httpClientId.'.mock_client', MockHttpClient::class)
+                ->setDecoratedService($httpClientId, null, -10) // lower priority than TraceableHttpClient
                 ->setArguments([new Reference($responseFactoryId)]);
         }
     }

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1629,14 +1629,15 @@ public function testHttpClientMockResponseFactory()
     {
         $container = $this->createContainerFromFile('http_client_mock_response_factory');
 
-        $definition = $container->getDefinition('http_client');
+        $definition = $container->getDefinition('http_client.mock_client');
 
         $this->assertSame(MockHttpClient::class, $definition->getClass());
         $this->assertCount(1, $definition->getArguments());
 
         $argument = $definition->getArgument(0);
 
         $this->assertInstanceOf(Reference::class, $argument);
+        $this->assertSame('http_client', current($definition->getDecoratedService()));
         $this->assertSame('my_response_factory', (string) $argument);
     }