minor #30406 Removed non-existing parameters for LogoutUrlGenerator calls (King2500)

Robin Chalas · Robin Chalas · commit 3af6406f5ed0 · 2019-03-02T17:24:52.000+01:00
This PR was squashed before being merged into the 3.4 branch (closes #30406). Discussion ---------- Removed non-existing parameters for LogoutUrlGenerator calls | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  Is there a reason these arguments are in place, though they dont actually exist as parameters for `LogoutUrlGenerator::getLogoutPath` and `::getLogoutUrl`? see https://github.com/symfony/symfony/blob/3.4/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php#L76 and https://github.com/symfony/symfony/blob/3.4/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php#L88 If there is no reason, this PR can be merged, because this parameter makes no sense there. ;-) Commits ------- d3ee2b6 Removed non-existing parameters for LogoutUrlGenerator calls
diff --git a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Templating\Helper;
 
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Logout\LogoutUrlGenerator;
 use Symfony\Component\Templating\Helper\Helper;
 
@@ -38,7 +37,7 @@ public function __construct(LogoutUrlGenerator $generator)
      */
     public function getLogoutPath($key)
     {
-        return $this->generator->getLogoutPath($key, UrlGeneratorInterface::ABSOLUTE_PATH);
+        return $this->generator->getLogoutPath($key);
     }
 
     /**
@@ -50,7 +49,7 @@ public function getLogoutPath($key)
      */
     public function getLogoutUrl($key)
     {
-        return $this->generator->getLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_URL);
+        return $this->generator->getLogoutUrl($key);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\SecurityBundle\Templating\Helper;`
`13`	`13`
`14`		`-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;`
`15`	`14`	`use Symfony\Component\Security\Http\Logout\LogoutUrlGenerator;`
`16`	`15`	`use Symfony\Component\Templating\Helper\Helper;`
`17`	`16`
`@@ -38,7 +37,7 @@ public function __construct(LogoutUrlGenerator $generator)`
`38`	`37`	`*/`
`39`	`38`	`public function getLogoutPath($key)`
`40`	`39`	`{`
`41`		`- return $this->generator->getLogoutPath($key, UrlGeneratorInterface::ABSOLUTE_PATH);`
	`40`	`+ return $this->generator->getLogoutPath($key);`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`/**`
`@@ -50,7 +49,7 @@ public function getLogoutPath($key)`
`50`	`49`	`*/`
`51`	`50`	`public function getLogoutUrl($key)`
`52`	`51`	`{`
`53`		`- return $this->generator->getLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_URL);`
	`52`	`+ return $this->generator->getLogoutUrl($key);`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`/**`