summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-03-30 17:33:35 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2015-03-30 17:33:35 +0200
commit25e914f2b63d4021af1fb0e510ac0843f1bdb3ee (patch)
treefdc3209a2fcea72a41eefce45e400dfd65c6e34c
parent18435f22371644ee2d1e4adfb79c28f1737952a9 (diff)
parentfb7e9db41c92a967194fb26ed4fef4ce95c7cdac (diff)
downloadsymfony-security-25e914f2b63d4021af1fb0e510ac0843f1bdb3ee.zip
symfony-security-25e914f2b63d4021af1fb0e510ac0843f1bdb3ee.tar.gz
symfony-security-25e914f2b63d4021af1fb0e510ac0843f1bdb3ee.tar.bz2
minor #14090 CS: Unary operators should be placed adjacent to their operands (keradus)v2.3.27
This PR was merged into the 2.3 branch. Discussion ---------- CS: Unary operators should be placed adjacent to their operands | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | N/A | License | MIT | Doc PR | N/A Update before upcoming changes on PHP CS Fixer 1.7 To keep fabbot.io happy ;) Commits ------- 2367f4a CS: Unary operators should be placed adjacent to their operands
-rw-r--r--Acl/Dbal/AclProvider.php4
-rw-r--r--Acl/Domain/Acl.php12
-rw-r--r--Core/Authentication/Token/AbstractToken.php2
3 files changed, 9 insertions, 9 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 2cc2111..750a304 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -507,8 +507,8 @@ QUERY;
$acls = $aces = $emptyArray = array();
$oidCache = $oidLookup;
$result = new \SplObjectStorage();
- $loadedAces = & $this->loadedAces;
- $loadedAcls = & $this->loadedAcls;
+ $loadedAces = &$this->loadedAces;
+ $loadedAcls = &$this->loadedAcls;
$permissionGrantingStrategy = $this->permissionGrantingStrategy;
// we need these to set protected properties on hydrated objects
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index 364f6b8..63a58c7 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -405,7 +405,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
*/
private function deleteAce($property, $index)
{
- $aces = & $this->$property;
+ $aces = &$this->$property;
if (!isset($aces[$index])) {
throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index));
}
@@ -431,7 +431,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
*/
private function deleteFieldAce($property, $index, $field)
{
- $aces = & $this->$property;
+ $aces = &$this->$property;
if (!isset($aces[$field][$index])) {
throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index));
}
@@ -477,7 +477,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
}
- $aces = & $this->$property;
+ $aces = &$this->$property;
$oldValue = $this->$property;
if (isset($aces[$index])) {
$this->$property = array_merge(
@@ -527,7 +527,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
}
- $aces = & $this->$property;
+ $aces = &$this->$property;
if (!isset($aces[$field])) {
$aces[$field] = array();
}
@@ -565,7 +565,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
*/
private function updateAce($property, $index, $mask, $strategy = null)
{
- $aces = & $this->$property;
+ $aces = &$this->$property;
if (!isset($aces[$index])) {
throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index));
}
@@ -626,7 +626,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
throw new \InvalidArgumentException('$field cannot be empty.');
}
- $aces = & $this->$property;
+ $aces = &$this->$property;
if (!isset($aces[$field][$index])) {
throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index));
}
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
index d2dc668..a2aefb1 100644
--- a/Core/Authentication/Token/AbstractToken.php
+++ b/Core/Authentication/Token/AbstractToken.php
@@ -252,7 +252,7 @@ abstract class AbstractToken implements TokenInterface
}
if ($this->user instanceof EquatableInterface) {
- return ! (bool) $this->user->isEqualTo($user);
+ return !(bool) $this->user->isEqualTo($user);
}
if ($this->user->getPassword() !== $user->getPassword()) {