Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue by Wim Leers: Move around/fix some documentation.

This commit is contained in:
Pantheon Automation 2015-11-17 13:42:33 -08:00 committed by Greg Anderson
parent 4afb23bbd3
commit 7784f4c23d
929 changed files with 19798 additions and 5304 deletions

View file

@ -23,8 +23,6 @@ use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
* for DependencyInjection extensions and Console commands.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
abstract class Bundle extends ContainerAware implements BundleInterface
{
@ -66,8 +64,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface
* @return ExtensionInterface|null The container extension
*
* @throws \LogicException
*
* @api
*/
public function getContainerExtension()
{
@ -105,8 +101,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface
* Gets the Bundle namespace.
*
* @return string The Bundle namespace
*
* @api
*/
public function getNamespace()
{
@ -119,8 +113,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface
* Gets the Bundle directory path.
*
* @return string The Bundle absolute path
*
* @api
*/
public function getPath()
{
@ -136,8 +128,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface
* Returns the bundle parent name.
*
* @return string The Bundle parent name it overrides or null if no parent
*
* @api
*/
public function getParent()
{
@ -147,8 +137,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface
* Returns the bundle name (the class short name).
*
* @return string The Bundle name
*
* @api
*/
final public function getName()
{

View file

@ -19,22 +19,16 @@ use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
* BundleInterface.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
interface BundleInterface extends ContainerAwareInterface
{
/**
* Boots the Bundle.
*
* @api
*/
public function boot();
/**
* Shutdowns the Bundle.
*
* @api
*/
public function shutdown();
@ -44,8 +38,6 @@ interface BundleInterface extends ContainerAwareInterface
* It is only ever called once when the cache is empty.
*
* @param ContainerBuilder $container A ContainerBuilder instance
*
* @api
*/
public function build(ContainerBuilder $container);
@ -53,8 +45,6 @@ interface BundleInterface extends ContainerAwareInterface
* Returns the container extension that should be implicitly loaded.
*
* @return ExtensionInterface|null The default extension or null if there is none
*
* @api
*/
public function getContainerExtension();
@ -66,8 +56,6 @@ interface BundleInterface extends ContainerAwareInterface
* bundle.
*
* @return string The Bundle name it overrides or null if no parent
*
* @api
*/
public function getParent();
@ -75,8 +63,6 @@ interface BundleInterface extends ContainerAwareInterface
* Returns the bundle name (the class short name).
*
* @return string The Bundle name
*
* @api
*/
public function getName();
@ -84,8 +70,6 @@ interface BundleInterface extends ContainerAwareInterface
* Gets the Bundle namespace.
*
* @return string The Bundle namespace
*
* @api
*/
public function getNamespace();
@ -95,8 +79,6 @@ interface BundleInterface extends ContainerAwareInterface
* The path should always be returned as a Unix path (with /).
*
* @return string The Bundle absolute path
*
* @api
*/
public function getPath();
}

View file

@ -25,8 +25,6 @@ use Symfony\Component\HttpFoundation\Response;
* Client simulates a browser and makes requests to a Kernel object.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
class Client extends BaseClient
{

View file

@ -22,8 +22,6 @@ use Symfony\Component\HttpFoundation\Request;
* the controller method arguments.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
class ControllerResolver implements ControllerResolverInterface
{
@ -44,8 +42,6 @@ class ControllerResolver implements ControllerResolverInterface
*
* This method looks for a '_controller' request attribute that represents
* the controller name (a string like ClassName::MethodName).
*
* @api
*/
public function getController(Request $request)
{
@ -88,8 +84,6 @@ class ControllerResolver implements ControllerResolverInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getArguments(Request $request, $controller)
{
@ -137,7 +131,7 @@ class ControllerResolver implements ControllerResolverInterface
*
* @param string $controller A Controller string
*
* @return mixed A PHP callable
* @return callable A PHP callable
*
* @throws \InvalidArgumentException
*/

View file

@ -22,8 +22,6 @@ use Symfony\Component\HttpFoundation\Request;
* A Controller can be any valid PHP callable.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
interface ControllerResolverInterface
{
@ -42,8 +40,6 @@ interface ControllerResolverInterface
* or false if this resolver is not able to determine the controller
*
* @throws \LogicException If the controller can't be found
*
* @api
*/
public function getController(Request $request);
@ -56,8 +52,6 @@ interface ControllerResolverInterface
* @return array An array of arguments to pass to the controller
*
* @throws \RuntimeException When value for argument given is not provided
*
* @api
*/
public function getArguments(Request $request, $controller);
}

View file

@ -18,8 +18,6 @@ use Symfony\Component\HttpFoundation\Response;
* DataCollectorInterface.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
interface DataCollectorInterface
{
@ -29,8 +27,6 @@ interface DataCollectorInterface
* @param Request $request A Request instance
* @param Response $response A Response instance
* @param \Exception $exception An Exception instance
*
* @api
*/
public function collect(Request $request, Response $response, \Exception $exception = null);
@ -38,8 +34,6 @@ interface DataCollectorInterface
* Returns the name of the collector.
*
* @return string The collector name
*
* @api
*/
public function getName();
}

View file

@ -34,6 +34,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
private $clonesIndex = 0;
private $rootRefs;
private $charset;
private $requestStack;
private $dumper;
private $dumperIsInjected;

View file

@ -17,11 +17,11 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
* This extension sub-class provides first-class integration with the
* Config/Definition Component.
*
* You can use this as base class if you
* You can use this as base class if
*
* a) use the Config/Definition component for configuration
* b) your configuration class is named "Configuration" and
* c) the configuration class resides in the DependencyInjection sub-folder
* a) you use the Config/Definition component for configuration,
* b) your configuration class is named "Configuration", and
* c) the configuration class resides in the DependencyInjection sub-folder.
*
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/

View file

@ -24,15 +24,11 @@ use Symfony\Component\HttpFoundation\Request;
* Controllers should be callables.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class FilterControllerEvent extends KernelEvent
{
/**
* The current controller.
*
* @var callable
*/
private $controller;
@ -47,8 +43,6 @@ class FilterControllerEvent extends KernelEvent
* Returns the current controller.
*
* @return callable
*
* @api
*/
public function getController()
{
@ -61,8 +55,6 @@ class FilterControllerEvent extends KernelEvent
* @param callable $controller
*
* @throws \LogicException
*
* @api
*/
public function setController($controller)
{

View file

@ -23,8 +23,6 @@ use Symfony\Component\HttpFoundation\Response;
* browser.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class FilterResponseEvent extends KernelEvent
{
@ -46,8 +44,6 @@ class FilterResponseEvent extends KernelEvent
* Returns the current response object.
*
* @return Response
*
* @api
*/
public function getResponse()
{
@ -58,8 +54,6 @@ class FilterResponseEvent extends KernelEvent
* Sets a new response object.
*
* @param Response $response
*
* @api
*/
public function setResponse(Response $response)
{

View file

@ -21,8 +21,6 @@ use Symfony\Component\HttpFoundation\Response;
* response is set.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class GetResponseEvent extends KernelEvent
{
@ -37,8 +35,6 @@ class GetResponseEvent extends KernelEvent
* Returns the response object.
*
* @return Response
*
* @api
*/
public function getResponse()
{
@ -49,8 +45,6 @@ class GetResponseEvent extends KernelEvent
* Sets a response and stops event propagation.
*
* @param Response $response
*
* @api
*/
public function setResponse(Response $response)
{
@ -63,8 +57,6 @@ class GetResponseEvent extends KernelEvent
* Returns whether a response was set.
*
* @return bool Whether a response was set
*
* @api
*/
public function hasResponse()
{

View file

@ -22,8 +22,6 @@ use Symfony\Component\HttpFoundation\Request;
* response is set.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class GetResponseForControllerResultEvent extends GetResponseEvent
{
@ -45,8 +43,6 @@ class GetResponseForControllerResultEvent extends GetResponseEvent
* Returns the return value of the controller.
*
* @return mixed The controller return value
*
* @api
*/
public function getControllerResult()
{
@ -57,8 +53,6 @@ class GetResponseForControllerResultEvent extends GetResponseEvent
* Assigns the return value of the controller.
*
* @param mixed $controllerResult The controller return value
*
* @api
*/
public function setControllerResult($controllerResult)
{

View file

@ -26,8 +26,6 @@ use Symfony\Component\HttpFoundation\Request;
* event.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class GetResponseForExceptionEvent extends GetResponseEvent
{
@ -49,8 +47,6 @@ class GetResponseForExceptionEvent extends GetResponseEvent
* Returns the thrown exception.
*
* @return \Exception The thrown exception
*
* @api
*/
public function getException()
{
@ -63,8 +59,6 @@ class GetResponseForExceptionEvent extends GetResponseEvent
* This exception will be thrown if no response is set in the event.
*
* @param \Exception $exception The thrown exception
*
* @api
*/
public function setException(\Exception $exception)
{

View file

@ -19,8 +19,6 @@ use Symfony\Component\EventDispatcher\Event;
* Base class for events thrown in the HttpKernel component.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
class KernelEvent extends Event
{
@ -57,8 +55,6 @@ class KernelEvent extends Event
* Returns the kernel in which this event was thrown.
*
* @return HttpKernelInterface
*
* @api
*/
public function getKernel()
{
@ -69,8 +65,6 @@ class KernelEvent extends Event
* Returns the request the kernel is currently processing.
*
* @return Request
*
* @api
*/
public function getRequest()
{
@ -82,8 +76,6 @@ class KernelEvent extends Event
*
* @return int One of HttpKernelInterface::MASTER_REQUEST and
* HttpKernelInterface::SUB_REQUEST
*
* @api
*/
public function getRequestType()
{
@ -94,8 +86,6 @@ class KernelEvent extends Event
* Checks if this is a master request.
*
* @return bool True if the request is a master request
*
* @api
*/
public function isMasterRequest()
{

View file

@ -200,7 +200,6 @@ class Esi implements SurrogateInterface
*/
public function process(Request $request, Response $response)
{
$this->request = $request;
$type = $response->headers->get('Content-Type');
if (empty($type)) {
$type = 'text/html';

View file

@ -24,8 +24,6 @@ use Symfony\Component\HttpFoundation\Response;
* Cache provides HTTP caching.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
class HttpCache implements HttpKernelInterface, TerminableInterface
{
@ -186,8 +184,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
@ -216,7 +212,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
$this->restoreResponseBody($request, $response);
$response->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
$response->setDate(\DateTime::createFromFormat('U', time(), new \DateTimeZone('UTC')));
if (HttpKernelInterface::MASTER_REQUEST === $type && $this->options['debug']) {
$response->headers->set('X-Symfony-Cache', $this->getLog());
@ -239,8 +235,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function terminate(Request $request, Response $response)
{

View file

@ -113,7 +113,6 @@ class Ssi implements SurrogateInterface
*/
public function process(Request $request, Response $response)
{
$this->request = $request;
$type = $response->headers->get('Content-Type');
if (empty($type)) {
$type = 'text/html';

View file

@ -30,8 +30,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
* HttpKernel notifies events to convert a Request object to a Response one.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
class HttpKernel implements HttpKernelInterface, TerminableInterface
{
@ -45,8 +43,6 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
* @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
* @param ControllerResolverInterface $resolver A ControllerResolverInterface instance
* @param RequestStack $requestStack A stack for master/sub requests
*
* @api
*/
public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null)
{
@ -57,8 +53,6 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
@ -79,8 +73,6 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function terminate(Request $request, Response $response)
{

View file

@ -18,8 +18,6 @@ use Symfony\Component\HttpFoundation\Response;
* HttpKernelInterface handles a Request to convert it to a Response.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
interface HttpKernelInterface
{
@ -40,8 +38,6 @@ interface HttpKernelInterface
* @return Response A Response instance
*
* @throws \Exception When an Exception occurs during processing
*
* @api
*/
public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
}

View file

@ -40,8 +40,6 @@ use Symfony\Component\ClassLoader\ClassCollectionLoader;
* It manages an environment made of bundles.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
abstract class Kernel implements KernelInterface, TerminableInterface
{
@ -60,11 +58,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
const VERSION = '2.7.5';
const VERSION_ID = 20705;
const VERSION = '2.7.6';
const VERSION_ID = 20706;
const MAJOR_VERSION = 2;
const MINOR_VERSION = 7;
const RELEASE_VERSION = 5;
const RELEASE_VERSION = 6;
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '05/2018';
@ -75,8 +73,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
*
* @param string $environment The environment
* @param bool $debug Whether to enable debugging or not
*
* @api
*/
public function __construct($environment, $debug)
{
@ -118,8 +114,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* Boots the current kernel.
*
* @api
*/
public function boot()
{
@ -147,8 +141,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function terminate(Request $request, Response $response)
{
@ -163,8 +155,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function shutdown()
{
@ -184,8 +174,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
@ -208,8 +196,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getBundles()
{
@ -219,8 +205,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function isClassInActiveBundle($class)
@ -238,8 +222,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getBundle($name, $first = true)
{
@ -315,8 +297,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getName()
{
@ -329,8 +309,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getEnvironment()
{
@ -339,8 +317,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function isDebug()
{
@ -349,8 +325,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getRootDir()
{
@ -364,8 +338,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getContainer()
{
@ -399,8 +371,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getStartTime()
{
@ -409,8 +379,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getCacheDir()
{
@ -419,8 +387,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getLogDir()
{
@ -429,8 +395,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
/**
* {@inheritdoc}
*
* @api
*/
public function getCharset()
{

View file

@ -15,8 +15,6 @@ namespace Symfony\Component\HttpKernel;
* Contains all events thrown in the HttpKernel component.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @api
*/
final class KernelEvents
{
@ -32,8 +30,6 @@ final class KernelEvents
* @Event
*
* @var string
*
* @api
*/
const REQUEST = 'kernel.request';
@ -48,8 +44,6 @@ final class KernelEvents
* @Event
*
* @var string
*
* @api
*/
const EXCEPTION = 'kernel.exception';
@ -65,8 +59,6 @@ final class KernelEvents
* @Event
*
* @var string
*
* @api
*/
const VIEW = 'kernel.view';
@ -81,8 +73,6 @@ final class KernelEvents
* @Event
*
* @var string
*
* @api
*/
const CONTROLLER = 'kernel.controller';
@ -97,8 +87,6 @@ final class KernelEvents
* @Event
*
* @var string
*
* @api
*/
const RESPONSE = 'kernel.response';

View file

@ -21,8 +21,6 @@ use Symfony\Component\Config\Loader\LoaderInterface;
* It manages an environment made of bundles.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
interface KernelInterface extends HttpKernelInterface, \Serializable
{
@ -30,8 +28,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Returns an array of bundles to register.
*
* @return BundleInterface[] An array of bundle instances.
*
* @api
*/
public function registerBundles();
@ -39,15 +35,11 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Loads the container configuration.
*
* @param LoaderInterface $loader A LoaderInterface instance
*
* @api
*/
public function registerContainerConfiguration(LoaderInterface $loader);
/**
* Boots the current kernel.
*
* @api
*/
public function boot();
@ -55,8 +47,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Shutdowns the kernel.
*
* This method is mainly useful when doing functional testing.
*
* @api
*/
public function shutdown();
@ -64,8 +54,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the registered bundle instances.
*
* @return BundleInterface[] An array of registered bundle instances
*
* @api
*/
public function getBundles();
@ -76,8 +64,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
*
* @return bool true if the class belongs to an active bundle, false otherwise
*
* @api
*
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function isClassInActiveBundle($class);
@ -91,8 +77,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* @return BundleInterface|BundleInterface[] A BundleInterface instance or an array of BundleInterface instances if $first is false
*
* @throws \InvalidArgumentException when the bundle is not enabled
*
* @api
*/
public function getBundle($name, $first = true);
@ -123,8 +107,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
*
* @throws \InvalidArgumentException if the file cannot be found or the name is not valid
* @throws \RuntimeException if the name contains invalid/unsafe characters
*
* @api
*/
public function locateResource($name, $dir = null, $first = true);
@ -132,8 +114,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the name of the kernel.
*
* @return string The kernel name
*
* @api
*/
public function getName();
@ -141,8 +121,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the environment.
*
* @return string The current environment
*
* @api
*/
public function getEnvironment();
@ -150,8 +128,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Checks if debug mode is enabled.
*
* @return bool true if debug mode is enabled, false otherwise
*
* @api
*/
public function isDebug();
@ -159,8 +135,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the application root dir.
*
* @return string The application root dir
*
* @api
*/
public function getRootDir();
@ -168,8 +142,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the current container.
*
* @return ContainerInterface A ContainerInterface instance
*
* @api
*/
public function getContainer();
@ -177,8 +149,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the request start time (not available if debug is disabled).
*
* @return int The request start timestamp
*
* @api
*/
public function getStartTime();
@ -186,8 +156,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the cache directory.
*
* @return string The cache directory
*
* @api
*/
public function getCacheDir();
@ -195,8 +163,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the log directory.
*
* @return string The log directory
*
* @api
*/
public function getLogDir();
@ -204,8 +170,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Gets the charset of the application.
*
* @return string The charset
*
* @api
*/
public function getCharset();
}

View file

@ -19,35 +19,25 @@ use Psr\Log\LoggerInterface as PsrLogger;
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated since version 2.2, to be removed in 3.0. Type-hint \Psr\Log\LoggerInterface instead.
*
* @api
*/
interface LoggerInterface extends PsrLogger
{
/**
* @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());
/**
* @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());
/**
* @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());
/**
* @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());

View file

@ -19,38 +19,24 @@ use Psr\Log\NullLogger as PsrNullLogger;
* NullLogger.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
class NullLogger extends PsrNullLogger implements LoggerInterface
{
/**
* @api
*/
public function emerg($message, array $context = array())
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
/**
* @api
*/
public function crit($message, array $context = array())
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
/**
* @api
*/
public function err($message, array $context = array())
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
/**
* @api
*/
public function warn($message, array $context = array())
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);

View file

@ -20,8 +20,6 @@ use Symfony\Component\HttpFoundation\Response;
*
* @author Jordi Boggiano <j.boggiano@seld.be>
* @author Pierre Minnieur <pierre.minnieur@sensiolabs.de>
*
* @api
*/
interface TerminableInterface
{
@ -32,8 +30,6 @@ interface TerminableInterface
*
* @param Request $request A Request instance
* @param Response $response A Response instance
*
* @api
*/
public function terminate(Request $request, Response $response);
}

View file

@ -23,7 +23,6 @@
"psr/log": "~1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7",
"symfony/browser-kit": "~2.3",
"symfony/class-loader": "~2.1",
"symfony/config": "~2.7",