diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/Application/Bootstrap/BootstrapAbstract.php --- a/web/lib/Zend/Application/Bootstrap/BootstrapAbstract.php Thu May 07 15:10:09 2015 +0200 +++ b/web/lib/Zend/Application/Bootstrap/BootstrapAbstract.php Thu May 07 15:16:02 2015 +0200 @@ -15,10 +15,20 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BootstrapAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ + */ + +/** + * @see Zend_Application_Bootstrap_Bootstrapper */ +require_once 'Zend/Application/Bootstrap/Bootstrapper.php'; + +/** + * @see Zend_Application_Bootstrap_ResourceBootstrapper + */ +require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php'; /** * Abstract base class for bootstrap classes @@ -28,7 +38,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Bootstrap_BootstrapAbstract @@ -94,7 +104,6 @@ * initializer methods. * * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application - * @return void * @throws Zend_Application_Bootstrap_Exception When invalid application is provided */ public function __construct($application) @@ -317,8 +326,9 @@ /** * Get a registered plugin resource * - * @param string $resourceName + * @param string $resource * @return Zend_Application_Resource_Resource + * @throws Zend_Application_Bootstrap_Exception */ public function getPluginResource($resource) { @@ -431,6 +441,7 @@ * * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application * @return Zend_Application_Bootstrap_BootstrapAbstract + * @throws Zend_Application_Bootstrap_Exception */ public function setApplication($application) { @@ -481,6 +492,7 @@ * * @param object $container * @return Zend_Application_Bootstrap_BootstrapAbstract + * @throws Zend_Application_Bootstrap_Exception */ public function setContainer($container) { @@ -544,7 +556,7 @@ } /** - * Implement PHP's magic to retrieve a ressource + * Implement PHP's magic to retrieve a resource * in the bootstrap * * @param string $prop @@ -557,7 +569,7 @@ /** * Implement PHP's magic to ask for the - * existence of a ressource in the bootstrap + * existence of a resource in the bootstrap * * @param string $prop * @return bool @@ -592,7 +604,7 @@ * * @param string $method * @param array $args - * @return void + * @return Zend_Application_Bootstrap_BootstrapAbstract * @throws Zend_Application_Bootstrap_Exception On invalid method name */ public function __call($method, $args)