PHP-DI 4.0 compatibility

Author: mnapoli

README.md

@@ -29,15 +29,17 @@ To use PHP-DI in your ZF1 application, you need to change the Dispatcher used by
      * Initialize the dependency injection container
      */
     protected function _initDependencyInjection()
-	{
-		$container = new \DI\Container();
+    {
+        $builder = new ContainerBuilder();
+        // Configure your container here
+        $container = $builder->build();
 
         $dispatcher = new \DI\ZendFramework1\Dispatcher();
         $dispatcher->setContainer($container);
 
         $frontController = Zend_Controller_Front::getInstance();
         $frontController->setDispatcher($dispatcher);
-	}
+    }
 ```
 
 That's it!
@@ -49,8 +51,6 @@ Now you can inject dependencies in your controllers!
 For example, here is the GuestbookController of the quickstart:
 
 ```php
-use DI\Annotation\Inject;
-
 class GuestbookController extends Zend_Controller_Action
 {
     /**
@@ -97,6 +97,7 @@ how the ZF quickstart is ;)
 
 ## Change log
 
-* 1.1.0 Require PHP-DI >= 3.3
+* 2.0.0 Requires PHP-DI >= 4.0.0
+* 1.1.0 Requires PHP-DI >= 3.3
 * 1.0.1 Bugfix
 * 1.0.0 First release

composer.json

@@ -2,15 +2,15 @@
     "name": "mnapoli/php-di-zf1",
     "type": "library",
     "description": "Integrates PHP-DI to Zend Framework 1",
-    "homepage": "http://mnapoli.github.io/PHP-DI-ZF1/",
+    "homepage": "https://github.com/mnapoli/PHP-DI-ZF1",
     "license": "MIT",
     "autoload": {
         "psr-0": {
-            "DI\\ZendFramework1": "src/"
+            "DI\\Bridge\\ZendFramework1\\": "src/"
         }
     },
-	"require": {
-		"mnapoli/php-di": "~3.3",
-		"zendframework/zendframework1": "1.12.*"
-	}
+    "require": {
+        "mnapoli/php-di": "~4.0",
+        "zendframework/zendframework1": "1.12.*"
+    }
 }

quickstart/application/Bootstrap.php

@@ -1,6 +1,6 @@
 <?php
 
-use DI\ZendFramework1\Dispatcher;
+use DI\Bridge\ZendFramework1\Dispatcher;
 
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
@@ -15,14 +15,13 @@ protected function _initDoctype()
      * Initialize the dependency injection container
      */
     protected function _initDependencyInjection()
-	{
-		$container = new \DI\Container();
+    {
+        $container = \DI\ContainerBuilder::buildDevContainer();
 
         $dispatcher = new Dispatcher();
         $dispatcher->setContainer($container);
 
         $frontController = Zend_Controller_Front::getInstance();
         $frontController->setDispatcher($dispatcher);
-	}
+    }
 }
-

quickstart/application/controllers/GuestbookController.php

@@ -1,18 +1,14 @@
 <?php
 
-use DI\Annotation\Inject;
-
 class GuestbookController extends Zend_Controller_Action
 {
-
     /**
      * This dependency will be injected by PHP-DI
      * @Inject
      * @var Application_Service_GuestbookService
      */
     private $guestbookService;
 
-
     public function indexAction()
     {
         $this->view->entries = $this->guestbookService->getAllEntries();
@@ -30,5 +26,4 @@ public function signAction()
 
         $this->view->form = $form;
     }
-
 }

quickstart/application/services/GuestbookService.php

@@ -1,25 +1,21 @@
 <?php
 
-use DI\Annotation\Inject;
-
 class Application_Service_GuestbookService
 {
+    /**
+     * @Inject
+     * @var Application_Model_GuestbookMapper
+     */
+    private $guestbookMapper;
 
-	/**
-	 * @Inject
-	 * @var Application_Model_GuestbookMapper
-	 */
-	private $guestbookMapper;
-
-	public function getAllEntries()
-	{
-		return $this->guestbookMapper->fetchAll();
-	}
-
-	public function addEntry($fields)
-	{
-		$comment = new Application_Model_Guestbook($fields);
-		$this->guestbookMapper->save($comment);
-	}
+    public function getAllEntries()
+    {
+        return $this->guestbookMapper->fetchAll();
+    }
 
+    public function addEntry($fields)
+    {
+        $comment = new Application_Model_Guestbook($fields);
+        $this->guestbookMapper->save($comment);
+    }
 }

src/DI/ZendFramework1/Dispatcher.php renamed to src/DI/Bridge/ZendFramework1/Dispatcher.php

@@ -2,14 +2,14 @@
 /**
  * PHP-DI
  *
- * @link      http://mnapoli.github.io/PHP-DI/
+ * @link      http://php-di.org/
  * @copyright Matthieu Napoli (http://mnapoli.fr/)
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
  */
 
-namespace DI\ZendFramework1;
+namespace DI\Bridge\ZendFramework1;
 
-use DI\Container;
+use DI\ContainerInterface;
 use Exception;
 use Zend_Controller_Action;
 use Zend_Controller_Action_Interface;
@@ -27,9 +27,8 @@
  */
 class Dispatcher extends Zend_Controller_Dispatcher_Standard
 {
-
     /**
-     * @var Container
+     * @var ContainerInterface
      */
     private $container;
 
@@ -135,19 +134,18 @@ public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Control
     }
 
     /**
-     * @return Container
+     * @return ContainerInterface
      */
     public function getContainer()
     {
         return $this->container;
     }
 
     /**
-     * @param Container $container
+     * @param ContainerInterface $container
      */
-    public function setContainer(Container $container)
+    public function setContainer(ContainerInterface $container)
     {
         $this->container = $container;
     }
-
 }

tests/UnitTests/DI/ZendFramework1/DispatcherTest.php

@@ -9,8 +9,8 @@
 
 namespace UnitTests\DI;
 
-use DI\Container;
-use DI\ZendFramework1\Dispatcher;
+use DI\ContainerBuilder;
+use DI\Bridge\ZendFramework1\Dispatcher;
 
 /**
  * Test class for Dispatcher
@@ -34,10 +34,10 @@ public function testDispatch()
 
         $valueDependency = new \stdClass();
 
-        $container = new Container();
+        $container = ContainerBuilder::buildDevContainer();
         $container->set("SomeName", $valueDependency);
 
-        $dispatcher->setContainer( $container );
+        $dispatcher->setContainer($container);
 
 
         $request = new \Zend_Controller_Request_Simple();
@@ -50,4 +50,4 @@ public function testDispatch()
 
         $this->assertEquals("a value", $valueDependency->somedata);
     }
-}
+}

tests/UnitTests/DI/ZendFramework1/Fixtures/MockController.php

@@ -14,4 +14,4 @@ public function methodAction()
     {
         $this->namedDependency->somedata = "a value";
     }
-}
+}