!squash code style fixes

oleg-andreyev · oleg-andreyev · commit 8df50ce51cf3 · 2019-06-11T15:03:06.000+03:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
@@ -45,7 +45,7 @@ public function refreshUser(UserInterface $user)
         }
 
         $storedUser = $this->getUser($user->getUsername());
-        $class = get_class($storedUser);
+        $class = \get_class($storedUser);
 
         return new $class($storedUser->getUsername(), $storedUser->getPassword(), $storedUser->getRoles(), $storedUser->isEnabled(), $storedUser->isAccountNonExpired(), $storedUser->isCredentialsNonExpired() && $storedUser->getPassword() === $user->getPassword(), $storedUser->isAccountNonLocked());
     }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -275,12 +275,12 @@ private function hasUserChanged(UserInterface $user)
             return true;
         }
 
-        $rolesChanged = \count(
+        $rolesChanged = 1 === \count(
             array_diff(
                 (array) $this->user->getRoles(),
                 (array) $user->getRoles()
             )
-        ) === 1;
+        );
 
         if ($rolesChanged) {
             return true;
diff --git a/src/Symfony/Component/Security/Core/User/User.php b/src/Symfony/Component/Security/Core/User/User.php
@@ -135,12 +135,12 @@ public function isEqualTo(UserInterface $user)
             return false;
         }
 
-        $rolesChanged = \count(
+        $rolesChanged = 1 === \count(
             array_diff(
                 (array) $this->getRoles(),
                 (array) $user->getRoles()
             )
-        ) === 1;
+        );
 
         if ($rolesChanged) {
             return false;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function refreshUser(UserInterface $user)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$storedUser = $this->getUser($user->getUsername());`
`48`		`- $class = get_class($storedUser);`
	`48`	`+ $class = \get_class($storedUser);`
`49`	`49`
`50`	`50`	`return new $class($storedUser->getUsername(), $storedUser->getPassword(), $storedUser->getRoles(), $storedUser->isEnabled(), $storedUser->isAccountNonExpired(), $storedUser->isCredentialsNonExpired() && $storedUser->getPassword() === $user->getPassword(), $storedUser->isAccountNonLocked());`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,12 +275,12 @@ private function hasUserChanged(UserInterface $user)`
`275`	`275`	`return true;`
`276`	`276`	`}`
`277`	`277`
`278`		`- $rolesChanged = \count(`
	`278`	`+ $rolesChanged = 1 === \count(`
`279`	`279`	`array_diff(`
`280`	`280`	`(array) $this->user->getRoles(),`
`281`	`281`	`(array) $user->getRoles()`
`282`	`282`	`)`
`283`		`- ) === 1;`
	`283`	`+ );`
`284`	`284`
`285`	`285`	`if ($rolesChanged) {`
`286`	`286`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -135,12 +135,12 @@ public function isEqualTo(UserInterface $user)`
`135`	`135`	`return false;`
`136`	`136`	`}`
`137`	`137`
`138`		`- $rolesChanged = \count(`
	`138`	`+ $rolesChanged = 1 === \count(`
`139`	`139`	`array_diff(`
`140`	`140`	`(array) $this->getRoles(),`
`141`	`141`	`(array) $user->getRoles()`
`142`	`142`	`)`
`143`		`- ) === 1;`
	`143`	`+ );`
`144`	`144`
`145`	`145`	`if ($rolesChanged) {`
`146`	`146`	`return false;`