Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

[Routing] Fixed the importing of files using glob patterns that match multiple resources#26600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
skalpa wants to merge3 commits intosymfony:3.4fromskalpa:22160-fix-glob-in-routing

Conversation

@skalpa
Copy link
Contributor

@skalpaskalpa commentedMar 19, 2018
edited by nicolas-grekas
Loading

QA
Branch?3.4
Bug fix?yes
New feature?no
BC breaks?no
Deprecations?no
Tests pass?yes
Fixed tickets#22160
LicenseMIT
Doc PRn/a

This fixes the import of resources specified using glob patterns inXmlFileLoader andYamlFileLoader.

@nicolas-grekas This supersedes#25633 that's been in limbo since December despite your comments, so I decided to take care of it as I need this to work. I took care of the two loaders that are affected, and added tests.

@skalpa
Copy link
ContributorAuthor

Failures are unrelated.

Also, I didn't know which branch to target: the source of the problem is a change inSymfony\Component\Config\Loader\FileLoader on the 3.3 branch, however in theory one could use v3.3+ of the config component with an older version of the routing component... so I left it against 3.4 for now but can rebase to an older branch if you tell me which one.

@nicolas-grekasnicolas-grekas changed the title[Routing] Fixed the importing of files using glob patterns that match…[Routing] Fixed the importing of files using glob patterns that match multiple resourcesMar 19, 2018
@nicolas-grekasnicolas-grekas added this to the3.4 milestoneMar 19, 2018
@nicolas-grekas
Copy link
Member

@skalpa thank you. Branch 3.4 is the good one. I thinkRoutingConfigurator also need a similar update (but not exact same logic: the$subCollection need to contain all the routes before passing it to theImportConfigurator instance, you'll see.

@skalpa
Copy link
ContributorAuthor

@nicolas-grekas I took care ofRoutingConfigurator too, thanks for pointing that out.

$collection = $routes->collection();

$collection->add('bar_route', '/bar')
->defaults(['_controller' => 'AppBundle:Bar:view']);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

array() instead of[] (same below, see fabbot patch)

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Sorry, old habits. Fixed.

@nicolas-grekas
Copy link
Member

Thank you@skalpa.

nicolas-grekas added a commit that referenced this pull requestMar 22, 2018
… that match multiple resources (skalpa)This PR was squashed before being merged into the 3.4 branch (closes#26600).Discussion----------[Routing] Fixed the importing of files using glob patterns that match multiple resources| Q             | A| ------------- | ---| Branch?       | 3.4| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |#22160| License       | MIT| Doc PR        | n/aThis fixes the import of resources specified using glob patterns in `XmlFileLoader` and `YamlFileLoader`.@nicolas-grekas This supersedes#25633 that's been in limbo since December despite your comments, so I decided to take care of it as I need this to work. I took care of the two loaders that are affected, and added tests.Commits-------948b4cf [Routing] Fixed the importing of files using glob patterns that match multiple resources
This was referencedApr 3, 2018
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@nicolas-grekasnicolas-grekasnicolas-grekas approved these changes

Assignees

No one assigned

Projects

None yet

Milestone

3.4

Development

Successfully merging this pull request may close these issues.

3 participants

@skalpa@nicolas-grekas@carsonbot

[8]ページ先頭

©2009-2025 Movatter.jp