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
67d47190
Commit
67d47190
authored
Sep 15, 2015
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed deprecation notices
parent
eefb8a68
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
src/Silex/Application.php
src/Silex/Application.php
+6
-1
src/Silex/EventListener/LocaleListener.php
src/Silex/EventListener/LocaleListener.php
+6
-1
src/Silex/Provider/HttpFragmentServiceProvider.php
src/Silex/Provider/HttpFragmentServiceProvider.php
+5
-0
No files found.
src/Silex/Application.php
View file @
67d47190
...
@@ -14,6 +14,7 @@ namespace Silex;
...
@@ -14,6 +14,7 @@ namespace Silex;
use
Symfony\Component\EventDispatcher\EventDispatcherInterface
;
use
Symfony\Component\EventDispatcher\EventDispatcherInterface
;
use
Symfony\Component\HttpFoundation\BinaryFileResponse
;
use
Symfony\Component\HttpFoundation\BinaryFileResponse
;
use
Symfony\Component\HttpKernel\HttpKernel
;
use
Symfony\Component\HttpKernel\HttpKernel
;
use
Symfony\Component\HttpKernel\Kernel
;
use
Symfony\Component\HttpKernel\HttpKernelInterface
;
use
Symfony\Component\HttpKernel\HttpKernelInterface
;
use
Symfony\Component\HttpKernel\TerminableInterface
;
use
Symfony\Component\HttpKernel\TerminableInterface
;
use
Symfony\Component\HttpKernel\Event\FilterResponseEvent
;
use
Symfony\Component\HttpKernel\Event\FilterResponseEvent
;
...
@@ -97,7 +98,11 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -97,7 +98,11 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
$urlMatcher
=
new
LazyUrlMatcher
(
function
()
use
(
$app
)
{
$urlMatcher
=
new
LazyUrlMatcher
(
function
()
use
(
$app
)
{
return
$app
[
'url_matcher'
];
return
$app
[
'url_matcher'
];
});
});
$dispatcher
->
addSubscriber
(
new
RouterListener
(
$urlMatcher
,
$app
[
'request_context'
],
$app
[
'logger'
],
$app
[
'request_stack'
]));
if
(
Kernel
::
VERSION_ID
>=
20800
)
{
$dispatcher
->
addSubscriber
(
new
RouterListener
(
$urlMatcher
,
$app
[
'request_stack'
],
$app
[
'request_context'
],
$app
[
'logger'
]));
}
else
{
$dispatcher
->
addSubscriber
(
new
RouterListener
(
$urlMatcher
,
$app
[
'request_context'
],
$app
[
'logger'
],
$app
[
'request_stack'
]));
}
$dispatcher
->
addSubscriber
(
new
LocaleListener
(
$app
,
$urlMatcher
,
$app
[
'request_stack'
]));
$dispatcher
->
addSubscriber
(
new
LocaleListener
(
$app
,
$urlMatcher
,
$app
[
'request_stack'
]));
if
(
isset
(
$app
[
'exception_handler'
]))
{
if
(
isset
(
$app
[
'exception_handler'
]))
{
$dispatcher
->
addSubscriber
(
$app
[
'exception_handler'
]);
$dispatcher
->
addSubscriber
(
$app
[
'exception_handler'
]);
...
...
src/Silex/EventListener/LocaleListener.php
View file @
67d47190
...
@@ -13,6 +13,7 @@ namespace Silex\EventListener;
...
@@ -13,6 +13,7 @@ namespace Silex\EventListener;
use
Symfony\Component\HttpKernel\Event\GetResponseEvent
;
use
Symfony\Component\HttpKernel\Event\GetResponseEvent
;
use
Symfony\Component\HttpKernel\EventListener\LocaleListener
as
BaseLocaleListener
;
use
Symfony\Component\HttpKernel\EventListener\LocaleListener
as
BaseLocaleListener
;
use
Symfony\Component\HttpKernel\Kernel
;
use
Symfony\Component\HttpFoundation\RequestStack
;
use
Symfony\Component\HttpFoundation\RequestStack
;
use
Symfony\Component\Routing\RequestContextAwareInterface
;
use
Symfony\Component\Routing\RequestContextAwareInterface
;
use
Silex\Application
;
use
Silex\Application
;
...
@@ -28,7 +29,11 @@ class LocaleListener extends BaseLocaleListener
...
@@ -28,7 +29,11 @@ class LocaleListener extends BaseLocaleListener
public
function
__construct
(
Application
$app
,
RequestContextAwareInterface
$router
=
null
,
RequestStack
$requestStack
=
null
)
public
function
__construct
(
Application
$app
,
RequestContextAwareInterface
$router
=
null
,
RequestStack
$requestStack
=
null
)
{
{
parent
::
__construct
(
$app
[
'locale'
],
$router
,
$requestStack
);
if
(
Kernel
::
VERSION_ID
>=
20800
)
{
parent
::
__construct
(
$requestStack
,
$app
[
'locale'
],
$router
);
}
else
{
parent
::
__construct
(
$app
[
'locale'
],
$router
,
$requestStack
);
}
$this
->
app
=
$app
;
$this
->
app
=
$app
;
}
}
...
...
src/Silex/Provider/HttpFragmentServiceProvider.php
View file @
67d47190
...
@@ -18,6 +18,7 @@ use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
...
@@ -18,6 +18,7 @@ use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
use
Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer
;
use
Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer
;
use
Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer
;
use
Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer
;
use
Symfony\Component\HttpKernel\EventListener\FragmentListener
;
use
Symfony\Component\HttpKernel\EventListener\FragmentListener
;
use
Symfony\Component\HttpKernel\Kernel
;
use
Symfony\Component\HttpKernel\UriSigner
;
use
Symfony\Component\HttpKernel\UriSigner
;
/**
/**
...
@@ -36,6 +37,10 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface
...
@@ -36,6 +37,10 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface
}
}
$app
[
'fragment.handler'
]
=
$app
->
share
(
function
(
$app
)
{
$app
[
'fragment.handler'
]
=
$app
->
share
(
function
(
$app
)
{
if
(
Kernel
::
VERSION_ID
>=
20800
)
{
return
new
FragmentHandler
(
$app
[
'request_stack'
],
$app
[
'fragment.renderers'
],
$app
[
'debug'
]);
}
return
new
FragmentHandler
(
$app
[
'fragment.renderers'
],
$app
[
'debug'
],
$app
[
'request_stack'
]);
return
new
FragmentHandler
(
$app
[
'fragment.renderers'
],
$app
[
'debug'
],
$app
[
'request_stack'
]);
});
});
...
...
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