minor #24638 Improving annotation loader message (weaverryan)

fabpot · fabpot · commit c3617bd0b9a0 · 2017-10-19T16:29:58.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- Improving annotation loader message | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | not needed This is the error that happens with Flex when you try to load annotation routes, but you don't have annotations installed/enabled yet. Fabien created this error message to help with this exact situation. For Flex users, the real solution is to run `composer require annotation`. This at least *somewhat* hints that even better. Commits ------- ce4cf47 Improving annotation loader message
diff --git a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
@@ -64,7 +64,7 @@ public function __construct($resource, $sourceResource = null, $code = null, $pr
         } elseif (null !== $type) {
             // maybe there is no loader for this specific type
             if ('annotation' === $type) {
-                $message .= ' Make sure annotations are enabled.';
+                $message .= ' Make sure annotations are installed and enabled.';
             } else {
                 $message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type);
             }
diff --git a/src/Symfony/Component/Config/Tests/Exception/FileLoaderLoadExceptionTest.php b/src/Symfony/Component/Config/Tests/Exception/FileLoaderLoadExceptionTest.php
@@ -31,7 +31,7 @@ public function testMessageCannotLoadResourceWithType()
     public function testMessageCannotLoadResourceWithAnnotationType()
     {
         $exception = new FileLoaderLoadException('resource', null, null, null, 'annotation');
-        $this->assertEquals('Cannot load resource "resource". Make sure annotations are enabled.', $exception->getMessage());
+        $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage());
     }
 
     public function testMessageCannotImportResourceFromSource()

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function __construct($resource, $sourceResource = null, $code = null, $pr`
`64`	`64`	`} elseif (null !== $type) {`
`65`	`65`	`// maybe there is no loader for this specific type`
`66`	`66`	`if ('annotation' === $type) {`
`67`		`- $message .= ' Make sure annotations are enabled.';`
	`67`	`+ $message .= ' Make sure annotations are installed and enabled.';`
`68`	`68`	`} else {`
`69`	`69`	`$message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testMessageCannotLoadResourceWithType()`
`31`	`31`	`public function testMessageCannotLoadResourceWithAnnotationType()`
`32`	`32`	`{`
`33`	`33`	`$exception = new FileLoaderLoadException('resource', null, null, null, 'annotation');`
`34`		`- $this->assertEquals('Cannot load resource "resource". Make sure annotations are enabled.', $exception->getMessage());`
	`34`	`+ $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testMessageCannotImportResourceFromSource()`