Fixes deprecation notices.
This commit is contained in:
parent
6f57b7b552
commit
2a9749d0f4
@ -77,14 +77,12 @@ class Event
|
|||||||
*
|
*
|
||||||
* @param EventDispatcherInterface $dispatcher
|
* @param EventDispatcherInterface $dispatcher
|
||||||
*
|
*
|
||||||
* @deprecated Deprecated in 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
|
* @deprecated since version 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
|
||||||
*
|
*
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
public function setDispatcher(EventDispatcherInterface $dispatcher)
|
public function setDispatcher(EventDispatcherInterface $dispatcher)
|
||||||
{
|
{
|
||||||
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
|
|
||||||
|
|
||||||
$this->dispatcher = $dispatcher;
|
$this->dispatcher = $dispatcher;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,13 +91,13 @@ class Event
|
|||||||
*
|
*
|
||||||
* @return EventDispatcherInterface
|
* @return EventDispatcherInterface
|
||||||
*
|
*
|
||||||
* @deprecated Deprecated in 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
|
* @deprecated since version 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
|
||||||
*
|
*
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
public function getDispatcher()
|
public function getDispatcher()
|
||||||
{
|
{
|
||||||
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
|
trigger_error('The '.__METHOD__.' and '.__CLASS__.'::setDispatcher methods are deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
return $this->dispatcher;
|
return $this->dispatcher;
|
||||||
}
|
}
|
||||||
@ -109,13 +107,13 @@ class Event
|
|||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*
|
*
|
||||||
* @deprecated Deprecated in 2.4, to be removed in 3.0. The event name is passed to the listener call.
|
* @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
|
||||||
*
|
*
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
public function getName()
|
public function getName()
|
||||||
{
|
{
|
||||||
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
|
trigger_error('The '.__METHOD__.' and '.__CLASS__.'::setName methods are deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
return $this->name;
|
return $this->name;
|
||||||
}
|
}
|
||||||
@ -125,14 +123,12 @@ class Event
|
|||||||
*
|
*
|
||||||
* @param string $name The event name.
|
* @param string $name The event name.
|
||||||
*
|
*
|
||||||
* @deprecated Deprecated in 2.4, to be removed in 3.0. The event name is passed to the listener call.
|
* @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
|
||||||
*
|
*
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
public function setName($name)
|
public function setName($name)
|
||||||
{
|
{
|
||||||
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
|
|
||||||
|
|
||||||
$this->name = $name;
|
$this->name = $name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
|
|||||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ProfilerListener collects data for the current request by listening to the onKernelResponse event.
|
* ProfilerListener collects data for the current request by listening to the kernel events.
|
||||||
*
|
*
|
||||||
* @author Fabien Potencier <fabien@symfony.com>
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
*/
|
*/
|
||||||
@ -49,6 +49,13 @@ class ProfilerListener implements EventSubscriberInterface
|
|||||||
*/
|
*/
|
||||||
public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false, RequestStack $requestStack = null)
|
public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false, RequestStack $requestStack = null)
|
||||||
{
|
{
|
||||||
|
if (null === $requestStack) {
|
||||||
|
// Prevent the deprecation notice to be triggered all the time.
|
||||||
|
// The onKernelRequest() method fires some logic only when the
|
||||||
|
// RequestStack instance is not provided as a dependency.
|
||||||
|
trigger_error('The '.__CLASS__.'::onKernelRequest method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||||
|
}
|
||||||
|
|
||||||
$this->profiler = $profiler;
|
$this->profiler = $profiler;
|
||||||
$this->matcher = $matcher;
|
$this->matcher = $matcher;
|
||||||
$this->onlyException = (bool) $onlyException;
|
$this->onlyException = (bool) $onlyException;
|
||||||
@ -77,8 +84,6 @@ class ProfilerListener implements EventSubscriberInterface
|
|||||||
*/
|
*/
|
||||||
public function onKernelRequest(GetResponseEvent $event)
|
public function onKernelRequest(GetResponseEvent $event)
|
||||||
{
|
{
|
||||||
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
|
|
||||||
|
|
||||||
if (null === $this->requestStack) {
|
if (null === $this->requestStack) {
|
||||||
$this->requests[] = $event->getRequest();
|
$this->requests[] = $event->getRequest();
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\HttpKernel\Log;
|
namespace Symfony\Component\HttpKernel\Log;
|
||||||
|
|
||||||
|
trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.');
|
||||||
|
|
||||||
use Psr\Log\NullLogger as PsrNullLogger;
|
use Psr\Log\NullLogger as PsrNullLogger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -24,8 +26,6 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
|
|||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @api
|
* @api
|
||||||
*
|
|
||||||
* @deprecated since version 2.2, to be removed in 3.0. Use emergency() which is PSR-3 compatible.
|
|
||||||
*/
|
*/
|
||||||
public function emerg($message, array $context = array())
|
public function emerg($message, array $context = array())
|
||||||
{
|
{
|
||||||
@ -34,8 +34,6 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @api
|
* @api
|
||||||
*
|
|
||||||
* @deprecated since version 2.2, to be removed in 3.0. Use critical() which is PSR-3 compatible.
|
|
||||||
*/
|
*/
|
||||||
public function crit($message, array $context = array())
|
public function crit($message, array $context = array())
|
||||||
{
|
{
|
||||||
@ -44,8 +42,6 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @api
|
* @api
|
||||||
*
|
|
||||||
* @deprecated since version 2.2, to be removed in 3.0. Use error() which is PSR-3 compatible.
|
|
||||||
*/
|
*/
|
||||||
public function err($message, array $context = array())
|
public function err($message, array $context = array())
|
||||||
{
|
{
|
||||||
@ -54,8 +50,6 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @api
|
* @api
|
||||||
*
|
|
||||||
* @deprecated since version 2.2, to be removed in 3.0. Use warning() which is PSR-3 compatible.
|
|
||||||
*/
|
*/
|
||||||
public function warn($message, array $context = array())
|
public function warn($message, array $context = array())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user