Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
83d90041
Commit
83d90041
authored
Sep 07, 2015
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoupled the exception handler from HttpKernelServiceProvider
parent
e6d86cbc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
11 deletions
+35
-11
src/Silex/Application.php
src/Silex/Application.php
+2
-0
src/Silex/ExceptionHandler.php
src/Silex/ExceptionHandler.php
+1
-1
src/Silex/Provider/ExceptionHandlerServiceProvider.php
src/Silex/Provider/ExceptionHandlerServiceProvider.php
+32
-0
src/Silex/Provider/HttpKernelServiceProvider.php
src/Silex/Provider/HttpKernelServiceProvider.php
+0
-10
No files found.
src/Silex/Application.php
View file @
83d90041
...
...
@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use
Silex\Api\BootableProviderInterface
;
use
Silex\Api\EventListenerProviderInterface
;
use
Silex\Api\ControllerProviderInterface
;
use
Silex\Provider\ExceptionHandlerServiceProvider
;
use
Silex\Provider\RoutingServiceProvider
;
use
Silex\Provider\HttpKernelServiceProvider
;
...
...
@@ -67,6 +68,7 @@ class Application extends Container implements HttpKernelInterface, TerminableIn
$this
->
register
(
new
HttpKernelServiceProvider
());
$this
->
register
(
new
RoutingServiceProvider
());
$this
->
register
(
new
ExceptionHandlerServiceProvider
());
foreach
(
$values
as
$key
=>
$value
)
{
$this
[
$key
]
=
$value
;
...
...
src/Silex/ExceptionHandler.php
View file @
83d90041
...
...
@@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use
Symfony\Component\HttpKernel\KernelEvents
;
/**
* Default
s
exception handler.
* Default exception handler.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
...
...
src/Silex/Provider/ExceptionHandlerServiceProvider.php
0 → 100644
View file @
83d90041
<?php
namespace
Silex\Provider
;
use
Pimple\Container
;
use
Pimple\ServiceProviderInterface
;
use
Silex\Api\EventListenerProviderInterface
;
use
Silex\ExceptionHandler
;
use
Symfony\Component\EventDispatcher\EventDispatcherInterface
;
class
ExceptionHandlerServiceProvider
implements
ServiceProviderInterface
,
EventListenerProviderInterface
{
/**
* {@inheritdoc}
*/
public
function
register
(
Container
$app
)
{
$app
[
'exception_handler'
]
=
function
(
$app
)
{
return
new
ExceptionHandler
(
$app
[
'debug'
]);
};
}
/**
* {@inheritdoc}
*/
public
function
subscribe
(
Container
$app
,
EventDispatcherInterface
$dispatcher
)
{
if
(
isset
(
$app
[
'exception_handler'
]))
{
$dispatcher
->
addSubscriber
(
$app
[
'exception_handler'
]);
}
}
}
src/Silex/Provider/HttpKernelServiceProvider.php
View file @
83d90041
...
...
@@ -10,7 +10,6 @@ use Silex\ControllerResolver;
use
Silex\EventListener\ConverterListener
;
use
Silex\EventListener\MiddlewareListener
;
use
Silex\EventListener\StringToResponseListener
;
use
Silex\ExceptionHandler
;
use
Symfony\Component\EventDispatcher\EventDispatcher
;
use
Symfony\Component\EventDispatcher\EventDispatcherInterface
;
use
Symfony\Component\HttpFoundation\RequestStack
;
...
...
@@ -24,10 +23,6 @@ class HttpKernelServiceProvider implements ServiceProviderInterface, EventListen
*/
public
function
register
(
Container
$app
)
{
$app
[
'exception_handler'
]
=
function
(
$app
)
{
return
new
ExceptionHandler
(
$app
[
'debug'
]);
};
$app
[
'resolver'
]
=
function
(
$app
)
{
return
new
ControllerResolver
(
$app
,
$app
[
'logger'
]);
};
...
...
@@ -47,7 +42,6 @@ class HttpKernelServiceProvider implements ServiceProviderInterface, EventListen
$app
[
'callback_resolver'
]
=
function
(
$app
)
{
return
new
CallbackResolver
(
$app
);
};
}
/**
...
...
@@ -55,10 +49,6 @@ class HttpKernelServiceProvider implements ServiceProviderInterface, EventListen
*/
public
function
subscribe
(
Container
$app
,
EventDispatcherInterface
$dispatcher
)
{
if
(
isset
(
$app
[
'exception_handler'
]))
{
$dispatcher
->
addSubscriber
(
$app
[
'exception_handler'
]);
}
$dispatcher
->
addSubscriber
(
new
ResponseListener
(
$app
[
'charset'
]));
$dispatcher
->
addSubscriber
(
new
MiddlewareListener
(
$app
));
$dispatcher
->
addSubscriber
(
new
ConverterListener
(
$app
[
'routes'
],
$app
[
'callback_resolver'
]));
...
...
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