summaryrefslogtreecommitdiffstats
path: root/Acl/Domain
diff options
context:
space:
mode:
Diffstat (limited to 'Acl/Domain')
-rw-r--r--Acl/Domain/ObjectIdentity.php4
-rw-r--r--Acl/Domain/ObjectIdentityRetrievalStrategy.php2
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php16
-rw-r--r--Acl/Domain/SecurityIdentityRetrievalStrategy.php2
4 files changed, 12 insertions, 12 deletions
diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php
index fc5b9c6..871bda7 100644
--- a/Acl/Domain/ObjectIdentity.php
+++ b/Acl/Domain/ObjectIdentity.php
@@ -68,8 +68,8 @@ final class ObjectIdentity implements ObjectIdentityInterface
} elseif (method_exists($domainObject, 'getId')) {
return new self((string) $domainObject->getId(), ClassUtils::getRealClass($domainObject));
}
- } catch (\InvalidArgumentException $invalid) {
- throw new InvalidDomainObjectException($invalid->getMessage(), 0, $invalid);
+ } catch (\InvalidArgumentException $e) {
+ throw new InvalidDomainObjectException($e->getMessage(), 0, $e);
}
throw new InvalidDomainObjectException('$domainObject must either implement the DomainObjectInterface, or have a method named "getId".');
diff --git a/Acl/Domain/ObjectIdentityRetrievalStrategy.php b/Acl/Domain/ObjectIdentityRetrievalStrategy.php
index 21ac812..80de6e0 100644
--- a/Acl/Domain/ObjectIdentityRetrievalStrategy.php
+++ b/Acl/Domain/ObjectIdentityRetrievalStrategy.php
@@ -28,7 +28,7 @@ class ObjectIdentityRetrievalStrategy implements ObjectIdentityRetrievalStrategy
{
try {
return ObjectIdentity::fromDomainObject($domainObject);
- } catch (InvalidDomainObjectException $failed) {
+ } catch (InvalidDomainObjectException $e) {
return;
}
}
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index ef80a20..742c4e5 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -55,21 +55,21 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
}
return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode);
- } catch (NoAceFoundException $noObjectAce) {
+ } catch (NoAceFoundException $e) {
$aces = $acl->getClassAces();
if (!$aces) {
- throw $noObjectAce;
+ throw $e;
}
return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode);
}
- } catch (NoAceFoundException $noClassAce) {
+ } catch (NoAceFoundException $e) {
if ($acl->isEntriesInheriting() && null !== $parentAcl = $acl->getParentAcl()) {
return $parentAcl->isGranted($masks, $sids, $administrativeMode);
}
- throw $noClassAce;
+ throw $e;
}
}
@@ -86,20 +86,20 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
}
return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode);
- } catch (NoAceFoundException $noObjectAces) {
+ } catch (NoAceFoundException $e) {
$aces = $acl->getClassFieldAces($field);
if (!$aces) {
- throw $noObjectAces;
+ throw $e;
}
return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode);
}
- } catch (NoAceFoundException $noClassAces) {
+ } catch (NoAceFoundException $e) {
if ($acl->isEntriesInheriting() && null !== $parentAcl = $acl->getParentAcl()) {
return $parentAcl->isFieldGranted($field, $masks, $sids, $administrativeMode);
}
- throw $noClassAces;
+ throw $e;
}
}
diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
index 708c633..a08f67e 100644
--- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php
+++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
@@ -51,7 +51,7 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra
if (!$token instanceof AnonymousToken) {
try {
$sids[] = UserSecurityIdentity::fromToken($token);
- } catch (\InvalidArgumentException $invalid) {
+ } catch (\InvalidArgumentException $e) {
// ignore, user has no user security identity
}
}