Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
289
Merge Requests
289
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
854a48bf
Commit
854a48bf
authored
Sep 28, 2012
by
Crell
Committed by
effulgentsia
Oct 01, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove workarounds for Symfony limitations that have been fixed.
parent
e2f99d4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
core/lib/Drupal/Core/Routing/MatcherDumper.php
core/lib/Drupal/Core/Routing/MatcherDumper.php
+1
-6
core/lib/Drupal/Core/Routing/PathMatcher.php
core/lib/Drupal/Core/Routing/PathMatcher.php
+1
-1
No files found.
core/lib/Drupal/Core/Routing/MatcherDumper.php
View file @
854a48bf
...
...
@@ -111,12 +111,7 @@ public function dump(array $options = array()) {
'pattern'
=>
$compiled
->
getPattern
(),
'pattern_outline'
=>
$compiled
->
getPatternOutline
(),
'number_parts'
=>
$compiled
->
getNumParts
(),
// This is only temporary. We need to strip off the compiled route from
// 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
)),
'route'
=>
serialize
(
$route
),
);
$insert
->
values
(
$values
);
}
...
...
core/lib/Drupal/Core/Routing/PathMatcher.php
View file @
854a48bf
...
...
@@ -75,7 +75,7 @@ public function matchRequestPartial(Request $request) {
}
}
if
(
!
count
(
$collection
->
all
()
))
{
if
(
!
count
(
$collection
))
{
throw
new
ResourceNotFoundException
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment