Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove workarounds for Symfony limitations that have been fixed.

8.0.x
Larry Garfield 2012-09-28 11:55:12 -05:00 committed by effulgentsia
parent e2f99d4ec8
commit 854a48bf6b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Drupal/Core/Routing/MatcherDumper.php
View File

@ -111,12 +111,7 @@ class MatcherDumper implements MatcherDumperInterface {
'pattern' => $compiled->getPattern(), 'pattern' => $compiled->getPattern(),
'pattern_outline' => $compiled->getPatternOutline(), 'pattern_outline' => $compiled->getPatternOutline(),
'number_parts' => $compiled->getNumParts(), 'number_parts' => $compiled->getNumParts(),
// This is only temporary. We need to strip off the compiled route from 'route' => serialize($route),
// route object in order to serialize it. Cloning strips off the
// compiled route object. Remove this once
// https://github.com/symfony/symfony/pull/4755 is merged and brought
// back downstream.
'route' => serialize(clone($route)),
); );
$insert->values($values); $insert->values($values);
} }

2
core/lib/Drupal/Core/Routing/PathMatcher.php
View File

@ -75,7 +75,7 @@ class PathMatcher implements InitialMatcherInterface {
} }
} }
if (!count($collection->all())) { if (!count($collection)) {
throw new ResourceNotFoundException(); throw new ResourceNotFoundException();
} }