Implement #6: remove Zend_Acl** class and usefproject\amf\acl\** clas…

…ses instead
fproject · Jan 22, 2016 · 213afde · 213afde
1 parent 177d168
commit 213afde
Show file tree

Hide file tree

Showing 17 changed files with 457 additions and 566 deletions.
diff --git a/fproject/Zend/Acl/Assert/Interface.php b/fproject/Zend/Acl/Assert/Interface.php
diff --git a/fproject/Zend/Acl/Resource.php b/fproject/Zend/Acl/Resource.php
diff --git a/fproject/Zend/Acl/Resource/Interface.php b/fproject/Zend/Acl/Resource/Interface.php
diff --git a/fproject/Zend/Acl/Role.php b/fproject/Zend/Acl/Role.php
diff --git a/fproject/Zend/Acl/Role/Interface.php b/fproject/Zend/Acl/Role/Interface.php
diff --git a/fproject/Zend/Amf/Adobe/Auth.php b/fproject/Zend/Amf/Adobe/Auth.php
@@ -19,9 +19,6 @@
  * @version    $Id$
  */
 
-/** @see Zend_Acl */
-require_once 'Zend/Acl.php';
-
 /** @see Zend_Xml_Security */
 require_once 'Zend/Xml/Security.php';
 
@@ -41,7 +38,7 @@ class Zend_Amf_Adobe_Auth extends \fproject\amf\auth\AuthAbstract
     /**
      * ACL for authorization
      *
-     * @var Zend_Acl
+     * @var \fproject\amf\acl\Acl
      */
     protected $_acl;
 
@@ -59,7 +56,7 @@ class Zend_Amf_Adobe_Auth extends \fproject\amf\auth\AuthAbstract
      */
     public function __construct($rolefile)
     {
-        $this->_acl = new Zend_Acl();
+        $this->_acl = new \fproject\amf\acl\Acl();
         $xml = Zend_Xml_Security::scanFile($rolefile);
 /*
 Roles file format:
@@ -73,7 +70,7 @@ public function __construct($rolefile)
 </roles>
 */
         foreach($xml->role as $role) {
-            $this->_acl->addRole(new Zend_Acl_Role((string)$role["id"]));
+            $this->_acl->addRole(new \fproject\amf\acl\Role((string)$role["id"]));
             foreach($role->user as $user) {
                 $this->_users[(string)$user["name"]] = array("password" => (string)$user["password"],
                                                              "role" => (string)$role["id"]);
@@ -84,7 +81,7 @@ public function __construct($rolefile)
     /**
      * Get ACL with roles from XML file
      *
-     * @return Zend_Acl
+     * @return \fproject\amf\acl\Acl
      */
     public function getAcl()
     {

diff --git a/fproject/Zend/Amf/Adobe/Introspector.php b/fproject/Zend/Amf/Adobe/Introspector.php
@@ -115,10 +115,10 @@ public function introspect($serviceClass, $options = array())
     /**
      * Authentication handler
      *
-     * @param  Zend_Acl $acl
-     * @return unknown_type
+     * @param  \fproject\amf\acl\Acl $acl
+     * @return bool
      */
-    public function initAcl(Zend_Acl $acl)
+    public function initAcl(\fproject\amf\acl\Acl $acl)
     {
         return false; // we do not need auth for this class
     }

diff --git a/fproject/Zend/Amf/Server.php b/fproject/Zend/Amf/Server.php
@@ -125,7 +125,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
     /**
      * ACL handler object
      *
-     * @var Zend_Acl
+     * @var \fproject\amf\acl\Acl
      */
     protected $_acl;
     /**
@@ -166,18 +166,18 @@ public function getAuth()
     /**
      * Set ACL adapter
      *
-     * @param  Zend_Acl $acl
+     * @param  \fproject\amf\acl\Acl $acl
      * @return Zend_Amf_Server
      */
-    public function setAcl(Zend_Acl $acl)
+    public function setAcl(\fproject\amf\acl\Acl $acl)
     {
         $this->_acl = $acl;
         return $this;
     }
    /**
      * Get ACL adapter
      *
-     * @return Zend_Acl
+     * @return \fproject\amf\acl\Acl
      */
     public function getAcl()
     {
@@ -244,8 +244,7 @@ protected function _checkAcl($object, $function)
         if($object) {
             $class = is_object($object)?get_class($object):$object;
             if(!$this->_acl->has($class)) {
-                require_once 'Zend/Acl/Resource.php';
-                $this->_acl->addResource(new Zend_Acl_Resource($class));
+                $this->_acl->addResource(new \fproject\amf\acl\Resource($class));
             }
             $call = array($object, "initAcl");
             if(is_callable($call) && !call_user_func($call, $this->_acl)) {