feature symfony#16107 [3.0] Various deprecations cleanups (nicolas-grekas)

This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] Various deprecations cleanups

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

534a91c [3.0] Various deprecations cleanups

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php

@@ -15,10 +15,6 @@
             <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="335" />
         </service>
 
-        <service id="data_collector.ajax" class="Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="315" />
-        </service>
-
         <service id="data_collector.exception" class="Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="305" />
         </service>

src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

@@ -77,10 +77,5 @@ public function process(ContainerBuilder $container)
         if ($container->has('assets.packages')) {
             $container->getDefinition('twig.extension.assets')->addTag('twig.extension');
         }
-
-        if (method_exists('Symfony\Bridge\Twig\AppVariable', 'setContainer')) {
-            // we are on Symfony <3.0, where the setContainer method exists
-            $container->getDefinition('twig.app_variable')->addMethodCall('setContainer', array(new Reference('service_container')));
-        }
     }
 }

src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php

@@ -116,27 +116,6 @@ public function panelAction(Request $request, $token)
         )), 200, array('Content-Type' => 'text/html'));
     }
 
-    /**
-     * Purges all tokens.
-     *
-     * @return Response A Response instance
-     *
-     * @throws NotFoundHttpException
-     */
-    public function purgeAction()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if (null === $this->profiler) {
-            throw new NotFoundHttpException('The profiler must be enabled.');
-        }
-
-        $this->profiler->disable();
-        $this->profiler->purge();
-
-        return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'purge')), 302, array('Content-Type' => 'text/html'));
-    }
-
     /**
      * Displays information page.
      *

src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

@@ -16,10 +16,6 @@
         <default key="_controller">web_profiler.controller.profiler:searchBarAction</default>
     </route>
 
-    <route id="_profiler_purge" path="/purge">
-        <default key="_controller">web_profiler.controller.profiler:purgeAction</default>
-    </route>
-
     <route id="_profiler_info" path="/info/{about}">
         <default key="_controller">web_profiler.controller.profiler:infoAction</default>
     </route>

src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/profiler.xml

@@ -221,7 +221,7 @@ private function parseDefinition(\DOMElement $service, $file)
                 if (false !== strpos($name, '-') && false === strpos($name, '_') && !array_key_exists($normalizedName = str_replace('-', '_', $name), $parameters)) {
                     $parameters[$normalizedName] = XmlUtils::phpize($node->nodeValue);
                 }
-                // keep not normalized key for BC too
+                // keep not normalized key
                 $parameters[$name] = XmlUtils::phpize($node->nodeValue);
             }
 

src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

@@ -901,12 +901,7 @@ private function relativize($xpath)
                 $expression = substr($expression, strlen($parenthesis));
             }
 
-            // BC for Symfony 2.4 and lower were elements were adding in a fake _root parent
-            if (0 === strpos($expression, '/_root/')) {
-                @trigger_error('XPath expressions referencing the fake root node are deprecated since version 2.8 and will be unsupported in 3.0. Please use "./" instead of "/_root/".', E_USER_DEPRECATED);
-
-                $expression = './'.substr($expression, 7);
-            } elseif (0 === strpos($expression, 'self::*/')) {
+            if (0 === strpos($expression, 'self::*/')) {
                 $expression = './'.substr($expression, 8);
             }
 
@@ -921,12 +916,7 @@ private function relativize($xpath)
                 $expression = 'self::'.substr($expression, 2);
             } elseif (0 === strpos($expression, 'child::')) {
                 $expression = 'self::'.substr($expression, 7);
-            } elseif ('/' === $expression[0] || 0 === strpos($expression, 'self::')) {
-                // the only direct child in Symfony 2.4 and lower is _root, which is already handled previously
-                // so let's drop the expression entirely
-                $expression = $nonMatchingExpression;
-            } elseif ('.' === $expression[0]) {
-                // '.' is the fake root element in Symfony 2.4 and lower, which is excluded from results
+            } elseif ('/' === $expression[0] || '.' === $expression[0] || 0 === strpos($expression, 'self::')) {
                 $expression = $nonMatchingExpression;
             } elseif (0 === strpos($expression, 'descendant::')) {
                 $expression = 'descendant-or-self::'.substr($expression, strlen('descendant::'));

src/Symfony/Component/DomCrawler/Crawler.php

@@ -551,16 +551,6 @@ public function testFilterXPathWithFakeRoot()
         $this->assertCount(0, $crawler->filterXPath('self::_root'), '->filterXPath() returns an empty result if the XPath references the fake root node');
     }
 
-    /** @group legacy */
-    public function testLegacyFilterXPathWithFakeRoot()
-    {
-        $crawler = $this->createTestCrawler();
-        $this->assertCount(0, $crawler->filterXPath('/_root'), '->filterXPath() returns an empty result if the XPath references the fake root node');
-
-        $crawler = $this->createTestCrawler()->filterXPath('//body');
-        $this->assertCount(1, $crawler->filterXPath('/_root/body'));
-    }
-
     public function testFilterXPathWithAncestorAxis()
     {
         $crawler = $this->createTestCrawler()->filterXPath('//form');

src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php

@@ -34,8 +34,6 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        // We need an actual dispatcher to use the deprecated
-        // bindRequest() method
         $this->dispatcher = new EventDispatcher();
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->form = $this->createForm();

src/Symfony/Component/Form/Tests/AbstractFormTest.php

@@ -268,7 +268,6 @@ public function getProcess()
         $script = implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $arguments));
 
         if ($this->inheritEnv) {
-            // include $_ENV for BC purposes
             $env = array_replace($_ENV, $_SERVER, $this->env);
         } else {
             $env = $this->env;