diff options
| author | Johannes Schmitt <schmittjoh@gmail.com> | 2011-04-20 22:25:05 +0200 |
|---|---|---|
| committer | Johannes Schmitt <schmittjoh@gmail.com> | 2011-04-20 22:25:05 +0200 |
| commit | 270d0c2494a7db946fcbb1a834d9cedee07d0a95 (patch) | |
| tree | 6be6f246b1cae6a71d9ce9a067b1649aa8af8587 | |
| parent | 796e653d28c6967f9920597070ef4fb8b65e82de (diff) | |
| download | symfony-security-270d0c2494a7db946fcbb1a834d9cedee07d0a95.zip symfony-security-270d0c2494a7db946fcbb1a834d9cedee07d0a95.tar.gz symfony-security-270d0c2494a7db946fcbb1a834d9cedee07d0a95.tar.bz2 | |
[Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation
| -rw-r--r-- | Acl/Domain/Acl.php | 3 | ||||
| -rw-r--r-- | Acl/Domain/FieldEntry.php | 4 | ||||
| -rw-r--r-- | Acl/Model/FieldEntryInterface.php (renamed from Acl/Model/FieldAwareEntryInterface.php) | 2 | ||||
| -rw-r--r-- | Acl/Model/MutableAclInterface.php | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php index 20f300b..09bcb34 100644 --- a/Acl/Domain/Acl.php +++ b/Acl/Domain/Acl.php @@ -10,6 +10,7 @@ namespace Symfony\Component\Security\Acl\Domain; +use Doctrine\Common\NotifyPropertyChanged; use Doctrine\Common\PropertyChangedListener; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Model\AuditableAclInterface; @@ -33,7 +34,7 @@ use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface; * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ -class Acl implements AuditableAclInterface +class Acl implements AuditableAclInterface, NotifyPropertyChanged { private $parentAcl; private $permissionGrantingStrategy; diff --git a/Acl/Domain/FieldEntry.php b/Acl/Domain/FieldEntry.php index 0f71237..1510df2 100644 --- a/Acl/Domain/FieldEntry.php +++ b/Acl/Domain/FieldEntry.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Security\Acl\Domain; use Symfony\Component\Security\Acl\Model\AclInterface; -use Symfony\Component\Security\Acl\Model\FieldAwareEntryInterface; +use Symfony\Component\Security\Acl\Model\FieldEntryInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface; /** @@ -20,7 +20,7 @@ use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface; * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ -class FieldEntry extends Entry implements FieldAwareEntryInterface +class FieldEntry extends Entry implements FieldEntryInterface { private $field; diff --git a/Acl/Model/FieldAwareEntryInterface.php b/Acl/Model/FieldEntryInterface.php index bcf292c..68aa10c 100644 --- a/Acl/Model/FieldAwareEntryInterface.php +++ b/Acl/Model/FieldEntryInterface.php @@ -16,7 +16,7 @@ namespace Symfony\Component\Security\Acl\Model; * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ -interface FieldAwareEntryInterface +interface FieldEntryInterface extends EntryInterface { /** * Returns the field used for this entry. diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php index 4e52e65..fdd6712 100644 --- a/Acl/Model/MutableAclInterface.php +++ b/Acl/Model/MutableAclInterface.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Security\Acl\Model; -use Doctrine\Common\NotifyPropertyChanged; - /** * This interface adds mutators for the AclInterface. * @@ -21,7 +19,7 @@ use Doctrine\Common\NotifyPropertyChanged; * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ -interface MutableAclInterface extends AclInterface, NotifyPropertyChanged +interface MutableAclInterface extends AclInterface { /** * Deletes a class-based ACE |