Merge remote-tracking branch 'zf2/master'

composer.json

@@ -1,28 +1,35 @@
 {
-    "name": "zendframework/zend-module-manager",
-    "description": "Zend\\ModuleManager component",
+    "name": "zendframework/zend-modulemanager",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
-        "module-manager"
+        "modulemanager"
     ],
     "autoload": {
         "psr-4": {
-            "Zend\\ModuleManager\\": "src/"
+            "Zend\\ModuleManager": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23"
+        "php": ">=5.3.3",
+        "zendframework/zend-eventmanager": "self.version",
+        "zendframework/zend-stdlib": "self.version"
     },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/PHPUnit": "~4.0"
+    "suggest": {
+        "zendframework/zend-config": "Zend\\Config component",
+        "zendframework/zend-loader": "Zend\\Loader component",
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
     },
     "homepage": "https://github.com/zendframework/zend-module-manager",
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\ModuleManager\\": "test/"
         }
+    },
+    "require-dev": {
+        "fabpot/php-cs-fixer": "1.7.*",
+        "satooshi/php-coveralls": "dev-master",
+        "phpunit/PHPUnit": "~4.0"
     }
 }

src/Exception/ExceptionInterface.php

@@ -15,4 +15,5 @@
  * @package  Zend_ModuleManager
  */
 interface ExceptionInterface
-{}
+{
+}

src/Exception/InvalidArgumentException.php

@@ -12,11 +12,11 @@
 
 /**
  * Invalid Argument Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
-    ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}

src/Exception/RuntimeException.php

@@ -12,10 +12,11 @@
 
 /**
  * Runtime Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Exception
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}

src/Feature/BootstrapListenerInterface.php

@@ -10,7 +10,7 @@
 
 namespace Zend\ModuleManager\Feature;
 
-use Zend\EventManager\Event;
+use Zend\EventManager\EventInterface;
 
 /**
  * Boostrap listener provider interface
@@ -26,5 +26,5 @@ interface BootstrapListenerInterface
      *
      * @return array
      */
-    public function onBootstrap(Event $e);
+    public function onBootstrap(EventInterface $e);
 }

src/Feature/ConfigProviderInterface.php

@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_ModuleManager
- * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ModuleManager
  */
 
 namespace Zend\ModuleManager\Feature;
@@ -25,14 +14,12 @@
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ConfigProviderInterface
 {
     /**
      * Returns configuration to merge with application configuration
-     * 
+     *
      * @return array|\Traversable
      */
     public function getConfig();

src/Feature/ControllerPluginProviderInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ModuleManager
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+/**
+ * @category   Zend
+ * @package    Zend_ModuleManager
+ * @subpackage Feature
+ */
+interface ControllerPluginProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getControllerPluginConfig();
+}

src/Feature/ControllerProviderInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ModuleManager
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+/**
+ * @category   Zend
+ * @package    Zend_ModuleManager
+ * @subpackage Feature
+ */
+interface ControllerProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Configuration object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Configuration
+     */
+    public function getControllerConfig();
+}

src/Feature/InitProviderInterface.php

@@ -1,40 +1,29 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_ModuleManager
- * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ModuleManager
  */
 
 namespace Zend\ModuleManager\Feature;
 
+use Zend\ModuleManager\ModuleManagerInterface;
+
 /**
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface InitProviderInterface
 {
     /**
      * Initialize workflow
      *
-     * @param  \Zend\ModuleManager\Manager $manager 
+     * @param  ModuleManagerInterface $manager
      * @return void
      */
-    public function init($manager = null);
+    public function init(ModuleManagerInterface $manager);
 }

src/Feature/LocatorRegisteredInterface.php

@@ -11,14 +11,14 @@
 namespace Zend\ModuleManager\Feature;
 
 /**
- * LocatorRegistered 
+ * LocatorRegistered
  *
- * By implementing this interface in a Module class, the instance of the Module 
- * class will be automatically injected into any DI-configured object which has 
- * a constructor or setter parameter which is type hinted with the Module class 
- * name. Implementing this interface obviously does not require adding any 
+ * By implementing this interface in a Module class, the instance of the Module
+ * class will be automatically injected into any DI-configured object which has
+ * a constructor or setter parameter which is type hinted with the Module class
+ * name. Implementing this interface obviously does not require adding any
  * methods to your class.
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature