Merge branch 'master' of git://github.com/zendframework/zf2 into string

composer.json

@@ -1,28 +1,34 @@
 {
-    "name": "zendframework/zend-module-manager",
-    "description": "Zend\\ModuleManager component",
+    "name": "zendframework/zend-modulemanager",
     "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

@@ -17,6 +17,6 @@
  * @package    Zend_ModuleManager
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
-    ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}

src/Exception/RuntimeException.php

@@ -18,4 +18,5 @@
  * @subpackage Exception
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}

src/Feature/ControllerPluginProviderInterface.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * 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 [email protected] 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
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+/**
+ * @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 ControllerPluginProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Configuration object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Configuration
+     */
+    public function getControllerPluginConfiguration();
+}

src/Feature/ControllerProviderInterface.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * 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 [email protected] 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
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+/**
+ * @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 ControllerProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Configuration object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Configuration
+     */
+    public function getControllerConfiguration();
+}

src/Feature/InitProviderInterface.php

@@ -35,7 +35,7 @@ interface InitProviderInterface
     /**
      * Initialize workflow
      *
-     * @param  \Zend\ModuleManager\ModuleManagerInterface $manager 
+     * @param  ModuleManagerInterface $manager
      * @return void
      */
     public function init(ModuleManagerInterface $manager);

src/Feature/ServiceProviderInterface.php

@@ -31,9 +31,9 @@
 interface ServiceProviderInterface
 {
     /**
-     * Expected to return \Zend\ServiceManager\Configuration object or array to 
+     * Expected to return \Zend\ServiceManager\Configuration object or array to
      * seed such an object.
-     * 
+     *
      * @return array|\Zend\ServiceManager\Configuration
      */
     public function getServiceConfiguration();

src/Feature/ViewHelperProviderInterface.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * 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 [email protected] 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
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+/**
+ * @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 ViewHelperProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Configuration object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Configuration
+     */
+    public function getViewHelperConfiguration();
+}

src/Listener/AbstractListener.php

@@ -28,7 +28,6 @@ abstract class AbstractListener
      * __construct
      *
      * @param  ListenerOptions $options
-     * @return void
      */
     public function __construct(ListenerOptions $options = null)
     {