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
fdad5838
Commit
fdad5838
authored
May 03, 2012
by
Andrew Ellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleaned up phpdoc and removed as it is not used
parent
e256a66b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
route.php
laravel/routing/route.php
+9
-11
No files found.
laravel/routing/route.php
View file @
fdad5838
...
@@ -47,11 +47,10 @@ class Route {
...
@@ -47,11 +47,10 @@ class Route {
/**
/**
* Create a new Route instance.
* Create a new Route instance.
*
*
* @param string $method
* @param string $method
* @param string $uri
* @param string $uri
* @param array $action
* @param array $action
* @param array $parameters
* @param array $parameters
* @return void
*/
*/
public
function
__construct
(
$method
,
$uri
,
$action
,
$parameters
=
array
())
public
function
__construct
(
$method
,
$uri
,
$action
,
$parameters
=
array
())
{
{
...
@@ -67,18 +66,17 @@ class Route {
...
@@ -67,18 +66,17 @@ class Route {
// We'll set the parameters based on the number of parameters passed
// We'll set the parameters based on the number of parameters passed
// compared to the parameters that were needed. If more parameters
// compared to the parameters that were needed. If more parameters
// are needed, we'll merge in defaults.
// are needed, we'll merge in defaults.
$this
->
parameters
(
$
uri
,
$
action
,
$parameters
);
$this
->
parameters
(
$action
,
$parameters
);
}
}
/**
/**
* Set the parameters array to the correct value.
* Set the parameters array to the correct value.
*
*
* @param string $uri
* @param array $action
* @param array $action
* @param array $parameters
* @param array $parameters
* @return void
* @return void
*/
*/
protected
function
parameters
(
$
uri
,
$
action
,
$parameters
)
protected
function
parameters
(
$action
,
$parameters
)
{
{
$defaults
=
(
array
)
array_get
(
$action
,
'defaults'
);
$defaults
=
(
array
)
array_get
(
$action
,
'defaults'
);
...
@@ -114,7 +112,7 @@ class Route {
...
@@ -114,7 +112,7 @@ class Route {
// We always return a Response instance from the route calls, so
// We always return a Response instance from the route calls, so
// we'll use the prepare method on the Response class to make
// we'll use the prepare method on the Response class to make
// sure we have a valid Response i
sn
tance.
// sure we have a valid Response i
ns
tance.
$response
=
Response
::
prepare
(
$response
);
$response
=
Response
::
prepare
(
$response
);
Filter
::
run
(
$this
->
filters
(
'after'
),
array
(
$response
));
Filter
::
run
(
$this
->
filters
(
'after'
),
array
(
$response
));
...
@@ -252,7 +250,7 @@ class Route {
...
@@ -252,7 +250,7 @@ class Route {
/**
/**
* Register a controller with the router.
* Register a controller with the router.
*
*
* @param string|array $controller
* @param string|array $controller
s
* @param string|array $defaults
* @param string|array $defaults
* @return void
* @return void
*/
*/
...
@@ -394,4 +392,4 @@ class Route {
...
@@ -394,4 +392,4 @@ class Route {
return
Router
::
route
(
strtoupper
(
$method
),
$uri
)
->
call
();
return
Router
::
route
(
strtoupper
(
$method
),
$uri
)
->
call
();
}
}
}
}
\ No newline at end of file
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