upgrade

vendor/symfony/framework-bundle/Routing/DelegatingLoader.php

@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Routing;
+
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Symfony\Component\Config\Exception\FileLoaderLoadException;
+use Symfony\Component\Config\Loader\DelegatingLoader as BaseDelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolverInterface;
+
+/**
+ * DelegatingLoader delegates route loading to other loaders using a loader resolver.
+ *
+ * This implementation resolves the _controller attribute from the short notation
+ * to the fully-qualified form (from a:b:c to class:method).
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DelegatingLoader extends BaseDelegatingLoader
+{
+    protected $parser;
+    private $loading = false;
+
+    /**
+     * Constructor.
+     *
+     * @param ControllerNameParser    $parser   A ControllerNameParser instance
+     * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
+     */
+    public function __construct(ControllerNameParser $parser, LoaderResolverInterface $resolver)
+    {
+        $this->parser = $parser;
+
+        parent::__construct($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($resource, $type = null)
+    {
+        if ($this->loading) {
+            // This can happen if a fatal error occurs in parent::load().
+            // Here is the scenario:
+            // - while routes are being loaded by parent::load() below, a fatal error
+            //   occurs (e.g. parse error in a controller while loading annotations);
+            // - PHP abruptly empties the stack trace, bypassing all catch/finally blocks;
+            //   it then calls the registered shutdown functions;
+            // - the ErrorHandler catches the fatal error and re-injects it for rendering
+            //   thanks to HttpKernel->terminateWithException() (that calls handleException());
+            // - at this stage, if we try to load the routes again, we must prevent
+            //   the fatal error from occurring a second time,
+            //   otherwise the PHP process would be killed immediately;
+            // - while rendering the exception page, the router can be required
+            //   (by e.g. the web profiler that needs to generate an URL);
+            // - this handles the case and prevents the second fatal error
+            //   by triggering an exception beforehand.
+
+            throw new FileLoaderLoadException($resource);
+        }
+        $this->loading = true;
+
+        try {
+            $collection = parent::load($resource, $type);
+        } finally {
+            $this->loading = false;
+        }
+
+        foreach ($collection->all() as $route) {
+            if ($controller = $route->getDefault('_controller')) {
+                try {
+                    $controller = $this->parser->parse($controller);
+                } catch (\InvalidArgumentException $e) {
+                    // unable to optimize unknown notation
+                }
+
+                $route->setDefault('_controller', $controller);
+            }
+        }
+
+        return $collection;
+    }
+}

vendor/symfony/framework-bundle/Routing/RedirectableUrlMatcher.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Routing;
+
+use Symfony\Component\Routing\Matcher\RedirectableUrlMatcher as BaseMatcher;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class RedirectableUrlMatcher extends BaseMatcher
+{
+    /**
+     * Redirects the user to another URL.
+     *
+     * @param string $path   The path info to redirect to
+     * @param string $route  The route that matched
+     * @param string $scheme The URL scheme (null to keep the current one)
+     *
+     * @return array An array of parameters
+     */
+    public function redirect($path, $route, $scheme = null)
+    {
+        return array(
+            '_controller' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::urlRedirectAction',
+            'path' => $path,
+            'permanent' => true,
+            'scheme' => $scheme,
+            'httpPort' => $this->context->getHttpPort(),
+            'httpsPort' => $this->context->getHttpsPort(),
+            '_route' => $route,
+        );
+    }
+}

vendor/symfony/framework-bundle/Routing/Router.php

@@ -0,0 +1,168 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Routing;
+
+use Symfony\Component\Routing\Router as BaseRouter;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+
+/**
+ * This Router creates the Loader only when the cache is empty.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Router extends BaseRouter implements WarmableInterface
+{
+    private $container;
+
+    /**
+     * Constructor.
+     *
+     * @param ContainerInterface $container A ContainerInterface instance
+     * @param mixed              $resource  The main resource to load
+     * @param array              $options   An array of options
+     * @param RequestContext     $context   The context
+     */
+    public function __construct(ContainerInterface $container, $resource, array $options = array(), RequestContext $context = null)
+    {
+        $this->container = $container;
+
+        $this->resource = $resource;
+        $this->context = $context ?: new RequestContext();
+        $this->setOptions($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRouteCollection()
+    {
+        if (null === $this->collection) {
+            $this->collection = $this->container->get('routing.loader')->load($this->resource, $this->options['resource_type']);
+            $this->resolveParameters($this->collection);
+        }
+
+        return $this->collection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function warmUp($cacheDir)
+    {
+        $currentDir = $this->getOption('cache_dir');
+
+        // force cache generation
+        $this->setOption('cache_dir', $cacheDir);
+        $this->getMatcher();
+        $this->getGenerator();
+
+        $this->setOption('cache_dir', $currentDir);
+    }
+
+    /**
+     * Replaces placeholders with service container parameter values in:
+     * - the route defaults,
+     * - the route requirements,
+     * - the route path,
+     * - the route host,
+     * - the route schemes,
+     * - the route methods.
+     *
+     * @param RouteCollection $collection
+     */
+    private function resolveParameters(RouteCollection $collection)
+    {
+        foreach ($collection as $route) {
+            foreach ($route->getDefaults() as $name => $value) {
+                $route->setDefault($name, $this->resolve($value));
+            }
+
+            foreach ($route->getRequirements() as $name => $value) {
+                $route->setRequirement($name, $this->resolve($value));
+            }
+
+            $route->setPath($this->resolve($route->getPath()));
+            $route->setHost($this->resolve($route->getHost()));
+
+            $schemes = array();
+            foreach ($route->getSchemes() as $scheme) {
+                $schemes = array_merge($schemes, explode('|', $this->resolve($scheme)));
+            }
+            $route->setSchemes($schemes);
+
+            $methods = array();
+            foreach ($route->getMethods() as $method) {
+                $methods = array_merge($methods, explode('|', $this->resolve($method)));
+            }
+            $route->setMethods($methods);
+            $route->setCondition($this->resolve($route->getCondition()));
+        }
+    }
+
+    /**
+     * Recursively replaces placeholders with the service container parameters.
+     *
+     * @param mixed $value The source which might contain "%placeholders%"
+     *
+     * @return mixed The source with the placeholders replaced by the container
+     *               parameters. Arrays are resolved recursively.
+     *
+     * @throws ParameterNotFoundException When a placeholder does not exist as a container parameter
+     * @throws RuntimeException           When a container value is not a string or a numeric value
+     */
+    private function resolve($value)
+    {
+        if (is_array($value)) {
+            foreach ($value as $key => $val) {
+                $value[$key] = $this->resolve($val);
+            }
+
+            return $value;
+        }
+
+        if (!is_string($value)) {
+            return $value;
+        }
+
+        $container = $this->container;
+
+        $escapedValue = preg_replace_callback('/%%|%([^%\s]++)%/', function ($match) use ($container, $value) {
+            // skip %%
+            if (!isset($match[1])) {
+                return '%%';
+            }
+
+            $resolved = $container->getParameter($match[1]);
+
+            if (is_string($resolved) || is_numeric($resolved)) {
+                return (string) $resolved;
+            }
+
+            throw new RuntimeException(sprintf(
+                'The container parameter "%s", used in the route configuration value "%s", '.
+                'must be a string or numeric, but it is of type %s.',
+                $match[1],
+                $value,
+                gettype($resolved)
+                )
+            );
+
+        }, $value);
+
+        return str_replace('%%', '%', $escapedValue);
+    }
+}