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
881d7f78
Commit
881d7f78
authored
Jul 06, 2011
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Trim comment bloat from Router class.
parent
cf8e5e2f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
14 deletions
+2
-14
router.php
system/router.php
+2
-14
No files found.
system/router.php
View file @
881d7f78
...
@@ -18,9 +18,7 @@ class Router {
...
@@ -18,9 +18,7 @@ class Router {
*/
*/
public
static
function
route
(
$method
,
$uri
)
public
static
function
route
(
$method
,
$uri
)
{
{
// --------------------------------------------------------------
// Prepend a forward slash since all routes begin with one.
// Prepend a forward slash since all routes begin with one.
// --------------------------------------------------------------
$uri
=
(
$uri
!=
'/'
)
?
'/'
.
$uri
:
$uri
;
$uri
=
(
$uri
!=
'/'
)
?
'/'
.
$uri
:
$uri
;
if
(
is_null
(
static
::
$routes
))
if
(
is_null
(
static
::
$routes
))
...
@@ -28,28 +26,18 @@ class Router {
...
@@ -28,28 +26,18 @@ class Router {
static
::
$routes
=
Route\Loader
::
load
(
$uri
);
static
::
$routes
=
Route\Loader
::
load
(
$uri
);
}
}
// --------------------------------------------------------------
// Is there an exact match for the request?
// Is there an exact match for the request?
// --------------------------------------------------------------
if
(
isset
(
static
::
$routes
[
$method
.
' '
.
$uri
]))
if
(
isset
(
static
::
$routes
[
$method
.
' '
.
$uri
]))
{
{
return
Request
::
$route
=
new
Route
(
$method
.
' '
.
$uri
,
static
::
$routes
[
$method
.
' '
.
$uri
]);
return
Request
::
$route
=
new
Route
(
$method
.
' '
.
$uri
,
static
::
$routes
[
$method
.
' '
.
$uri
]);
}
}
// --------------------------------------------------------------
// No exact match... check each route individually.
// --------------------------------------------------------------
foreach
(
static
::
$routes
as
$keys
=>
$callback
)
foreach
(
static
::
$routes
as
$keys
=>
$callback
)
{
{
// --------------------------------------------------------------
// Only check routes that have multiple URIs or wildcards. All other routes would have
// Only check routes that have multiple URIs or wildcards.
// been caught by a literal match.
// All other routes would have been caught by a literal match.
// --------------------------------------------------------------
if
(
strpos
(
$keys
,
'('
)
!==
false
or
strpos
(
$keys
,
','
)
!==
false
)
if
(
strpos
(
$keys
,
'('
)
!==
false
or
strpos
(
$keys
,
','
)
!==
false
)
{
{
// --------------------------------------------------------------
// Routes can be comma-delimited, so spin through each one.
// --------------------------------------------------------------
foreach
(
explode
(
', '
,
$keys
)
as
$key
)
foreach
(
explode
(
', '
,
$keys
)
as
$key
)
{
{
$key
=
str_replace
(
':num'
,
'[0-9]+'
,
str_replace
(
':any'
,
'[a-zA-Z0-9\-_]+'
,
$key
));
$key
=
str_replace
(
':num'
,
'[0-9]+'
,
str_replace
(
':any'
,
'[a-zA-Z0-9\-_]+'
,
$key
));
...
...
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