Merge branch 'feature/implement-interfaces' into develop

proem · Mar 27, 2012 · d1147b6 · d1147b6
2 parents 0835c04 + 7cd5a35
commit d1147b6
Show file tree

Hide file tree

Showing 43 changed files with 655 additions and 173 deletions.
diff --git a/lib/Proem/Api/Bootstrap/Filter/Event/Dispatch.php b/lib/Proem/Api/Bootstrap/Filter/Event/Dispatch.php
@@ -30,15 +30,16 @@
  */
 namespace Proem\Api\Bootstrap\Filter\Event;
 
-use Proem\Service\Manager,
-    Proem\Bootstrap\Signal\Event\Bootstrap;
+use Proem\Service\Manager\Template as Manager,
+    Proem\Bootstrap\Signal\Event\Bootstrap,
+    Proem\Filter\Event\Generic as Event;
 
 /**
  * Proem\Api\Bootstrap\Filter\Event\Dispatch
  *
  * The default "Dispatch" filter event.
  */
-class Dispatch extends \Proem\Filter\Event\Generic
+class Dispatch extends Event
 {
     /**
      * preIn
@@ -47,7 +48,7 @@ class Dispatch extends \Proem\Filter\Event\Generic
      */
     public function preIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.in.dispatch',
                 'params'    => [],
@@ -76,7 +77,7 @@ public function inBound(Manager $assets)
      */
     public function postIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.in.dispatch',
                 'params'    => [],
@@ -95,7 +96,7 @@ public function postIn(Manager $assets)
      */
     public function preOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.out.dispatch',
                 'params'    => [],
@@ -124,7 +125,7 @@ public function outBound(Manager $assets)
      */
     public function postOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.out.dispatch',
                 'params'    => [],

diff --git a/lib/Proem/Api/Bootstrap/Filter/Event/Request.php b/lib/Proem/Api/Bootstrap/Filter/Event/Request.php
@@ -30,17 +30,18 @@
  */
 namespace Proem\Api\Bootstrap\Filter\Event;
 
-use Proem\Service\Manager,
+use Proem\Service\Manager\Template as Manager,
     Proem\Bootstrap\Signal\Event\Bootstrap,
-    Proem\IO\Http\Request as HTTPRequest,
-    Proem\Service\Asset\Generic as Asset;
+    Proem\IO\Request\Http\Standard as HTTPRequest,
+    Proem\Service\Asset\Standard as Asset,
+    Proem\Filter\Event\Generic as Event;
 
 /**
  * Proem\Api\Bootstrap\Filter\Event\Request
  *
  * The default "Request" filter event.
  */
-class Request extends \Proem\Filter\Event\Generic
+class Request extends Event
 {
     /**
      * preIn
@@ -53,15 +54,15 @@ class Request extends \Proem\Filter\Event\Generic
      */
     public function preIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.in.request',
                 'params'    => [],
                 'target'    => $this,
                 'method'    => __FUNCTION__,
                 'event'     => (new Bootstrap())->setServiceManager($assets),
                 'callback'  => function($e) use ($assets) {
-                    if ($e->provides('Proem\IO\Http\Request')) {
+                    if ($e->provides('Proem\IO\Request\Template')) {
                         $assets->set('request', $e);
                     }
                 },
@@ -78,11 +79,11 @@ public function preIn(Manager $assets)
      */
     public function inBound(Manager $assets)
     {
-        if (!$assets->provides('Proem\IO\Http\Request')) {
+        if (!$assets->provides('Proem\IO\Request\Template')) {
             $asset = new Asset;
             $assets->set(
                 'request',
-                $asset->set('Proem\IO\Http\Request', $asset->single(function() {
+                $asset->set('Proem\IO\Request\Template', $asset->single(function() {
                     return new HTTPRequest;
                 }))
             );
@@ -96,7 +97,7 @@ public function inBound(Manager $assets)
      */
     public function postIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.in.request',
                 'params'    => [],
@@ -115,7 +116,7 @@ public function postIn(Manager $assets)
      */
     public function preOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.out.request',
                 'params'    => [],
@@ -144,7 +145,7 @@ public function outBound(Manager $assets)
      */
     public function postOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.out.request',
                 'params'    => [],

diff --git a/lib/Proem/Api/Bootstrap/Filter/Event/Response.php b/lib/Proem/Api/Bootstrap/Filter/Event/Response.php
@@ -30,17 +30,18 @@
  */
 namespace Proem\Api\Bootstrap\Filter\Event;
 
-use Proem\Service\Manager,
+use Proem\Service\Manager\Template as Manager,
     Proem\Bootstrap\Signal\Event\Bootstrap,
-    Proem\Service\Asset\Generic as Asset,
-    Proem\IO\Http\Response as HTTPResponse;
+    Proem\Service\Asset\Standard as Asset,
+    Proem\IO\Response\Http\Standard as HTTPResponse,
+    Proem\Filter\Event\Generic as Event;
 
 /**
  * Proem\Api\Bootstrap\Filter\Event\Response
  *
  * The default "Response" filter event.
  */
-class Response extends \Proem\Filter\Event\Generic
+class Response extends Event
 {
     /**
      * preIn
@@ -53,15 +54,15 @@ class Response extends \Proem\Filter\Event\Generic
      */
     public function preIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.in.response',
                 'params'    => [],
                 'target'    => $this,
                 'method'    => __FUNCTION__,
                 'event'     => (new Bootstrap())->setServiceManager($assets),
                 'callback'  => function($e) use ($assets) {
-                    if ($e->provides('Proem\IO\Http\Response')) {
+                    if ($e->provides('Proem\IO\Response\Template')) {
                         $assets->set('response', $e);
                     }
                 },
@@ -78,11 +79,11 @@ public function preIn(Manager $assets)
      */
     public function inBound(Manager $assets)
     {
-        if (!$assets->provides('Proem\IO\Http\Response')) {
+        if (!$assets->provides('Proem\IO\Response\Template')) {
             $asset = new Asset;
             $assets->set(
                 'response',
-                $asset->set('Proem\IO\Http\Response', $asset->single(function() {
+                $asset->set('Proem\IO\Response\Template', $asset->single(function() {
                     return new HTTPResponse;
                 }))
             );
@@ -96,7 +97,7 @@ public function inBound(Manager $assets)
      */
     public function postIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.in.response',
                 'params'    => [],
@@ -115,7 +116,7 @@ public function postIn(Manager $assets)
      */
     public function preOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.out.response',
                 'params'    => [],
@@ -134,7 +135,7 @@ public function preOut(Manager $assets)
      */
     public function outBound(Manager $assets)
     {
-        if ($assets->provides('Proem\IO\Http\Response')) {
+        if ($assets->provides('Proem\IO\Response\Template\Template')) {
             $assets->get('response')->send();
         }
     }
@@ -146,7 +147,7 @@ public function outBound(Manager $assets)
      */
     public function postOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.out.response',
                 'params'    => [],

diff --git a/lib/Proem/Api/Bootstrap/Filter/Event/Route.php b/lib/Proem/Api/Bootstrap/Filter/Event/Route.php
@@ -30,17 +30,18 @@
  */
 namespace Proem\Api\Bootstrap\Filter\Event;
 
-use Proem\Service\Manager,
+use Proem\Service\Manager\Template as Manager,
     Proem\Bootstrap\Signal\Event\Bootstrap,
-    Proem\Service\Asset\Generic as Asset,
-    Proem\Routing\Router;
+    Proem\Service\Asset\Standard as Asset,
+    Proem\Routing\Router\Standard as Router,
+    Proem\Filter\Event\Generic as Event;
 
 /**
  * Proem\Api\Bootstrap\Filter\Event\Route
  *
  * The default "Route" filter event.
  */
-class Route extends \Proem\Filter\Event\Generic
+class Route extends Event
 {
     /**
      * preIn
@@ -49,7 +50,7 @@ class Route extends \Proem\Filter\Event\Generic
      */
     public function preIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.in.route',
                 'params'    => [],
@@ -90,7 +91,7 @@ public function inBound(Manager $assets)
      */
     public function postIn(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.in.route',
                 'params'    => [],
@@ -109,7 +110,7 @@ public function postIn(Manager $assets)
      */
     public function preOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'pre.out.route',
                 'params'    => [],
@@ -138,7 +139,7 @@ public function outBound(Manager $assets)
      */
     public function postOut(Manager $assets)
     {
-        if ($assets->provides('events', '\Proem\Signal\Manager')) {
+        if ($assets->provides('events', '\Proem\Signal\Manager\Template')) {
             $assets->get('events')->trigger([
                 'name'      => 'post.out.route',
                 'params'    => [],

diff --git a/lib/Proem/Api/Bootstrap/Signal/Event/Bootstrap.php b/lib/Proem/Api/Bootstrap/Signal/Event/Bootstrap.php
@@ -30,14 +30,15 @@
  */
 namespace Proem\Api\Bootstrap\Signal\Event;
 
-use Proem\Service\Manager;
+use Proem\Service\Manager\Template as Manager,
+    Proem\Signal\Event\Standard as StandardEvent;
 
 /**
  * Proem\Api\Bootstrap\Signal\Event\Bootstrap
  *
  * A custom event used by the bootstrap triggered events.
  */
-class Bootstrap extends \Proem\Signal\Event\Generic
+class Bootstrap extends StandardEvent
 {
     /**
      * Store the service manager

diff --git a/lib/Proem/Api/Ext/Module/Generic.php b/lib/Proem/Api/Ext/Module/Generic.php
@@ -30,14 +30,15 @@
  */
 namespace Proem\Api\Ext\Module;
 
-use Proem\Service\Manager;
+use Proem\Ext\Template,
+    Proem\Service\Manager\Template as Manager;
 
 /**
  * Proem\Api\Ext\Module\Generic
  *
  * A base Module abstract
  */
-abstract class Generic extends \Proem\Ext\Generic
+abstract class Generic implements Template
 {
     public abstract function init(Manager $assets, $env = null);
 }
diff --git a/lib/Proem/Api/Ext/Plugin/Generic.php b/lib/Proem/Api/Ext/Plugin/Generic.php
@@ -30,14 +30,15 @@
  */
 namespace Proem\Api\Ext\Plugin;
 
-use Proem\Service\Manager;
+use Proem\Ext\Template,
+    Proem\Service\Manager\Template as Manager;
 
 /**
  * Proem\Api\Ext\Plugin\Generic
  *
  * A base Plugin sbstract
  */
-abstract class Generic extends \Proem\Ext\Generic
+abstract class Generic implements Template
 {
     public abstract function init(Manager $assets, $env = null);
 }
diff --git a/lib/Proem/Api/Ext/Generic.php → lib/Proem/Api/Ext/Template.php b/lib/Proem/Api/Ext/Generic.php → lib/Proem/Api/Ext/Template.php
@@ -30,12 +30,12 @@
  */
 namespace Proem\Api\Ext;
 
-use Proem\Service\Manager;
+use Proem\Service\Manager\Template as Manager;
 
 /**
- * Proem\Api\Ext\Generic
- *
- * A base Module / Plugin.
+ * Proem\Api\Ext\Template
  */
-class Generic
-{}
+interface Template
+{
+    public function init(Manager $assets, $env = null);
+}
diff --git a/lib/Proem/Api/Filter/Event/Generic.php b/lib/Proem/Api/Filter/Event/Generic.php
@@ -30,13 +30,14 @@
  */
 namespace Proem\Api\Filter\Event;
 
-use Proem\Filter\Manager as FilterManager,
-    Proem\Service\Manager as ServiceManager;
+use Proem\Filter\Manager\Standard as FilterManager,
+    Proem\Service\Manager\Template as ServiceManager,
+    Proem\Filter\Event\Template as Template;
 
 /**
  * Proem\Api\Filter\Event\Generic
  */
-abstract class Generic
+abstract class Generic implements Template
 {
     /**
      * preIn