minor #31676 [HttpKernel] Cleanup legacy in ConfigDataCollector (ro0NL)

nicolas-grekas · nicolas-grekas · commit 86f7513d0a5b · 2019-05-29T11:14:04.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [HttpKernel] Cleanup legacy in ConfigDataCollector | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  See #28939 Commits ------- 09ca33c [HttpKernel] Cleanup legacy in ConfigDataCollector
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -26,21 +26,10 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
      * @var KernelInterface
      */
     private $kernel;
-    private $name;
-    private $version;
     private $hasVarDumper;
 
-    public function __construct(string $name = null, string $version = null)
+    public function __construct()
     {
-        if (1 <= \func_num_args()) {
-            @trigger_error(sprintf('The "$name" argument in method "%s()" is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
-        }
-        if (2 <= \func_num_args()) {
-            @trigger_error(sprintf('The "$version" argument in method "%s()" is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
-        }
-
-        $this->name = $name;
-        $this->version = $version;
         $this->hasVarDumper = class_exists(LinkStub::class);
     }
 
@@ -58,8 +47,6 @@ public function setKernel(KernelInterface $kernel = null)
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         $this->data = [
-            'app_name' => $this->name,
-            'app_version' => $this->version,
             'token' => $response->headers->get('X-Debug-Token'),
             'symfony_version' => Kernel::VERSION,
             'symfony_state' => 'unknown',
@@ -109,26 +96,6 @@ public function lateCollect()
         $this->data = $this->cloneVar($this->data);
     }
 
-    /**
-     * @deprecated since Symfony 4.2
-     */
-    public function getApplicationName()
-    {
-        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->data['app_name'];
-    }
-
-    /**
-     * @deprecated since Symfony 4.2
-     */
-    public function getApplicationVersion()
-    {
-        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->data['app_version'];
-    }
-
     /**
      * Gets the token.
      *
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -42,22 +42,6 @@ public function testCollect()
         $this->assertSame(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN), $c->hasZendOpcache());
         $this->assertSame(\extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN), $c->hasApcu());
     }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation The "$name" argument in method "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector::__construct()" is deprecated since Symfony 4.2.
-     * @expectedDeprecation The "$version" argument in method "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector::__construct()" is deprecated since Symfony 4.2.
-     * @expectedDeprecation The method "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector::getApplicationName()" is deprecated since Symfony 4.2.
-     * @expectedDeprecation The method "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector::getApplicationVersion()" is deprecated since Symfony 4.2.
-     */
-    public function testLegacy()
-    {
-        $c = new ConfigDataCollector('name', null);
-        $c->collect(new Request(), new Response());
-
-        $this->assertSame('name', $c->getApplicationName());
-        $this->assertNull($c->getApplicationVersion());
-    }
 }
 
 class KernelForTest extends Kernel
