[#14213] - Moved Container to its own folder; Renamed abstract firewa…

…ll classes
phalcon · Jul 4, 2019 · f029a61 · f029a61
1 parent d9702bc
commit f029a61
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 898 deletions.
diff --git a/ext/phalcon/firewall/adapter.zep.c b/ext/phalcon/firewall/adapter.zep.c
diff --git a/ext/phalcon/firewall/adapter.zep.h b/ext/phalcon/firewall/adapter.zep.h
diff --git a/ext/phalcon/firewall/adapterinterface.zep.c b/ext/phalcon/firewall/adapterinterface.zep.c
diff --git a/ext/phalcon/firewall/adapterinterface.zep.h b/ext/phalcon/firewall/adapterinterface.zep.h
diff --git a/phalcon/Container.zep → phalcon/Container/Container.zep b/phalcon/Container.zep → phalcon/Container/Container.zep
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon;
+namespace Phalcon\Container;
 
 use Psr\Container\ContainerInterface;
 use Phalcon\DiInterface;

diff --git a/phalcon/Firewall/Adapter.zep → phalcon/Firewall/Adapter/AbstractAdapter.zep b/phalcon/Firewall/Adapter.zep → phalcon/Firewall/Adapter/AbstractAdapter.zep
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Firewall;
+namespace Phalcon\Firewall\Adapter;
 
 use Closure;
 use Phalcon\Acl;
@@ -17,12 +17,13 @@ use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
 use Phalcon\DiInterface;
 use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Firewall\Exception;
 use Phalcon\Mvc\Dispatcher;
 
 /**
  * Adapter for Phalcon\Firewall adapters
  */
-abstract class Adapter implements AdapterInterface, EventsAwareInterface
+abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
 {
     /**
      * Storing active identity object implementing Phalcon/Acl/RoleAware

diff --git a/phalcon/Firewall/Adapter/Acl.zep b/phalcon/Firewall/Adapter/Acl.zep
@@ -14,14 +14,14 @@ use Phalcon\Di;
 use Phalcon\Cache\Adapter\AdapterInterface;
 use Phalcon\Events\Event;
 use Phalcon\Events\ManagerInterface;
-use Phalcon\Firewall\Adapter;
+use Phalcon\Firewall\Adapter\AbstractAdapter;
 use Phalcon\Firewall\Exception;
 use Phalcon\Mvc\DispatcherInterface;
 
 /**
  * FirewallZ for Phalcon\Application which depends on acl and dispatcher
  */
-class Acl extends Adapter
+class Acl extends AbstractAdapter
 {
     /**
      * Acl service name

diff --git a/phalcon/Firewall/AdapterInterface.zep → ...con/Firewall/Adapter/AdapterInterface.zep b/phalcon/Firewall/AdapterInterface.zep → ...con/Firewall/Adapter/AdapterInterface.zep
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Firewall;
+namespace Phalcon\Firewall\Adapter;
 
 use Phalcon\Mvc\DispatcherInterface;
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;