Merge branch '4.2'

* 4.2:
  fix cs
  [FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed
  [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings
  Added upgrade to HandlersLocator
  fix type for $value in DocBlock
  [WebProfilerBundle] Fix title case
  [Config] fix path exclusion during glob discovery
  [FrameworkBundle][Messenger] Restore check for messenger serializer default id
  Fix wrapped loop of event listener
  [DI] fix edge case in InlineServiceDefinitionsPass
  undeprecate the single-colon notation for controllers
  Update HttpKernel.php

Author: nicolas-grekas

Compiler/InlineServiceDefinitionsPass.php

@@ -164,6 +164,10 @@ private function isInlineableDefinition($id, Definition $definition)
             return false;
         }
 
+        if (!$this->graph->hasNode($id)) {
+            return true;
+        }
+
         if (!$definition->isShared()) {
             foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
                 $srcId = $edge->getSourceNode()->getId();
@@ -180,10 +184,6 @@ private function isInlineableDefinition($id, Definition $definition)
             return false;
         }
 
-        if (!$this->graph->hasNode($id)) {
-            return true;
-        }
-
         if ($this->currentId == $id) {
             return false;
         }

Tests/Loader/FileLoaderTest.php

@@ -18,7 +18,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\FileLoader;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
@@ -217,32 +216,20 @@ public function testRegisterClassesWithBadPrefix()
     }
 
     /**
-     * @dataProvider getIncompatibleExcludeTests
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (yaml/*) is a subset of the "resource" pattern (Prototype/*)
      */
-    public function testRegisterClassesWithIncompatibleExclude($resourcePattern, $excludePattern)
+    public function testRegisterClassesWithIncompatibleExclude()
     {
         $container = new ContainerBuilder();
         $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
 
-        try {
-            $loader->registerClasses(
-                new Definition(),
-                'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
-                $resourcePattern,
-                $excludePattern
-            );
-        } catch (InvalidArgumentException $e) {
-            $this->assertEquals(
-                sprintf('Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s)', $excludePattern, $resourcePattern),
-                $e->getMessage()
-            );
-        }
-    }
-
-    public function getIncompatibleExcludeTests()
-    {
-        yield array('Prototype/*', 'yaml/*', false);
-        yield array('Prototype/OtherDir/*', 'Prototype/*', false);
+        $loader->registerClasses(
+            new Definition(),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
+            'Prototype/*',
+            'yaml/*'
+        );
     }
 }