Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' of https://github.com/zendframework/zf2 into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
Stefan Kleff committed Jan 23, 2013
108 parents dbe0e62 + 429b268 + d48dc13 + ce0c75d + 6a82230 + 215e77c + 7e16a91 + 2493ed4 + 7ab2816 + 3d2db08 + 6fea908 + aad063e + 06319a5 + aee1ae3 + 412f870 + 9b0f1d4 + e8236b3 + 3e482af + 84d85f9 + 2edbf66 + 7b83fea + ae75c15 + 56429a2 + 3463608 + a990d75 + ed0260a + 40ce9ee + 540e95d + a1f3efa + b138336 + 0ac8011 + 498f096 + a002c09 + a72d069 + d696070 + 95b016c + f72f2a8 + 63f9aa4 + c62eb22 + 56ff1e4 + 17753e6 + 261ddba + 9c23ce8 + d2ea716 + 8a38d20 + 29c3c53 + 9681f39 + 7dc76e1 + 7e1a689 + f52efc3 + 5400ef9 + 2de31e5 + 5ef1929 + 5d57927 + fb86f9e + a0d3c0d + 754d50b + 9ae8ef7 + 80bb476 + 7a4072e + 1b4e215 + 9e453d7 + 1f0f6c3 + 512d4f8 + 702eefc + 1f67b00 + 7233001 + 4244857 + 163015b + fd694bc + a17a889 + 6aea729 + 1946426 + 0177483 + 27a94da + 8afdcae + 8e4ac91 + d060a98 + 725a039 + 4dc194c + 1009849 + e109317 + 4dff7e8 + 246b9e4 + 5207d60 + afcf71c + 11643c5 + cd431ca + 51b7c50 + 82247be + d2994aa + eaf4e29 + eeb69a6 + 3e3fff3 + c0a95c9 + 961798f + 57ae4ec + a4fa631 + 259684b + b38977d + 1a640d1 + e064a96 + 3913f14 + fe5e75d + 3085bbe + 8e7f807 + 09e57f8 + fd510c1 commit a7a5529
Show file tree
Hide file tree
Showing 43 changed files with 600 additions and 197 deletions.
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

/**
* @category Zend
* @package Zend_ModuleManager
*/
interface ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

/**
* Invalid Argument Exception
*
* @category Zend
* @package Zend_ModuleManager
* @subpackage Exception
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
Expand Down
17 changes: 17 additions & 0 deletions src/Exception/MissingDependencyModuleException.php
View file
@@ -0,0 +1,17 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ModuleManager\Exception;

/**
* Runtime Exception
*/
class MissingDependencyModuleException extends RuntimeException implements ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/RuntimeException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

/**
* Runtime Exception
*
* @category Zend
* @package Zend_ModuleManager
* @subpackage Exception
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Feature/AutoloaderProviderInterface.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* Autoloader provider interface
*
* @category Zend
* @package Zend_ModuleManager
* @subpackage Feature
*/
interface AutoloaderProviderInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Feature/BootstrapListenerInterface.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -14,10 +13,6 @@

/**
* Boostrap listener provider interface
*
* @category Zend
* @package Zend_ModuleManager
* @subpackage Feature
*/
interface BootstrapListenerInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Feature/ConfigProviderInterface.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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 ConfigProviderInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Feature/ConsoleBannerProviderInterface.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Feature/ConsoleUsageProviderInterface.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Feature/ControllerPluginProviderInterface.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Feature/ControllerProviderInterface.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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
{
/**
Expand Down
20 changes: 20 additions & 0 deletions src/Feature/DependencyIndicatorInterface.php
View file
@@ -0,0 +1,20 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ModuleManager\Feature;

interface DependencyIndicatorInterface
{
/**
* Expected to return an array of modules on which the current one depends on
*
* @return array
*/
public function getModuleDependencies();
}
21 changes: 21 additions & 0 deletions src/Feature/FilterProviderInterface.php
View file
@@ -0,0 +1,21 @@
<?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
*/

namespace Zend\ModuleManager\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();
}
21 changes: 21 additions & 0 deletions src/Feature/FormElementProviderInterface.php
View file
@@ -0,0 +1,21 @@
<?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
*/

namespace Zend\ModuleManager\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();
}
6 changes: 0 additions & 6 deletions src/Feature/InitProviderInterface.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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
*/
interface InitProviderInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Feature/LocatorRegisteredInterface.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -18,10 +17,6 @@
* 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
*/
interface LocatorRegisteredInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Feature/ServiceProviderInterface.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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 ServiceProviderInterface
{
/**
Expand Down
21 changes: 21 additions & 0 deletions src/Feature/ValidatorProviderInterface.php
View file
@@ -0,0 +1,21 @@
<?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
*/

namespace Zend\ModuleManager\Feature;

interface ValidatorProviderInterface
{
/**
* Expected to return \Zend\ServiceManager\Config object or array to
* seed such an object.
*
* @return array|\Zend\ServiceManager\Config
*/
public function getValidatorConfig();
}
6 changes: 0 additions & 6 deletions src/Feature/ViewHelperProviderInterface.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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 ViewHelperProviderInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Listener/AbstractListener.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Listener;

/**
* Abstract listener
*
* @category Zend
* @package Zend_ModuleManager
* @subpackage Listener
*/
abstract class AbstractListener
{
Expand Down
5 changes: 0 additions & 5 deletions src/Listener/AutoloaderListener.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Listener;
Expand All @@ -16,10 +15,6 @@

/**
* Autoloader listener
*
* @category Zend
* @package Zend_ModuleManager
* @subpackage Listener
*/
class AutoloaderListener extends AbstractListener
{
Expand Down

0 comments on commit a7a5529

Please sign in to comment.