From 4d6e239f106146a8db6e47795fe8f81e933995ad Mon Sep 17 00:00:00 2001
From: Johannes Schmitt <schmittjoh@gmail.com>
Date: Wed, 20 Apr 2011 22:25:05 +0200
Subject: [PATCH] [Security/Acl] removed Doctrine dependency from interfaces
 and moved them to the actual implementation

---
 src/Symfony/Component/Security/Acl/Domain/Acl.php             | 3 ++-
 src/Symfony/Component/Security/Acl/Domain/FieldEntry.php      | 4 ++--
 .../{FieldAwareEntryInterface.php => FieldEntryInterface.php} | 2 +-
 .../Component/Security/Acl/Model/MutableAclInterface.php      | 4 +---
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename src/Symfony/Component/Security/Acl/Model/{FieldAwareEntryInterface.php => FieldEntryInterface.php} (90%)

diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php
index 20f300b53980..09bcb3439030 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Acl.php
+++ b/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 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class Acl implements AuditableAclInterface
+class Acl implements AuditableAclInterface, NotifyPropertyChanged
 {
     private $parentAcl;
     private $permissionGrantingStrategy;
diff --git a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
index 0f7123783179..1510df2411d7 100644
--- a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
+++ b/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 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class FieldEntry extends Entry implements FieldAwareEntryInterface
+class FieldEntry extends Entry implements FieldEntryInterface
 {
     private $field;
 
diff --git a/src/Symfony/Component/Security/Acl/Model/FieldAwareEntryInterface.php b/src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php
similarity index 90%
rename from src/Symfony/Component/Security/Acl/Model/FieldAwareEntryInterface.php
rename to src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php
index bcf292cdaf1a..68aa10c9f126 100644
--- a/src/Symfony/Component/Security/Acl/Model/FieldAwareEntryInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php
@@ -16,7 +16,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-interface FieldAwareEntryInterface
+interface FieldEntryInterface extends EntryInterface
 {
     /**
      * Returns the field used for this entry.
diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
index 4e52e65cef57..fdd671236b00 100644
--- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
+++ b/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 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-interface MutableAclInterface extends AclInterface, NotifyPropertyChanged
+interface MutableAclInterface extends AclInterface
 {
     /**
      * Deletes a class-based ACE