diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2011-02-27 21:16:13 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2011-02-27 21:16:13 +0100 |
| commit | b3817718baeb272b197cddd81e6e7610d50395b3 (patch) | |
| tree | 18f0d51735549184e9c5ca9c93a8057240493993 | |
| parent | 0ac6fa82ca27809cbccc1f7ec7d88422ae3ab443 (diff) | |
| parent | 1cee9e2cacd318b59fc0c6564feed62b8ce81e70 (diff) | |
| download | symfony-security-b3817718baeb272b197cddd81e6e7610d50395b3.zip symfony-security-b3817718baeb272b197cddd81e6e7610d50395b3.tar.gz symfony-security-b3817718baeb272b197cddd81e6e7610d50395b3.tar.bz2 | |
fixed merge
| -rw-r--r-- | Acl/Dbal/AclProvider.php | 3 | ||||
| -rw-r--r-- | Acl/Dbal/MutableAclProvider.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php index c45a597..f883599 100644 --- a/Acl/Dbal/AclProvider.php +++ b/Acl/Dbal/AclProvider.php @@ -437,8 +437,7 @@ class AclProvider implements AclProviderInterface // fill-in parent ACLs where this hasn't been done yet cause the parent ACL was not // yet available $processed = 0; - foreach ($parentIdToFill as $acl) - { + foreach ($parentIdToFill as $acl) { $parentId = $parentIdToFill->offsetGet($acl); // let's see if we have already hydrated this diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index da5ded9..3a8eebc 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -860,8 +860,7 @@ QUERY; */ protected function updateAces(\SplObjectStorage $aces) { - foreach ($aces as $ace) - { + foreach ($aces as $ace) { $propertyChanges = $aces->offsetGet($ace); $sets = array(); |