Merge remote-tracking branch 'origin/fix/zf2b5'

bushbaby · Jul 6, 2012 · 707b8ec · 707b8ec
2 parents 42339aa + 773611d
commit 707b8ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/configs/module.config.php b/configs/module.config.php
@@ -7,11 +7,8 @@
     ),
     'PhingService.phingOptions' => array(
     ),
-    'controller' => array(
-        // Map of controller "name" to class
-        // This should be used if you do not need to inject any dependencies
-        // in your controller
-        'classes' => array(
+    'controllers' => array(
+        'invokables' => array(
             'phingservice.index' => 'PhingService\Controller\IndexController',
         ),
     ),

diff --git a/src/PhingService/Controller/IndexController.php b/src/PhingService/Controller/IndexController.php
@@ -2,10 +2,10 @@
 
 namespace PhingService\Controller;
 
-use Zend\Mvc\Controller\ActionController,
+use Zend\Mvc\Controller\AbstractActionController,
     Zend\View\Model\ViewModel;
 
-class IndexController extends ActionController
+class IndexController extends AbstractActionController
 {
 
     public function indexAction()
@@ -14,7 +14,6 @@ public function indexAction()
 
         $buildResult = $this->getServiceLocator()->get('PhingService')->build('show-defaults dist' /* target */, $options);
 
-//        print_r($this->getServiceLocator()->get('ViewManager'));
         $view = new ViewModel($buildResult);
         $view->setTerminal(true);
 

diff --git a/src/PhingService/PhingOptions.php b/src/PhingService/PhingOptions.php
@@ -2,10 +2,10 @@
 
 namespace PhingService;
 
-use Zend\Stdlib\Options;
+use Zend\Stdlib\AbstractOptions;
 use Zend\Stdlib\Parameters;
 
-class PhingOptions extends Options
+class PhingOptions extends AbstractOptions
 {
 
     protected $buildFile    = null;

diff --git a/src/PhingService/ServiceOptions.php b/src/PhingService/ServiceOptions.php
@@ -2,10 +2,10 @@
 
 namespace PhingService;
 
-use Zend\Stdlib\Options,
+use Zend\Stdlib\AbstractOptions,
     PhingService\Service;
 
-class ServiceOptions extends Options
+class ServiceOptions extends AbstractOptions
 {
 
     /**