Remove last legacy codes

nicolas-grekas · nicolas-grekas · commit 3fbce8f3f454 · 2017-07-18T14:00:22.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -91,9 +91,9 @@ public function getUrl($name, $parameters = array(), $schemeRelative = false)
      *
      * @return array An array with the contexts the URL is safe
      *
-     * To be made @final in 3.4, and the type-hint be changed to "\Twig\Node\Node" in 4.0.
+     * @final since version 3.4
      */
-    public function isUrlGenerationSafe(\Twig_Node $argsNode)
+    public function isUrlGenerationSafe(Node $argsNode)
     {
         // support named arguments
         $paramsNode = $argsNode->hasNode('parameters') ? $argsNode->getNode('parameters') : (
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Routing\RouterInterface;
@@ -20,20 +21,16 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4, to be given a container instead in 4.0
+ * @final since version 3.4
  */
-class RouterCacheWarmer implements CacheWarmerInterface
+class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    protected $router;
+    private $container;
 
-    /**
-     * Constructor.
-     *
-     * @param RouterInterface $router A Router instance
-     */
-    public function __construct(RouterInterface $router)
+    public function __construct(ContainerInterface $container)
     {
-        $this->router = $router;
+        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+        $this->container = $container;
     }
 
     /**
@@ -43,8 +40,10 @@ public function __construct(RouterInterface $router)
      */
     public function warmUp($cacheDir)
     {
-        if ($this->router instanceof WarmableInterface) {
-            $this->router->warmUp($cacheDir);
+        $router = $this->container->get('router');
+
+        if ($router instanceof WarmableInterface) {
+            $router->warmUp($cacheDir);
         }
     }
 
@@ -57,4 +56,14 @@ public function isOptional()
     {
         return true;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedServices()
+    {
+        return array(
+            'router' => RouterInterface::class,
+        );
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -629,18 +629,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                     ->info('validation configuration')
                     ->{!class_exists(FullStack::class) && class_exists(Validation::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                     ->children()
-                        ->scalarNode('cache')
-                            ->beforeNormalization()
-                                // Can be removed in 4.0, when validator.mapping.cache.doctrine.apc is removed
-                                ->ifString()->then(function ($v) {
-                                    if ('validator.mapping.cache.doctrine.apc' === $v && !class_exists('Doctrine\Common\Cache\ApcCache')) {
-                                        throw new LogicException('Doctrine APC cache for the validator cannot be enabled as the Doctrine Cache package is not installed.');
-                                    }
-
-                                    return $v;
-                                })
-                            ->end()
-                        ->end()
+                        ->scalarNode('cache')->end()
                         ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && class_exists(Annotation::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
                         ->arrayNode('static_method')
                             ->defaultValue(array('loadValidatorMetadata'))
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -89,8 +89,9 @@
         <service id="Symfony\Component\Routing\RequestContext" alias="router.request_context" />
 
         <service id="router.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer">
+            <tag name="container.service_subscriber" id="router" />
             <tag name="kernel.cache_warmer" />
-            <argument type="service" id="router" />
+            <argument type="service" id="Psr\Container\ContainerInterface" />
         </service>
 
         <service id="router_listener" class="Symfony\Component\HttpKernel\EventListener\RouterListener" public="true">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
@@ -49,17 +49,6 @@
             </argument>
         </service>
 
-        <service id="validator.mapping.cache.doctrine.apc" class="Symfony\Component\Validator\Mapping\Cache\DoctrineCache">
-            <argument type="service">
-                <service class="Doctrine\Common\Cache\ApcCache">
-                    <call method="setNamespace">
-                        <argument>%validator.mapping.cache.prefix%</argument>
-                    </call>
-                </service>
-            </argument>
-            <deprecated>The "%service_id%" service is deprecated since Symfony 3.4 and will be removed in 4.0. Use a Psr6 cache like "validator.mapping.cache.symfony" instead.</deprecated>
-        </service>
-
         <service id="validator.validator_factory" class="Symfony\Component\Validator\ContainerConstraintValidatorFactory">
             <argument /> <!-- Constraint validators locator -->
         </service>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -27,13 +27,10 @@ class WebProfilerExtensionTest extends TestCase
      */
     private $container;
 
-    public static function assertSaneContainer(Container $container, $message = '', $knownPrivates = array())
+    public static function assertSaneContainer(Container $container, $message = '')
     {
         $errors = array();
         foreach ($container->getServiceIds() as $id) {
-            if (in_array($id, $knownPrivates, true)) { // to be removed in 4.0
-                continue;
-            }
             try {
                 $container->get($id);
             } catch (\Exception $e) {
@@ -101,7 +98,7 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene
 
         $this->assertSame($listenerInjected, $this->container->has('web_profiler.debug_toolbar'));
 
-        $this->assertSaneContainer($this->getDumpedContainer(), '', array('web_profiler.csp.handler'));
+        $this->assertSaneContainer($this->getDumpedContainer());
 
         if ($listenerInjected) {
             $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -189,7 +189,7 @@ public function addError(FormError $error);
     /**
      * Returns whether the form and all children are valid.
      *
-     * If the form is not submitted, this method always returns false (but will throw an exception in 4.0).
+     * @throws Exception\LogicException If the form is not submitted.
      *
      * @return bool
      */

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ public function getUrl($name, $parameters = array(), $schemeRelative = false)`
`91`	`91`	`*`
`92`	`92`	`* @return array An array with the contexts the URL is safe`
`93`	`93`	`*`
`94`		`- * To be made @final in 3.4, and the type-hint be changed to "\Twig\Node\Node" in 4.0.`
	`94`	`+ * @final since version 3.4`
`95`	`95`	`*/`
`96`		`- public function isUrlGenerationSafe(\Twig_Node $argsNode)`
	`96`	`+ public function isUrlGenerationSafe(Node $argsNode)`
`97`	`97`	`{`
`98`	`98`	`// support named arguments`
`99`	`99`	`$paramsNode = $argsNode->hasNode('parameters') ? $argsNode->getNode('parameters') : (`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;`
`13`	`13`
	`14`	`+use Psr\Container\ContainerInterface;`
`14`	`15`	`use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;`
`15`	`16`	`use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;`
`16`	`17`	`use Symfony\Component\Routing\RouterInterface;`
`@@ -20,20 +21,16 @@`
`20`	`21`	`*`
`21`	`22`	`* @author Fabien Potencier <fabien@symfony.com>`
`22`	`23`	`*`
`23`		`- * @final since version 3.4, to be given a container instead in 4.0`
	`24`	`+ * @final since version 3.4`
`24`	`25`	`*/`
`25`		`-class RouterCacheWarmer implements CacheWarmerInterface`
	`26`	`+class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface`
`26`	`27`	`{`
`27`		`- protected $router;`
	`28`	`+ private $container;`
`28`	`29`
`29`		`- /**`
`30`		`- * Constructor.`
`31`		`- *`
`32`		`- * @param RouterInterface $router A Router instance`
`33`		`- */`
`34`		`- public function __construct(RouterInterface $router)`
	`30`	`+ public function __construct(ContainerInterface $container)`
`35`	`31`	`{`
`36`		`- $this->router = $router;`
	`32`	`+ // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.`
	`33`	`+ $this->container = $container;`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`/**`
`@@ -43,8 +40,10 @@ public function __construct(RouterInterface $router)`
`43`	`40`	`*/`
`44`	`41`	`public function warmUp($cacheDir)`
`45`	`42`	`{`
`46`		`- if ($this->router instanceof WarmableInterface) {`
`47`		`- $this->router->warmUp($cacheDir);`
	`43`	`+ $router = $this->container->get('router');`
	`44`	`+`
	`45`	`+ if ($router instanceof WarmableInterface) {`
	`46`	`+ $router->warmUp($cacheDir);`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`
`@@ -57,4 +56,14 @@ public function isOptional()`
`57`	`56`	`{`
`58`	`57`	`return true;`
`59`	`58`	`}`
	`59`	`+`
	`60`	`+ /**`
	`61`	`+ * {@inheritdoc}`
	`62`	`+ */`
	`63`	`+ public static function getSubscribedServices()`
	`64`	`+ {`
	`65`	`+ return array(`
	`66`	`+ 'router' => RouterInterface::class,`
	`67`	`+ );`
	`68`	`+ }`
`60`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public function addError(FormError $error);`
`189`	`189`	`/**`
`190`	`190`	`* Returns whether the form and all children are valid.`
`191`	`191`	`*`
`192`		`- * If the form is not submitted, this method always returns false (but will throw an exception in 4.0).`
	`192`	`+ * @throws Exception\LogicException If the form is not submitted.`
`193`	`193`	`*`
`194`	`194`	`* @return bool`
`195`	`195`	`*/`