minor #22153 [DX] [DI] Throw more helpful error when shortcutting global classes (curry684)

fabpot · fabpot · commit 3cd563ad00d2 · 2017-03-27T07:02:28.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DX] [DI] Throw more helpful error when shortcutting global classes | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? |no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22146 | License | MIT As discussed in #22146 the error message received when trying to use a class in the global namespace as a service without defined class is confusing. Helpful information was added pointing out this current limitation. Commits ------- b9e7b4f [DependencyInjection] Throw helpful error when shortcutting global classes
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -48,6 +48,15 @@ public function process(ContainerBuilder $container)
                 if ($definition->getFactory()) {
                     throw new RuntimeException(sprintf('Please add the class to service "%s" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $id));
                 }
+                if (class_exists($id) || interface_exists($id, false)) {
+                    throw new RuntimeException(sprintf(
+                         'The definition for "%s" has no class attribute, and appears to reference a '
+                        .'class or interface in the global namespace. Leaving out the "class" attribute '
+                        .'is only allowed for namespaced classes. Please specify the class attribute '
+                        .'explicitly to get rid of this error.',
+                        $id
+                    ));
+                }
 
                 throw new RuntimeException(sprintf(
                     'The definition for "%s" has no class. If you intend to inject '
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1047,7 +1047,7 @@ public function testClassFromId()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage The definition for "DateTime" has no class.
+     * @expectedExceptionMessage The definition for "DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.
      */
     public function testNoClassFromGlobalNamespaceClassId()
     {

Original file line number	Diff line number	Diff line change
`@@ -1047,7 +1047,7 @@ public function testClassFromId()`
`1047`	`1047`
`1048`	`1048`	`/**`
`1049`	`1049`	`* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException`
`1050`		`- * @expectedExceptionMessage The definition for "DateTime" has no class.`
	`1050`	`+ * @expectedExceptionMessage The definition for "DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.`
`1051`	`1051`	`*/`
`1052`	`1052`	`public function testNoClassFromGlobalNamespaceClassId()`
`1053`	`1053`	`{`