minor symfony#30653 SCA: minor code tweaks (kalessil)

nicolas-grekas · nicolas-grekas · commit 4f94b1769bfe · 2019-04-01T09:09:39.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- SCA: minor code tweaks | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a - minor code tweaks - drop private properties, which used as local variables Commits ------- cc4529d SCA: minor code tweaks
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -96,11 +96,7 @@ private function getKernel()
             ->expects($this->atLeastOnce())
             ->method('has')
             ->will($this->returnCallback(function ($id) {
-                if ('console.command_loader' === $id) {
-                    return false;
-                }
-
-                return true;
+                return 'console.command_loader' !== $id;
             }))
         ;
         $container
diff --git a/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php b/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php
@@ -13,13 +13,12 @@
 
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
+class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface
 {
     use ProxyTrait;
 
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -33,7 +33,6 @@ final class Dotenv
     private $lineno;
     private $data;
     private $end;
-    private $state;
     private $values;
 
     /**
@@ -111,27 +110,27 @@ public function parse($data, $path = '.env')
         $this->lineno = 1;
         $this->cursor = 0;
         $this->end = \strlen($this->data);
-        $this->state = self::STATE_VARNAME;
+        $state = self::STATE_VARNAME;
         $this->values = [];
         $name = '';
 
         $this->skipEmptyLines();
 
         while ($this->cursor < $this->end) {
-            switch ($this->state) {
+            switch ($state) {
                 case self::STATE_VARNAME:
                     $name = $this->lexVarname();
-                    $this->state = self::STATE_VALUE;
+                    $state = self::STATE_VALUE;
                     break;
 
                 case self::STATE_VALUE:
                     $this->values[$name] = $this->lexValue();
-                    $this->state = self::STATE_VARNAME;
+                    $state = self::STATE_VARNAME;
                     break;
             }
         }
 
-        if (self::STATE_VALUE === $this->state) {
+        if (self::STATE_VALUE === $state) {
             $this->values[$name] = '';
         }
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -105,7 +105,7 @@ public function configure(Event $event = null)
                 if (method_exists($kernel = $event->getKernel(), 'terminateWithException')) {
                     $request = $event->getRequest();
                     $hasRun = &$this->hasTerminatedWithException;
-                    $this->exceptionHandler = function (\Exception $e) use ($kernel, $request, &$hasRun) {
+                    $this->exceptionHandler = static function (\Exception $e) use ($kernel, $request, &$hasRun) {
                         if ($hasRun) {
                             throw $e;
                         }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
@@ -215,7 +215,7 @@ private function storeRelativeAgeDirective($directive, $value, $age)
         }
 
         if (false !== $this->ageDirectives[$directive]) {
-            $value = $value - $age;
+            $value -= $age;
             $this->ageDirectives[$directive] = null !== $this->ageDirectives[$directive] ? min($this->ageDirectives[$directive], $value) : $value;
         }
     }
diff --git a/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php b/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
@@ -47,7 +47,7 @@ public function __construct(UserInterface $user, $providerKey, array $roles)
 
         // this token is meant to be used after authentication success, so it is always authenticated
         // you could set it as non authenticated later if you need to
-        parent::setAuthenticated(true);
+        $this->setAuthenticated(true);
     }
 
     /**
diff --git a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php
@@ -16,6 +16,6 @@
  *
  * @author Matt Johnson <matj1985@gmail.com>
  */
-class InvalidTokenConfigurationException extends LogicException implements ExceptionInterface
+class InvalidTokenConfigurationException extends LogicException
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function configure(Event $event = null)`
`105`	`105`	`if (method_exists($kernel = $event->getKernel(), 'terminateWithException')) {`
`106`	`106`	`$request = $event->getRequest();`
`107`	`107`	`$hasRun = &$this->hasTerminatedWithException;`
`108`		`- $this->exceptionHandler = function (\Exception $e) use ($kernel, $request, &$hasRun) {`
	`108`	`+ $this->exceptionHandler = static function (\Exception $e) use ($kernel, $request, &$hasRun) {`
`109`	`109`	`if ($hasRun) {`
`110`	`110`	`throw $e;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ private function storeRelativeAgeDirective($directive, $value, $age)`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`if (false !== $this->ageDirectives[$directive]) {`
`218`		`- $value = $value - $age;`
	`218`	`+ $value -= $age;`
`219`	`219`	`$this->ageDirectives[$directive] = null !== $this->ageDirectives[$directive] ? min($this->ageDirectives[$directive], $value) : $value;`
`220`	`220`	`}`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(UserInterface $user, $providerKey, array $roles)`
`47`	`47`
`48`	`48`	`// this token is meant to be used after authentication success, so it is always authenticated`
`49`	`49`	`// you could set it as non authenticated later if you need to`
`50`		`- parent::setAuthenticated(true);`
	`50`	`+ $this->setAuthenticated(true);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Matt Johnson <matj1985@gmail.com>`
`18`	`18`	`*/`
`19`		`-class InvalidTokenConfigurationException extends LogicException implements ExceptionInterface`
	`19`	`+class InvalidTokenConfigurationException extends LogicException`
`20`	`20`	`{`
`21`	`21`	`}`