[Routing] don't process classes with the directory loader #25231

xabbuh · 2017-11-30T20:21:31Z

Q	A
Branch?	3.4
Bug fix?	yes
New feature?	no
BC breaks?	no
Deprecations?	no
Tests pass?	yes
Fixed tickets	#25225
License	MIT
Doc PR

dmaicher · 2017-11-30T20:26:12Z

src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php

+        }
+
+        // classes are handled by the AnnotationClassLoader
+        if (preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource)) {


wondering why it worked on 3.3 without this? Was the order of the loaders different?

Actually, I think we really need to make the change in 3.3. The observed behaviour seems to be caused by #25113 which just was not part of a patch release of 3.3 yet.

Ah ok I see 😉

Can't we do a class_exists call to see if $resource is a class instead?

nicolas-grekas · 2017-11-30T20:58:55Z

What about changing the priority of the loaders instead?

xabbuh · 2017-11-30T21:09:49Z

@nicolas-grekas I think the root issue is that paths are different when supports() and load() are called. The reason is that the FileLoader resolves paths relative to the current dir after supports() but before load() is called.

xabbuh · 2017-11-30T21:23:09Z

@nicolas-grekas I have pushed a second commit which could be the solution. Basically, it reverts the changes done in #25113 and does the resource resolving inside the FileLoader if resolving the loader fails. This should ensure that the supports() method receives the same resource as the load() method later.

nicolas-grekas · 2017-11-30T21:45:37Z

src/Symfony/Component/Config/Loader/FileLoader.php

+                $resource = $this->getLocator()->locate($resource, $this->currentDir, false);
+                $resource = is_array($resource) ? $resource[0] : $resource;
+                $loader = $this->resolve($resource, $type);
+            }

            if ($loader instanceof self && null !== $this->currentDir) {


removed from the try block

nicolas-grekas · 2017-12-01T10:32:10Z

Red :)

dmaicher · 2017-12-01T10:36:45Z

src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php

-        }
-
-        if ($type || !is_string($resource)) {
+        if (!is_string($resource)) {


can be

if (!is_string($resource) || $type && 'annotation' !== $type) {

and then no need to change the try block below?

nicolas-grekas · 2017-12-01T12:24:05Z

I think we shouldn't go down this road: this changes the locator to be fetched from "$loader" vs "$this" in some cases, and this is too risky for the base FileLoader IMHO.
I would revert to the first version of the patch, which excluded FQCN.
to make it a bit more strict and less likely to break, I would also suggest to exclude only if the resource contains a \ and to add a class_exists check in AnnotationClassLoader::supports.

nicolas-grekas · 2017-12-04T11:07:38Z

src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php

+        }
+
+        // classes are handled by the AnnotationClassLoader
+        if (strpos($resource, '\\') || class_exists($resource)) {


false !== strpos to accurately mirror what's done in AnnotationClassLoader?

stof · 2017-12-04T11:11:15Z

src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php

+        }
+
+        // classes are handled by the AnnotationClassLoader
+        if (false !== strpos($resource, '\\') || class_exists($resource)) {


that's not good. Importing %kernel.project_dir%/src/Controller will have backslashes in it on Windows AFAICT.

so we should add the regexp check also

nicolas-grekas · 2017-12-04T12:01:41Z

src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php

@@ -76,6 +76,15 @@ function (\SplFileInfo $current) {
     */
    public function supports($resource, $type = null)
    {
+        if ($type && 'annotation' !== $type) {


replaces the checks below, so they could be removed, but misses the is_string($resource) one

nicolas-grekas · 2017-12-04T13:30:02Z

there is something strange:
in FrameworkExtension

AnnotatedRouteControllerLoader
AnnotationDirectoryLoader
AnnotationFileLoader

they're registered with priority -10, in this order
I'd expect the issue to not exist
because AnnotatedRouteControllerLoader (=AnnotationClasLoader) is first

related to "sort" which is not "stable" anymore since 7.0? maybe that's a better place for a fix, making this sorting stable?

stof · 2017-12-04T13:36:39Z

@nicolas-grekas could it be related to SensioFrameworkExtraBundle loaders having a different priority ?

xabbuh · 2017-12-04T13:52:38Z

The order in FrameworkExtraBundle is different:

AnnotationDirectoryLoader
AnnotationFileLoader
AnnotatedRouteControllerLoader

xabbuh · 2017-12-04T13:58:51Z

So, should we maybe just change the order of the services in SensioFrameworkExtraBundle instead?

nicolas-grekas · 2017-12-04T14:00:01Z

we should for sure, for consistency at least!

xabbuh · 2017-12-04T14:14:30Z

sensiolabs/SensioFrameworkExtraBundle#537

xabbuh added this to the 3.4 milestone Nov 30, 2017

carsonbot added Status: Needs Review Routing Bug labels Nov 30, 2017

This was referenced Nov 30, 2017

[Routing] Failed loading route resource by FQCN #25225

Closed

[Symfony 3.4] Issue with yaml routes FriendsOfSymfony/FOSRestBundle#1804

Closed

dmaicher reviewed Nov 30, 2017

View reviewed changes

xabbuh force-pushed the issue-25225 branch from cdac6ca to ce55704 Compare November 30, 2017 20:29

xabbuh changed the base branch from 3.4 to 3.3 November 30, 2017 20:29

xabbuh modified the milestones: 3.4, 3.3 Nov 30, 2017

nicolas-grekas reviewed Nov 30, 2017

View reviewed changes

xabbuh force-pushed the issue-25225 branch from eda9099 to f2ce58e Compare November 30, 2017 21:52

dmaicher reviewed Dec 1, 2017

View reviewed changes

xabbuh force-pushed the issue-25225 branch from f2ce58e to 367826c Compare December 4, 2017 10:57

nicolas-grekas reviewed Dec 4, 2017

View reviewed changes

xabbuh force-pushed the issue-25225 branch from 367826c to 58d5aea Compare December 4, 2017 11:09

stof reviewed Dec 4, 2017

View reviewed changes

nicolas-grekas reviewed Dec 4, 2017

View reviewed changes

xabbuh force-pushed the issue-25225 branch from 58d5aea to 6ac6a37 Compare December 4, 2017 12:58

don't process classes with the directory loader

fe8620f

xabbuh force-pushed the issue-25225 branch from 6ac6a37 to fe8620f Compare December 4, 2017 13:07

xabbuh closed this Dec 4, 2017

xabbuh deleted the issue-25225 branch December 4, 2017 14:14

mRoca mentioned this pull request Dec 11, 2017

[Routing] BC break on the annotated route loading #25436

Closed

Uh oh!

[Routing] don't process classes with the directory loader #25231

[Routing] don't process classes with the directory loader #25231

Uh oh!

Conversation

xabbuh commented Nov 30, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicolas-grekas commented Nov 30, 2017

Uh oh!

xabbuh commented Nov 30, 2017

Uh oh!

xabbuh commented Nov 30, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicolas-grekas commented Dec 1, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicolas-grekas commented Dec 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicolas-grekas commented Dec 4, 2017

Uh oh!

stof commented Dec 4, 2017

Uh oh!

xabbuh commented Dec 4, 2017

Uh oh!

xabbuh commented Dec 4, 2017

Uh oh!

nicolas-grekas commented Dec 4, 2017

Uh oh!

xabbuh commented Dec 4, 2017

Uh oh!

Uh oh!

nicolas-grekas commented Dec 1, 2017 •

edited

Loading