summaryrefslogtreecommitdiffstats
path: root/Acl
diff options
context:
space:
mode:
authorChristophe Coevoet <stof@notk.org>2015-12-05 18:37:09 +0100
committerChristophe Coevoet <stof@notk.org>2015-12-05 18:37:09 +0100
commit8ed6a55aa3be7707615e76e7621e70857e3bcaab (patch)
tree5ce97cdba9494f9c87beae8cc5a1377f96d920b2 /Acl
parentc5a10052d2345676599b8a892d49ccd480c55be0 (diff)
parenta10207a9431ad9584cacb4c267f748c5ebe629b9 (diff)
downloadsymfony-security-8ed6a55aa3be7707615e76e7621e70857e3bcaab.zip
symfony-security-8ed6a55aa3be7707615e76e7621e70857e3bcaab.tar.gz
symfony-security-8ed6a55aa3be7707615e76e7621e70857e3bcaab.tar.bz2
Merge branch '2.3' into 2.7
* 2.3: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
Diffstat (limited to 'Acl')
-rw-r--r--Acl/Dbal/AclProvider.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 989e40b..64102d2 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -573,7 +573,7 @@ QUERY;
$oidCache[$oidLookupKey] = new ObjectIdentity($objectIdentifier, $classType);
}
- $acl = new Acl((int) $aclId, $oidCache[$oidLookupKey], $permissionGrantingStrategy, $emptyArray, !!$entriesInheriting);
+ $acl = new Acl((int) $aclId, $oidCache[$oidLookupKey], $permissionGrantingStrategy, $emptyArray, (bool) $entriesInheriting);
// keep a local, and global reference to this ACL
$loadedAcls[$classType][$objectIdentifier] = $acl;
@@ -615,9 +615,9 @@ QUERY;
}
if (null === $fieldName) {
- $loadedAces[$aceId] = new Entry((int) $aceId, $acl, $sids[$key], $grantingStrategy, (int) $mask, !!$granting, !!$auditFailure, !!$auditSuccess);
+ $loadedAces[$aceId] = new Entry((int) $aceId, $acl, $sids[$key], $grantingStrategy, (int) $mask, (bool) $granting, (bool) $auditFailure, (bool) $auditSuccess);
} else {
- $loadedAces[$aceId] = new FieldEntry((int) $aceId, $acl, $fieldName, $sids[$key], $grantingStrategy, (int) $mask, !!$granting, !!$auditFailure, !!$auditSuccess);
+ $loadedAces[$aceId] = new FieldEntry((int) $aceId, $acl, $fieldName, $sids[$key], $grantingStrategy, (int) $mask, (bool) $granting, (bool) $auditFailure, (bool) $auditSuccess);
}
}
$ace = $loadedAces[$aceId];