Merge branch '2.3' into 2.7

Tobion · Tobion · commit ba26cd061d70 · 2015-09-29T14:06:14.000+02:00
Conflicts:
	src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
	src/Symfony/Component/ClassLoader/DebugClassLoader.php
	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/DependencyInjection/Definition.php
	src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
	src/Symfony/Component/EventDispatcher/Event.php
	src/Symfony/Component/Filesystem/Exception/IOException.php
	src/Symfony/Component/HttpFoundation/File/File.php
	src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
	src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/HttpKernel/HttpKernel.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/KernelInterface.php
	src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
	src/Symfony/Component/HttpKernel/Log/NullLogger.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Routing/RequestContext.php
	src/Symfony/Component/Routing/Route.php
	src/Symfony/Component/Templating/EngineInterface.php
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Templating/TemplateNameParser.php
	src/Symfony/Component/Templating/TemplateReference.php
	src/Symfony/Component/Templating/TemplateReferenceInterface.php
	src/Symfony/Component/Translation/IdentityTranslator.php
	src/Symfony/Component/Translation/Translator.php
	src/Symfony/Component/Validator/ConstraintViolationInterface.php
	src/Symfony/Component/Validator/Constraints/False.php
	src/Symfony/Component/Validator/Constraints/FalseValidator.php
	src/Symfony/Component/Validator/Constraints/GroupSequence.php
	src/Symfony/Component/Validator/Constraints/Image.php
	src/Symfony/Component/Validator/Constraints/Null.php
	src/Symfony/Component/Validator/Constraints/NullValidator.php
	src/Symfony/Component/Validator/Constraints/True.php
	src/Symfony/Component/Validator/Constraints/TrueValidator.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/ValidatorInterface.php
diff --git a/Exception/ExceptionInterface.php b/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * ExceptionInterface.
  *
  * @author Alexandre Salomé <alexandre.salome@gmail.com>
