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

composer.json

@@ -1,13 +1,14 @@
 {
     "name": "zendframework/zend-modulemanager",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
         "modulemanager"
     ],
     "autoload": {
         "psr-4": {
-            "Zend\\ModuleManager": "src/"
+            "Zend\\ModuleManager\\": "src/"
         }
     },
     "require": {

src/Exception/InvalidArgumentException.php

@@ -12,7 +12,7 @@
 
 /**
  * Invalid Argument Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Exception

src/Exception/RuntimeException.php

@@ -12,7 +12,7 @@
 
 /**
  * Runtime Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Exception

src/Feature/BootstrapListenerInterface.php

@@ -10,7 +10,7 @@
 
 namespace Zend\ModuleManager\Feature;
 
-use Zend\EventManager\Event;
+use Zend\EventManager\EventInterface;
 
 /**
  * Boostrap listener provider interface
@@ -24,7 +24,8 @@ interface BootstrapListenerInterface
     /**
      * Listen to the bootstrap event
      *
+     * @param EventInterface $e
      * @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/ConsoleBannerProviderInterface.php

@@ -0,0 +1,34 @@
+<?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;
+
+use Zend\Console\Adapter\AdapterInterface;
+
+/**
+ * @category   Zend
+ * @package    Zend_ModuleManager
+ * @subpackage Feature
+ */
+interface ConsoleBannerProviderInterface
+{
+    /**
+     * Returns a string containing a banner text, that describes the module and/or the application.
+     * The banner is shown in the console window, when the user supplies invalid command-line parameters or invokes
+     * the application with no parameters.
+     *
+     * The method is called with active Zend\Console\Adapter\AdapterInterface that can be used to directly access Console and send
+     * output.
+     *
+     * @param AdapterInterface $console
+     * @return string|null
+     */
+    public function getConsoleBanner(AdapterInterface $console);
+}

src/Feature/ConsoleUsageProviderInterface.php

@@ -0,0 +1,44 @@
+<?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;
+
+use Zend\Console\Adapter\AdapterInterface;
+
+/**
+ * @category   Zend
+ * @package    Zend_ModuleManager
+ * @subpackage Feature
+ */
+interface ConsoleUsageProviderInterface
+{
+    /**
+     * Returns an array or a string containing usage information for this module's Console commands.
+     * The method is called with active Zend\Console\Adapter\AdapterInterface that can be used to directly access
+     * Console and send output.
+     *
+     * If the result is a string it will be shown directly in the console window.
+     * If the result is an array, its contents will be formatted to console window width. The array must
+     * have the following format:
+     *
+     *     return array(
+     *                'Usage information line that should be shown as-is',
+     *                'Another line of usage info',
+     *
+     *                '--parameter'        =>   'A short description of that parameter',
+     *                '-another-parameter' =>   'A short description of another parameter',
+     *                ...
+     *            )
+     *
+     * @param AdapterInterface $console
+     * @return array|string|null
+     */
+    public function getConsoleUsage(AdapterInterface $console);
+}

src/Feature/ControllerPluginProviderInterface.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,16 +14,14 @@
  * @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
+     * Expected to return \Zend\ServiceManager\Config object or array to
      * seed such an object.
      *
-     * @return array|\Zend\ServiceManager\Configuration
+     * @return array|\Zend\ServiceManager\Config
      */
-    public function getControllerPluginConfiguration();
+    public function getControllerPluginConfig();
 }

src/Feature/ControllerProviderInterface.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,16 +14,14 @@
  * @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.
+     * Expected to return \Zend\ServiceManager\Config object or array to seed
+     * such an object.
      *
-     * @return array|\Zend\ServiceManager\Configuration
+     * @return array|\Zend\ServiceManager\Config
      */
-    public function getControllerConfiguration();
+    public function getControllerConfig();
 }

src/Feature/FilterProviderInterface.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 FilterProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getFilterConfig();
+}

src/Feature/FormElementProviderInterface.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 FormElementProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getFormElementConfig();
+}

src/Feature/InitProviderInterface.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;
@@ -27,8 +16,6 @@
  * @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
 {

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