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

@ -15,8 +15,6 @@ namespace Symfony\Component\Routing\Exception;
* ExceptionInterface.
*
* @author Alexandre Salomé <alexandre.salome@gmail.com>
*
* @api
*/
interface ExceptionInterface
{

View file

@ -15,8 +15,6 @@ namespace Symfony\Component\Routing\Exception;
* Exception thrown when a parameter is not valid.
*
* @author Alexandre Salomé <alexandre.salome@gmail.com>
*
* @api
*/
class InvalidParameterException extends \InvalidArgumentException implements ExceptionInterface
{

View file

@ -17,8 +17,6 @@ namespace Symfony\Component\Routing\Exception;
* 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
{

View file

@ -16,8 +16,6 @@ namespace Symfony\Component\Routing\Exception;
* mandatory parameters.
*
* @author Alexandre Salomé <alexandre.salome@gmail.com>
*
* @api
*/
class MissingMandatoryParametersException extends \InvalidArgumentException implements ExceptionInterface
{

View file

@ -17,8 +17,6 @@ namespace Symfony\Component\Routing\Exception;
* 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
{

View file

@ -15,8 +15,6 @@ namespace Symfony\Component\Routing\Exception;
* Exception thrown when a route does not exist.
*
* @author Alexandre Salomé <alexandre.salome@gmail.com>
*
* @api
*/
class RouteNotFoundException extends \InvalidArgumentException implements ExceptionInterface
{

View file

@ -17,8 +17,6 @@ use Symfony\Component\Routing\RouteCollection;
* GeneratorDumperInterface is the interface that all generator dumper classes must implement.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
interface GeneratorDumperInterface
{

View file

@ -16,8 +16,6 @@ namespace Symfony\Component\Routing\Generator\Dumper;
*
* @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())
{

View file

@ -24,8 +24,6 @@ use Psr\Log\LoggerInterface;
*
* @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)
{

View file

@ -28,8 +28,6 @@ use Symfony\Component\Routing\RequestContextAwareInterface;
*
* @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);
}

View file

@ -20,8 +20,6 @@ use Symfony\Component\Routing\RouteCollection;
* 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 @@ class ClosureLoader extends Loader
/**
* {@inheritdoc}
*
* @api
*/
public function supports($resource, $type = null)
{

View file

@ -21,8 +21,6 @@ use Symfony\Component\Routing\RouteCollection;
* 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 @@ class PhpFileLoader extends FileLoader
/**
* {@inheritdoc}
*
* @api
*/
public function supports($resource, $type = null)
{

View file

@ -22,8 +22,6 @@ use Symfony\Component\Config\Util\XmlUtils;
*
* @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 @@ class XmlFileLoader extends FileLoader
/**
* {@inheritdoc}
*
* @api
*/
public function supports($resource, $type = null)
{

View file

@ -23,8 +23,6 @@ use Symfony\Component\Config\Loader\FileLoader;
*
* @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)
{
@ -62,7 +58,7 @@ class YamlFileLoader extends FileLoader
}
try {
$config = $this->yamlParser->parse(file_get_contents($path));
$parsedConfig = $this->yamlParser->parse(file_get_contents($path));
} catch (ParseException $e) {
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
}
@ -71,16 +67,16 @@ class YamlFileLoader extends FileLoader
$collection->addResource(new FileResource($path));
// empty file
if (null === $config) {
if (null === $parsedConfig) {
return $collection;
}
// not an array
if (!is_array($config)) {
if (!is_array($parsedConfig)) {
throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $path));
}
foreach ($config as $name => $config) {
foreach ($parsedConfig as $name => $config) {
if (isset($config['pattern'])) {
if (isset($config['path'])) {
throw new \InvalidArgumentException(sprintf('The file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
@ -106,8 +102,6 @@ class YamlFileLoader extends FileLoader
/**
* {@inheritdoc}
*
* @api
*/
public function supports($resource, $type = null)
{

View file

@ -15,6 +15,8 @@ namespace Symfony\Component\Routing\Matcher\Dumper;
* Collection of routes.
*
* @author Arnaud Le Blanc <arnaud.lb@gmail.com>
*
* @internal
*/
class DumperCollection implements \IteratorAggregate
{

View file

@ -15,6 +15,8 @@ namespace Symfony\Component\Routing\Matcher\Dumper;
* Prefix tree of routes preserving routes order.
*
* @author Arnaud Le Blanc <arnaud.lb@gmail.com>
*
* @internal
*/
class DumperPrefixCollection extends DumperCollection
{

View file

@ -17,6 +17,8 @@ use Symfony\Component\Routing\Route;
* Container for a Route.
*
* @author Arnaud Le Blanc <arnaud.lb@gmail.com>
*
* @internal
*/
class DumperRoute
{

View file

@ -16,8 +16,6 @@ use Symfony\Component\Routing\Route;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
*/
abstract class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
{

View file

@ -15,8 +15,6 @@ namespace Symfony\Component\Routing\Matcher;
* 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);
}

View file

@ -24,8 +24,6 @@ use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
* 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)
{

View file

@ -19,8 +19,6 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException;
* 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);
}

View file

@ -20,8 +20,6 @@ use Symfony\Component\HttpFoundation\Request;
*
* @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 @@ class RequestContext
* @param string $baseUrl The base URL
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setBaseUrl($baseUrl)
{
@ -154,8 +148,6 @@ class RequestContext
* @param string $method The HTTP method
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setMethod($method)
{
@ -182,8 +174,6 @@ class RequestContext
* @param string $host The HTTP host
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setHost($host)
{
@ -208,8 +198,6 @@ class RequestContext
* @param string $scheme The HTTP scheme
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setScheme($scheme)
{
@ -234,8 +222,6 @@ class RequestContext
* @param int $httpPort The HTTP port
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setHttpPort($httpPort)
{
@ -260,8 +246,6 @@ class RequestContext
* @param int $httpsPort The HTTPS port
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setHttpsPort($httpsPort)
{
@ -286,8 +270,6 @@ class RequestContext
* @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 @@ class RequestContext
* @param mixed $parameter The parameter value
*
* @return RequestContext The current instance, implementing a fluent interface
*
* @api
*/
public function setParameter($name, $parameter)
{

View file

@ -11,17 +11,12 @@
namespace Symfony\Component\Routing;
/**
* @api
*/
interface RequestContextAwareInterface
{
/**
* Sets the request context.
*
* @param RequestContext $context The context
*
* @api
*/
public function setContext(RequestContext $context);
@ -29,8 +24,6 @@ interface RequestContextAwareInterface
* Gets the request context.
*
* @return RequestContext The context
*
* @api
*/
public function getContext();
}

View file

@ -16,8 +16,6 @@ namespace Symfony\Component\Routing;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Tobias Schultze <http://tobion.de>
*
* @api
*/
class Route implements \Serializable
{
@ -81,8 +79,6 @@ class Route implements \Serializable
* @param string|array $schemes A required URI scheme or an array of restricted schemes
* @param string|array $methods A required HTTP method or an array of restricted methods
* @param string $condition A condition that should evaluate to true for the route to match
*
* @api
*/
public function __construct($path, array $defaults = array(), array $requirements = array(), array $options = array(), $host = '', $schemes = array(), $methods = array(), $condition = '')
{
@ -372,8 +368,6 @@ class Route implements \Serializable
* @param mixed $value The option value
*
* @return Route The current Route instance
*
* @api
*/
public function setOption($name, $value)
{
@ -483,8 +477,6 @@ class Route implements \Serializable
* @param mixed $default The default value
*
* @return Route The current Route instance
*
* @api
*/
public function setDefault($name, $default)
{
@ -576,8 +568,6 @@ class Route implements \Serializable
* @param string $regex The regex
*
* @return Route The current Route instance
*
* @api
*/
public function setRequirement($key, $regex)
{

View file

@ -22,8 +22,6 @@ use Symfony\Component\Config\Resource\ResourceInterface;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Tobias Schultze <http://tobion.de>
*
* @api
*/
class RouteCollection implements \IteratorAggregate, \Countable
{
@ -73,8 +71,6 @@ class RouteCollection implements \IteratorAggregate, \Countable
*
* @param string $name The route name
* @param Route $route A Route instance
*
* @api
*/
public function add($name, Route $route)
{
@ -122,8 +118,6 @@ class RouteCollection implements \IteratorAggregate, \Countable
* routes of the added collection.
*
* @param RouteCollection $collection A RouteCollection instance
*
* @api
*/
public function addCollection(RouteCollection $collection)
{
@ -143,8 +137,6 @@ class RouteCollection implements \IteratorAggregate, \Countable
* @param string $prefix An optional prefix to add before each pattern of the route collection
* @param array $defaults An array of default values
* @param array $requirements An array of requirements
*
* @api
*/
public function addPrefix($prefix, array $defaults = array(), array $requirements = array())
{

View file

@ -19,7 +19,6 @@
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7",
"symfony/config": "~2.7",
"symfony/http-foundation": "~2.3",
"symfony/yaml": "~2.0,>=2.0.5",