PSR1/2 compatibility

PHP-DI · Aug 3, 2013 · ca5a09e · ca5a09e
1 parent 4418f97
commit ca5a09e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 26 deletions.
diff --git a/src/DI/ZendFramework2/InjectedAbstractActionController.php b/src/DI/ZendFramework2/InjectedAbstractActionController.php
@@ -2,26 +2,31 @@
 namespace DI\ZendFramework2;
 
 use DI\Container;
-use DI\Annotation\Inject;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\Stdlib\RequestInterface as Request;
 use Zend\Stdlib\ResponseInterface as Response;
 
 abstract class InjectedAbstractActionController extends AbstractActionController
 {
-	protected $container;
+    /**
+     * @var \DI\Container
+     */
+    protected $container;
 
-	public function __construct(Container $container = null)
-	{
-		$this->container = $container;
-	}
+    public function __construct(Container $container = null)
+    {
+        $this->container = $container;
+    }
 
-	public function dispatch(Request $request, Response $response = null)
-	{
-		if ($this->container == null)
-			$this->container = $this->serviceLocator->get('DI\\Container');
+    public function dispatch(Request $request, Response $response = null)
+    {
+        if ($this->container == null) {
+            $this->container = $this->serviceLocator->get('DI\\Container');
+        }
 
-		$this->container->injectOn($this);
-		return parent::dispatch($request, $response);
-	}
+        // Inject dependencies
+        $this->container->injectOn($this);
+
+        return parent::dispatch($request, $response);
+    }
 }
diff --git a/src/DI/ZendFramework2/InjectedAbstractRestfulController.php b/src/DI/ZendFramework2/InjectedAbstractRestfulController.php
@@ -2,26 +2,31 @@
 namespace DI\ZendFramework2;
 
 use DI\Container;
-use DI\Annotation\Inject;
 use Zend\Mvc\Controller\AbstractRestfulController;
 use Zend\Stdlib\RequestInterface as Request;
 use Zend\Stdlib\ResponseInterface as Response;
 
 abstract class InjectedAbstractRestfulController extends AbstractRestfulController
 {
-	protected $container;
+    /**
+     * @var \DI\Container
+     */
+    protected $container;
 
-	public function __construct(Container $container = null)
-	{
-		$this->container = $container;
-	}
+    public function __construct(Container $container = null)
+    {
+        $this->container = $container;
+    }
 
-	public function dispatch(Request $request, Response $response = null)
-	{
-		if ($this->container == null)
-			$this->container = $this->serviceLocator->get('DI\\Container');
+    public function dispatch(Request $request, Response $response = null)
+    {
+        if ($this->container == null) {
+            $this->container = $this->serviceLocator->get('DI\\Container');
+        }
 
-		$this->container->injectOn($this);
-		return parent::dispatch($request, $response);
-	}
+        // Inject dependencies
+        $this->container->injectOn($this);
+
+        return parent::dispatch($request, $response);
+    }
 }