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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FrameworkBundle] Fix Routing\DelegatingLoader #24304

Merged
merged 1 commit into from Sep 25, 2017

Conversation

Projects
None yet
4 participants
@nicolas-grekas
Member

nicolas-grekas commented Sep 24, 2017

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

Spotted while reviewing: the default controller is not always a string, so parsing should only be done conditionally.

@@ -85,7 +85,7 @@ public function load($resource, $type = null)
$this->loading = false;
foreach ($collection->all() as $route) {
if (!$controller = $route->getDefault('_controller')) {
if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {

This comment has been minimized.

@fabpot

fabpot Sep 24, 2017

Member

Worth a test :)

@fabpot

fabpot Sep 24, 2017

Member

Worth a test :)

This comment has been minimized.

@nicolas-grekas

nicolas-grekas Sep 24, 2017

Member

test added

@nicolas-grekas

nicolas-grekas Sep 24, 2017

Member

test added

@nicolas-grekas nicolas-grekas merged commit a69c1b2 into symfony:2.7 Sep 25, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details

nicolas-grekas added a commit that referenced this pull request Sep 25, 2017

bug #24304 [FrameworkBundle] Fix Routing\DelegatingLoader (nicolas-gr…
…ekas)

This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Fix Routing\DelegatingLoader

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Spotted while reviewing: the default controller is not always a string, so parsing should only be done conditionally.

Commits
-------

a69c1b2 [FrameworkBundle] Fix Routing\DelegatingLoader

@nicolas-grekas nicolas-grekas deleted the nicolas-grekas:fix-delegating-loader branch Sep 25, 2017

This was referenced Oct 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment