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
e70261e9
Commit
e70261e9
authored
Feb 22, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added support for controller factories.
parent
86fa5953
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
event.php
laravel/event.php
+1
-1
controller.php
laravel/routing/controller.php
+17
-3
No files found.
laravel/event.php
View file @
e70261e9
...
@@ -83,7 +83,7 @@ class Event {
...
@@ -83,7 +83,7 @@ class Event {
{
{
foreach
(
static
::
$events
[
$event
]
as
$callback
)
foreach
(
static
::
$events
[
$event
]
as
$callback
)
{
{
$responses
[]
=
call_user_func_array
(
$callback
,
$parameters
);
$responses
[]
=
call_user_func_array
(
$callback
,
(
array
)
$parameters
);
}
}
}
}
...
...
laravel/routing/controller.php
View file @
e70261e9
...
@@ -39,6 +39,13 @@ abstract class Controller {
...
@@ -39,6 +39,13 @@ abstract class Controller {
*/
*/
protected
$filters
=
array
();
protected
$filters
=
array
();
/**
* The event name for the Laravel controller factory.
*
* @var string
*/
const
factory
=
'laravel.controller.factory'
;
/**
/**
* Call an action method on a controller.
* Call an action method on a controller.
*
*
...
@@ -127,12 +134,19 @@ abstract class Controller {
...
@@ -127,12 +134,19 @@ abstract class Controller {
return
IoC
::
resolve
(
$resolver
);
return
IoC
::
resolve
(
$resolver
);
}
}
$controller
=
static
::
format
(
$bundle
,
$controller
);
// If we couldn't resolve the controller out of the IoC container we'll
// If we couldn't resolve the controller out of the IoC container we'll
// format the controller name into its proper class name and load it
// format the controller name into its proper class name and load it
// by convention out of the bundle's controller directory.
// by convention out of the bundle's controller directory.
$controller
=
static
::
format
(
$bundle
,
$controller
);
if
(
Event
::
listeners
(
static
::
factory
))
{
$controller
=
Event
::
first
(
static
::
factory
,
$controller
);
}
else
{
$controller
=
new
$controller
;
$controller
=
new
$controller
;
}
// If the controller has specified a layout to be used when rendering
// If the controller has specified a layout to be used when rendering
// views, we will instantiate the layout instance and set it to the
// views, we will instantiate the layout instance and set it to the
...
...
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