minor #27497 [FrameworkBundle][SecurityBundle] Remove no-longer necessary Bundle::registerCommands override (ogizanagi)

nicolas-grekas · nicolas-grekas · commit cc0320f1e18e · 2018-06-04T21:23:39.000+02:00
This PR was merged into the 4.1 branch. Discussion ---------- [FrameworkBundle][SecurityBundle] Remove no-longer necessary Bundle::registerCommands override | Q | A | ------------- | --- | Branch? | 4.1  | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | N/A  | License | MIT | Doc PR | N/A These two bundles requires `symfony/http-kernel:^4.1` which already makes [`Bundle::registerCommands`](https://github.com/symfony/symfony/blob/49ad34b78ec83ac7b65506a73e6003aba5860333/src/Symfony/Component/HttpKernel/Bundle/Bundle.php#L143-L145) a noop. Commits ------- 7c97846 [FrameworkBundle][SecurityBundle] Remove no-longer necessary Bundle::registerCommands override
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -27,7 +27,6 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerRealRefPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
@@ -137,9 +136,4 @@ private function addCompilerPassIfExists(ContainerBuilder $container, $class, $t
             $container->addCompilerPass(new $class(), $type, $priority);
         }
     }
-
-    public function registerCommands(Application $application)
-    {
-        // noop
-    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -13,7 +13,6 @@
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterCsrfTokenClearingLogoutHandlerPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\JsonLoginFactory;
-use Symfony\Component\Console\Application;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -62,9 +61,4 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new AddSessionDomainConstraintPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->addCompilerPass(new RegisterCsrfTokenClearingLogoutHandlerPass());
     }
-
-    public function registerCommands(Application $application)
-    {
-        // noop
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerRealRefPass;`
`28`	`28`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;`
`29`	`29`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;`
`30`		`-use Symfony\Component\Console\Application;`
`31`	`30`	`use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;`
`32`	`31`	`use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;`
`33`	`32`	`use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;`
`@@ -137,9 +136,4 @@ private function addCompilerPassIfExists(ContainerBuilder $container, $class, $t`
`137`	`136`	`$container->addCompilerPass(new $class(), $type, $priority);`
`138`	`137`	`}`
`139`	`138`	`}`
`140`		`-`
`141`		`- public function registerCommands(Application $application)`
`142`		`- {`
`143`		`- // noop`
`144`		`- }`
`145`	`139`	`}`