Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
syncEnrollments
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yeray Santana Hualde
syncEnrollments
Commits
e6cec8c5
Commit
e6cec8c5
authored
Jan 21, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #246 from ericbarnes/develop
Bug fix for route::handles
parents
35e36428
ea8c6e18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
route.php
laravel/routing/route.php
+2
-2
route.test.php
tests/cases/laravel/route.test.php
+1
-0
No files found.
laravel/routing/route.php
View file @
e6cec8c5
...
@@ -118,7 +118,7 @@ class Route {
...
@@ -118,7 +118,7 @@ class Route {
*/
*/
public
function
response
()
public
function
response
()
{
{
// If the action is a string, it is simply pointing the route to a
// If the action is a string, it is simply pointing the route to a
// controller action, and we can just call the action and return
// controller action, and we can just call the action and return
// its response. This is the most basic form of route, and is
// its response. This is the most basic form of route, and is
// the simplest to handle.
// the simplest to handle.
...
@@ -214,7 +214,7 @@ class Route {
...
@@ -214,7 +214,7 @@ class Route {
*/
*/
public
function
handles
(
$uri
)
public
function
handles
(
$uri
)
{
{
$pattern
=
(
$uri
!==
'/'
)
?
str_replace
(
'*'
,
'(.*)'
,
$uri
)
:
'^/$'
;
$pattern
=
(
$uri
!==
'/'
)
?
str_replace
(
'*'
,
'(.*)'
,
$uri
)
.
'\z'
:
'^/$'
;
return
!
is_null
(
array_first
(
$this
->
uris
,
function
(
$key
,
$uri
)
use
(
$pattern
)
return
!
is_null
(
array_first
(
$this
->
uris
,
function
(
$key
,
$uri
)
use
(
$pattern
)
{
{
...
...
tests/cases/laravel/route.test.php
View file @
e6cec8c5
...
@@ -24,6 +24,7 @@ class RouteTest extends PHPUnit_Framework_TestCase {
...
@@ -24,6 +24,7 @@ class RouteTest extends PHPUnit_Framework_TestCase {
$this
->
assertFalse
(
$route
->
handles
(
'/'
));
$this
->
assertFalse
(
$route
->
handles
(
'/'
));
$this
->
assertFalse
(
$route
->
handles
(
'baz'
));
$this
->
assertFalse
(
$route
->
handles
(
'baz'
));
$this
->
assertFalse
(
$route
->
handles
(
'/foo'
));
$this
->
assertFalse
(
$route
->
handles
(
'/foo'
));
$this
->
assertFalse
(
$route
->
handles
(
'foo'
));
$route
=
new
Laravel\Routing\Route
(
'GET /'
,
array
(
'handles'
=>
array
(
'GET /'
,
'GET /home'
)));
$route
=
new
Laravel\Routing\Route
(
'GET /'
,
array
(
'handles'
=>
array
(
'GET /'
,
'GET /home'
)));
...
...
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