- *
- * @api
  */
 interface ExceptionInterface
 {
diff --git a/Exception/InvalidParameterException.php b/Exception/InvalidParameterException.php
@@ -15,8 +15,6 @@
  * Exception thrown when a parameter is not valid.
  *
  * @author Alexandre Salomé <alexandre.salome@gmail.com>
- *
- * @api
  */
 class InvalidParameterException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/Exception/MethodNotAllowedException.php b/Exception/MethodNotAllowedException.php
@@ -17,8 +17,6 @@
  * This exception should trigger an HTTP 405 response in your application code.
  *
  * @author Kris Wallsmith <kris@symfony.com>
- *
- * @api
  */
 class MethodNotAllowedException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/Exception/MissingMandatoryParametersException.php b/Exception/MissingMandatoryParametersException.php
@@ -16,8 +16,6 @@
  * mandatory parameters.
  *
  * @author Alexandre Salomé <alexandre.salome@gmail.com>
- *
- * @api
  */
 class MissingMandatoryParametersException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/Exception/ResourceNotFoundException.php b/Exception/ResourceNotFoundException.php
@@ -17,8 +17,6 @@
  * This exception should trigger an HTTP 404 response in your application code.
  *
  * @author Kris Wallsmith <kris@symfony.com>
- *
- * @api
  */
 class ResourceNotFoundException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/Exception/RouteNotFoundException.php b/Exception/RouteNotFoundException.php
@@ -15,8 +15,6 @@
  * Exception thrown when a route does not exist.
  *
  * @author Alexandre Salomé <alexandre.salome@gmail.com>
- *
- * @api
  */
 class RouteNotFoundException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/Generator/Dumper/GeneratorDumperInterface.php b/Generator/Dumper/GeneratorDumperInterface.php
@@ -17,8 +17,6 @@
  * GeneratorDumperInterface is the interface that all generator dumper classes must implement.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 interface GeneratorDumperInterface
 {
diff --git a/Generator/Dumper/PhpGeneratorDumper.php b/Generator/Dumper/PhpGeneratorDumper.php
@@ -16,8 +16,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @api
  */
 class PhpGeneratorDumper extends GeneratorDumper
 {
@@ -32,8 +30,6 @@ class PhpGeneratorDumper extends GeneratorDumper
      * @param array $options An array of options
      *
      * @return string A PHP class representing the generator class
-     *
-     * @api
      */
     public function dump(array $options = array())
     {
diff --git a/Generator/UrlGenerator.php b/Generator/UrlGenerator.php
@@ -24,8 +24,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @api
  */
 class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInterface
 {
@@ -83,8 +81,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
      * @param RouteCollection      $routes  A RouteCollection instance
      * @param RequestContext       $context The context
      * @param LoggerInterface|null $logger  A logger instance
-     *
-     * @api
      */
     public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null)
     {
diff --git a/Generator/UrlGeneratorInterface.php b/Generator/UrlGeneratorInterface.php
@@ -28,8 +28,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @api
  */
 interface UrlGeneratorInterface extends RequestContextAwareInterface
 {
@@ -81,8 +79,6 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
      * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
      * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
      *                                             it does not match the requirement
-     *
-     * @api
      */
     public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH);
 }
diff --git a/Loader/ClosureLoader.php b/Loader/ClosureLoader.php
@@ -20,8 +20,6 @@
  * The Closure must return a RouteCollection instance.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class ClosureLoader extends Loader
 {
@@ -32,8 +30,6 @@ class ClosureLoader extends Loader
      * @param string|null $type    The resource type
      *
      * @return RouteCollection A RouteCollection instance
-     *
-     * @api
      */
     public function load($closure, $type = null)
     {
@@ -42,8 +38,6 @@ public function load($closure, $type = null)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function supports($resource, $type = null)
     {
diff --git a/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -21,8 +21,6 @@
  * The file must return a RouteCollection instance.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class PhpFileLoader extends FileLoader
 {
@@ -33,8 +31,6 @@ class PhpFileLoader extends FileLoader
      * @param string|null $type The resource type
      *
      * @return RouteCollection A RouteCollection instance
-     *
-     * @api
      */
     public function load($file, $type = null)
     {
@@ -49,8 +45,6 @@ public function load($file, $type = null)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function supports($resource, $type = null)
     {
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -22,8 +22,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @api
  */
 class XmlFileLoader extends FileLoader
 {
@@ -40,8 +38,6 @@ class XmlFileLoader extends FileLoader
      *
      * @throws \InvalidArgumentException When the file cannot be loaded or when the XML cannot be
      *                                   parsed because it does not validate against the scheme.
-     *
-     * @api
      */
     public function load($file, $type = null)
     {
@@ -94,8 +90,6 @@ protected function parseNode(RouteCollection $collection, \DOMElement $node, $pa
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function supports($resource, $type = null)
     {
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -23,8 +23,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @api
  */
 class YamlFileLoader extends FileLoader
 {
@@ -42,8 +40,6 @@ class YamlFileLoader extends FileLoader
      * @return RouteCollection A RouteCollection instance
      *
      * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid
-     *
-     * @api
      */
     public function load($file, $type = null)
     {
@@ -106,8 +102,6 @@ public function load($file, $type = null)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function supports($resource, $type = null)
     {
diff --git a/Matcher/RedirectableUrlMatcher.php b/Matcher/RedirectableUrlMatcher.php
@@ -16,8 +16,6 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 abstract class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
 {
diff --git a/Matcher/RedirectableUrlMatcherInterface.php b/Matcher/RedirectableUrlMatcherInterface.php
@@ -15,8 +15,6 @@
  * RedirectableUrlMatcherInterface knows how to redirect the user.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 interface RedirectableUrlMatcherInterface
 {
@@ -28,8 +26,6 @@ interface RedirectableUrlMatcherInterface
      * @param string|null $scheme The URL scheme (null to keep the current one)
      *
      * @return array An array of parameters
-     *
-     * @api
      */
     public function redirect($path, $route, $scheme = null);
 }
diff --git a/Matcher/UrlMatcher.php b/Matcher/UrlMatcher.php
@@ -24,8 +24,6 @@
  * UrlMatcher matches URL based on a set of routes.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
 {
@@ -61,8 +59,6 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
      *
      * @param RouteCollection $routes  A RouteCollection instance
      * @param RequestContext  $context The context
-     *
-     * @api
      */
     public function __construct(RouteCollection $routes, RequestContext $context)
     {
diff --git a/Matcher/UrlMatcherInterface.php b/Matcher/UrlMatcherInterface.php
@@ -19,8 +19,6 @@
  * UrlMatcherInterface is the interface that all URL matcher classes must implement.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 interface UrlMatcherInterface extends RequestContextAwareInterface
 {
@@ -36,8 +34,6 @@ interface UrlMatcherInterface extends RequestContextAwareInterface
      *
      * @throws ResourceNotFoundException If the resource could not be found
      * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
-     *
-     * @api
      */
     public function match($pathinfo);
 }
diff --git a/RequestContext.php b/RequestContext.php
@@ -20,8 +20,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @api
  */
 class RequestContext
 {
@@ -50,8 +48,6 @@ class RequestContext
      * @param int    $httpsPort   The HTTPS port
      * @param string $path        The path
      * @param string $queryString The query string
-     *
-     * @api
      */
     public function __construct($baseUrl = '', $method = 'GET', $host = 'localhost', $scheme = 'http', $httpPort = 80, $httpsPort = 443, $path = '/', $queryString = '')
     {
@@ -102,8 +98,6 @@ public function getBaseUrl()
      * @param string $baseUrl The base URL
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setBaseUrl($baseUrl)
     {
@@ -154,8 +148,6 @@ public function getMethod()
      * @param string $method The HTTP method
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setMethod($method)
     {
@@ -182,8 +174,6 @@ public function getHost()
      * @param string $host The HTTP host
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setHost($host)
     {
@@ -208,8 +198,6 @@ public function getScheme()
      * @param string $scheme The HTTP scheme
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setScheme($scheme)
     {
@@ -234,8 +222,6 @@ public function getHttpPort()
      * @param int $httpPort The HTTP port
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setHttpPort($httpPort)
     {
@@ -260,8 +246,6 @@ public function getHttpsPort()
      * @param int $httpsPort The HTTPS port
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setHttpsPort($httpsPort)
     {
@@ -286,8 +270,6 @@ public function getQueryString()
      * @param string $queryString The query string (after "?")
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setQueryString($queryString)
     {
@@ -352,8 +334,6 @@ public function hasParameter($name)
      * @param mixed  $parameter The parameter value
      *
      * @return RequestContext The current instance, implementing a fluent interface
-     *
-     * @api
      */
     public function setParameter($name, $parameter)
     {
diff --git a/RequestContextAwareInterface.php b/RequestContextAwareInterface.php
diff --git a/Route.php b/Route.php
diff --git a/RouteCollection.php b/RouteCollection.php

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`	`* ExceptionInterface.`
`16`	`16`	`*`
`17`	`17`	`* @author Alexandre Salomé <[email protected]>`
`18`		`- *`
`19`		`- * @api`
`20`	`18`	`*/`
`21`	`19`	`interface ExceptionInterface`
`22`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`* This exception should trigger an HTTP 405 response in your application code.`
`18`	`18`	`*`
`19`	`19`	`* @author Kris Wallsmith <[email protected]>`
`20`		`- *`
`21`		`- * @api`
`22`	`20`	`*/`
`23`	`21`	`class MethodNotAllowedException extends \RuntimeException implements ExceptionInterface`
`24`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`* mandatory parameters.`
`17`	`17`	`*`
`18`	`18`	`* @author Alexandre Salomé <[email protected]>`
`19`		`- *`
`20`		`- * @api`
`21`	`19`	`*/`
`22`	`20`	`class MissingMandatoryParametersException extends \InvalidArgumentException implements ExceptionInterface`
`23`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@`
`24`	`24`	`*`
`25`	`25`	`* @author Fabien Potencier <[email protected]>`
`26`	`26`	`* @author Tobias Schultze <http://tobion.de>`
`27`		`- *`
`28`		`- * @api`
`29`	`27`	`*/`
`30`	`28`	`class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInterface`
`31`	`29`	`{`
`@@ -83,8 +81,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt`
`83`	`81`	`* @param RouteCollection $routes A RouteCollection instance`
`84`	`82`	`* @param RequestContext $context The context`
`85`	`83`	`* @param LoggerInterface\|null $logger A logger instance`
`86`		`- *`
`87`		`- * @api`
`88`	`84`	`*/`
`89`	`85`	`public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null)`
`90`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Fabien Potencier <[email protected]>`
`30`	`30`	`* @author Tobias Schultze <http://tobion.de>`
`31`		`- *`
`32`		`- * @api`
`33`	`31`	`*/`
`34`	`32`	`interface UrlGeneratorInterface extends RequestContextAwareInterface`
`35`	`33`	`{`
`@@ -81,8 +79,6 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface`
`81`	`79`	`* @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route`
`82`	`80`	`* @throws InvalidParameterException When a parameter value for a placeholder is not correct because`
`83`	`81`	`* it does not match the requirement`
`84`		`- *`
`85`		`- * @api`
`86`	`82`	`*/`
`87`	`83`	`public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH);`
`88`	`84`	`}`