Selaa lähdekoodia

[Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation

Johannes Schmitt 14 vuotta sitten
vanhempi
commit
4d6e239f10

+ 2 - 1
src/Symfony/Component/Security/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;

+ 2 - 2
src/Symfony/Component/Security/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;
 

+ 1 - 1
src/Symfony/Component/Security/Acl/Model/FieldAwareEntryInterface.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.

+ 1 - 3
src/Symfony/Component/Security/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