Zend Framework git commits for branch master Thu, 17 Nov 2011 13:29:05 -0800 Zend_Feed_Writer 1.11.4 (http://framework.zend.com) http://git.zendframework.com/ zf-git@lists.zend.com (Zend Framework Contributors) Zend Framework Contributors Thu, 17 Nov 2011 13:28:46 -0800 http://git.zendframework.com/?a=commit&p=zf&h=e66618e7c12867fde9875b8f3d92f230bd1b2727 http://git.zendframework.com/?a=commit&p=zf&h=e66618e7c12867fde9875b8f3d92f230bd1b2727 plugins[$pluginName])) { + // If we've loaded it already, just return it + return $this->plugins[$pluginName]; + } + + $instance = parent::load($plugin, $options); + + if (null !== $this->actionController) { + $instance->setActionController($this->actionController); + $instance->init(); + } + + return $instance; + } /** * Determine if we have a valid helper]]> Thu, 17 Nov 2011 13:21:37 -0800 http://git.zendframework.com/?a=commit&p=zf&h=ef3df84e05788a15b1b69daa8b68312fe9bb9d98 http://git.zendframework.com/?a=commit&p=zf&h=ef3df84e05788a15b1b69daa8b68312fe9bb9d98 Thu, 17 Nov 2011 13:17:31 -0800 http://git.zendframework.com/?a=commit&p=zf&h=1a5ce03ee7d2dd31b35e88906e77b28e1df87cf0 http://git.zendframework.com/?a=commit&p=zf&h=1a5ce03ee7d2dd31b35e88906e77b28e1df87cf0 getClassLoader(); $this->assertInstanceOf('ZendTest\Loader\TestAsset\CustomClassLoader', $loader); } + + public function testWillPullFromLocatorIfAttached() + { + $locator = new TestAsset\ServiceLocator(); + $plugin = new stdClass; + $locator->set('ZendTest\Loader\TestAsset\Foo', $plugin); + + $loader = $this->broker->getClassLoader(); + $loader->registerPlugin('foo', 'ZendTest\Loader\TestAsset\Foo'); + $this->broker->setLocator($locator); + + $test = $this->broker->load('foo'); + $this->assertSame($plugin, $test); + } } diff --git a/tests/Zend/Loader/TestAsset/ServiceLocator.php b/tests/Zend/Loader/TestAsset/ServiceLocator.php new file mode 100644 index 0000000..f2ef6cb --- /dev/null +++ b/tests/Zend/Loader/TestAsset/ServiceLocator.php @@ -0,0 +1,24 @@ +< php + +namespace ZendTest\Loader\TestAsset; + +use Zend\Di\Locator; + +class ServiceLocator implements Locator +{ + protected $services = array(); + + public function get($name, array $params = array()) + { + if (!isset($this->services[$name])) { + return null; + } + + return $this->services[$name]; + } + + public function set($name, $object) + { + $this->services[$name] = $object; + } +}]]> Thu, 17 Nov 2011 12:59:46 -0800 http://git.zendframework.com/?a=commit&p=zf&h=b3a768f328c324ac313334f0cc4524cf10b95607 http://git.zendframework.com/?a=commit&p=zf&h=b3a768f328c324ac313334f0cc4524cf10b95607 Thu, 17 Nov 2011 12:57:46 -0800 http://git.zendframework.com/?a=commit&p=zf&h=1b0d659c8d647b23fb0aae4f18732f47d80ed99d http://git.zendframework.com/?a=commit&p=zf&h=1b0d659c8d647b23fb0aae4f18732f47d80ed99d Thu, 17 Nov 2011 11:23:35 -0800 http://git.zendframework.com/?a=commit&p=zf&h=bee01f357c8e005b479c8611b2e6cab6363522ba http://git.zendframework.com/?a=commit&p=zf&h=bee01f357c8e005b479c8611b2e6cab6363522ba true +); diff --git a/tests/Zend/Module/_files/config.xml b/tests/Zend/Module/_files/config.xml new file mode 100644 index 0000000..76dee1c --- /dev/null +++ b/tests/Zend/Module/_files/config.xml @@ -0,0 +1,6 @@ +< xml version="1.0" > + + + true + + diff --git a/tests/Zend/Module/_files/config.yaml b/tests/Zend/Module/_files/config.yaml new file mode 100644 index 0000000..3d533c2 --- /dev/null +++ b/tests/Zend/Module/_files/config.yaml @@ -0,0 +1,2 @@ +all: + yaml: 1]]> Thu, 17 Nov 2011 10:36:38 -0800 http://git.zendframework.com/?a=commit&p=zf&h=88af6cdbaca8135219f256f7e95de90444133874 http://git.zendframework.com/?a=commit&p=zf&h=88af6cdbaca8135219f256f7e95de90444133874 mergeTraversableConfig($config); + } + } + + /** * mergeModuleConfig * * @param mixed $module - * @return Manager + * @return ConfigListener */ protected function mergeModuleConfig($module) { @@ -93,23 +141,38 @@ class ConfigListener extends AbstractListener implements ConfigMerger && (is_callable(array($module, 'getConfig'))) ) { $config = $module->getConfig($this->getOptions()->getApplicationEnvironment()); - if ($config instanceof Traversable) { - $config = IteratorToArray::convert($config); - } - if (!is_array($config)) { + try { + $this->mergeTraversableConfig($config); + } catch (Exception\InvalidArgumentException $e) { + // Throw a more descriptive exception throw new Exception\InvalidArgumentException( sprintf('getConfig() method of %s must be an array, ' . 'implement the \Traversable interface, or be an ' - . 'instance of Zend\Config\Config', get_class($module)) + . 'instance of Zend\Config\Config. %s given.', + get_class($module), gettype($config)) ); } - $this->mergedConfig = array_replace_recursive($this->mergedConfig, $config); if ($this->getOptions()->getConfigCacheEnabled()) { $this->updateCache(); } } return $this; } + + protected function mergeTraversableConfig($config) + { + if ($config instanceof Traversable) { + $config = IteratorToArray::convert($config); + } + if (!is_array($config)) { + throw new Exception\InvalidArgumentException( + sprintf('Config being merged must be an array, ' + . 'implement the \Traversable interface, or be an ' + . 'instance of Zend\Config\Config. %s given.', gettype($config)) + ); + } + $this->mergedConfig = array_replace_recursive($this->mergedConfig, $config); + } protected function hasCachedConfig() { diff --git a/library/Zend/Module/Manager.php b/library/Zend/Module/Manager.php index 2bc6fcb..9bd6c4c 100644 --- a/library/Zend/Module/Manager.php +++ b/library/Zend/Module/Manager.php @@ -95,7 +95,7 @@ class Manager implements ModuleHandler */ public function loadModule($moduleName) { - if (isset($this->loadModules[$moduleName])) { + if (isset($this->loadedModules[$moduleName])) { return $this->loadedModules[$moduleName]; } diff --git a/tests/Zend/Module/Listener/ConfigListenerTest.php b/tests/Zend/Module/Listener/ConfigListenerTest.php index b3a4eaf..62e00a3 100644 --- a/tests/Zend/Module/Listener/ConfigListenerTest.php +++ b/tests/Zend/Module/Listener/ConfigListenerTest.php @@ -95,4 +95,21 @@ class ConfigListenerTest extends TestCase $moduleManager = new Manager(array('BadConfigModule', 'SomeModule')); $moduleManager->loadModules(); } + + public function testBadConfigFileExtensionThrowsRuntimeException() + { + $this->setExpectedException('RuntimeException'); + $moduleManager = new Manager(array('SomeModule')); + $moduleManager->loadModules(); + $moduleManager->getConfigListener()->mergeGlobDirectory(dirname(__DIR__) . '/_files/*.{bad}'); + } + + public function testCanMergeConfigFromGlob() + { + $moduleManager = new Manager(array('SomeModule')); + $moduleManager->loadModules(); + $moduleManager->getConfigListener()->mergeGlobDirectory(dirname(__DIR__) . '/_files/*.{ini,json,php,xml,yaml}'); + $config = $moduleManager->getMergedConfig(false); + $this->assertTrue($config['php']); + } } diff --git a/tests/Zend/Module/Listener/ListenerOptionsTest.php b/tests/Zend/Module/Listener/ListenerOptionsTest.php index e284d7f..ec92703 100644 --- a/tests/Zend/Module/Listener/ListenerOptionsTest.php +++ b/tests/Zend/Module/Listener/ListenerOptionsTest.php @@ -12,23 +12,27 @@ class ListenerOptionsTest extends TestCase public function testCanConfigureWithArrayInConstructor() { $options = new ListenerOptions(array( - 'cache_dir' => __DIR__, - 'config_cache_enabled' => true, - 'config_cache_key' => 'foo', + 'cache_dir' => __DIR__, + 'config_cache_enabled' => true, + 'config_cache_key' => 'foo', + 'application_environment' => 'development', )); $this->assertSame($options->getCacheDir(), __DIR__); $this->assertTrue($options->getConfigCacheEnabled()); $this->assertNotNull(strstr($options->getConfigCacheFile(), __DIR__)); $this->assertNotNull(strstr($options->getConfigCacheFile(), '.php')); $this->assertSame($options->getConfigCacheKey(), 'foo'); + $this->assertSame($options->getApplicationEnvironment(), 'development'); } public function testCanAccessKeysAsProperties() { $options = new ListenerOptions(array( - 'cache_dir' => __DIR__, - 'config_cache_enabled' => true, + 'cache_dir' => __DIR__, + 'config_cache_enabled' => true, + 'application_environment' => 'development', )); + $this->assertSame($options->application_environment, 'development'); $this->assertSame($options->cache_dir, __DIR__); $options->cache_dir = 'foo'; $this->assertSame($options->cache_dir, 'foo'); diff --git a/tests/Zend/Module/ManagerTest.php b/tests/Zend/Module/ManagerTest.php index 286136b..1b19f53 100644 --- a/tests/Zend/Module/ManagerTest.php +++ b/tests/Zend/Module/ManagerTest.php @@ -114,6 +114,7 @@ class ManagerTest extends TestCase $modules = $moduleManager->getLoadedModules(true); $this->assertSame(1, count($modules)); $moduleManager->loadModules(); // should not cause any problems + $moduleManager->loadModule('BarModule'); // should not cause any problems $modules = $moduleManager->getLoadedModules(true); // BarModule already loaded so nothing happens $this->assertSame(1, count($modules)); ]]> Thu, 17 Nov 2011 06:51:35 -0800 http://git.zendframework.com/?a=commit&p=zf&h=0a14af9a4b82f5327921732c00e8cfbb4bad3250 http://git.zendframework.com/?a=commit&p=zf&h=0a14af9a4b82f5327921732c00e8cfbb4bad3250 setError(static::ERROR_CONTROLLER_NOT_FOUND) - ->setController($controllerName); + ->setController($controllerName) + ->setParam('exception', $exception); $results = $events->trigger('dispatch.error', $error); if (count($results)) { @@ -282,7 +283,8 @@ class Application implements AppContext $error = clone $e; $error->setError(static::ERROR_CONTROLLER_INVALID) ->setController($controllerName) - ->setControllerClass(get_class($controller)); + ->setControllerClass(get_class($controller)) + ->setParam('exception', $exception); $results = $events->trigger('dispatch.error', $error); if (count($results)) { $return = $results->last();]]> Wed, 16 Nov 2011 14:55:15 -0800 http://git.zendframework.com/?a=commit&p=zf&h=4fa59463966bcc66344df9a9dcbd1ab4d4b55767 http://git.zendframework.com/?a=commit&p=zf&h=4fa59463966bcc66344df9a9dcbd1ab4d4b55767 Wed, 16 Nov 2011 14:55:08 -0800 http://git.zendframework.com/?a=commit&p=zf&h=f3dda919cec4a87bbcbe0b73fee1eeac276cfe48 http://git.zendframework.com/?a=commit&p=zf&h=f3dda919cec4a87bbcbe0b73fee1eeac276cfe48 config_cache_enabled = false; $this->assertFalse($options->config_cache_enabled); - $this->assertNull($options->config_cache_key); + $this->assertEquals($options->application_environment, $options->config_cache_key); } }]]> Wed, 16 Nov 2011 14:47:23 -0800 http://git.zendframework.com/?a=commit&p=zf&h=920663681ad817ad8702b95f14b1bed38d7b972d http://git.zendframework.com/?a=commit&p=zf&h=920663681ad817ad8702b95f14b1bed38d7b972d configCacheKey !== null) { return $this->configCacheKey; } - return $this->getApplicationEnv(); + return $this->getApplicationEnvironment(); } /**]]> Wed, 16 Nov 2011 14:10:38 -0800 http://git.zendframework.com/?a=commit&p=zf&h=1188b77dc13eb1a8c822bc16835c502800db69f8 http://git.zendframework.com/?a=commit&p=zf&h=1188b77dc13eb1a8c822bc16835c502800db69f8 Wed, 16 Nov 2011 14:07:19 -0800 http://git.zendframework.com/?a=commit&p=zf&h=be0c7b139cca302cc18a1ee5de5242897598f5d7 http://git.zendframework.com/?a=commit&p=zf&h=be0c7b139cca302cc18a1ee5de5242897598f5d7 Wed, 16 Nov 2011 13:44:01 -0800 http://git.zendframework.com/?a=commit&p=zf&h=eef97e49075e947f50012824d73b6cc41435b4c0 http://git.zendframework.com/?a=commit&p=zf&h=eef97e49075e947f50012824d73b6cc41435b4c0 skipConfig) && (is_callable(array($module, 'getConfig'))) ) { - $config = $module->getConfig($this->getOptions()->getApplicationEnv()); + $config = $module->getConfig($this->getOptions()->getApplicationEnvironment()); if ($config instanceof Traversable) { $config = IteratorToArray::convert($config); } diff --git a/library/Zend/Module/Listener/ListenerOptions.php b/library/Zend/Module/Listener/ListenerOptions.php index b64443f..4d04459 100644 --- a/library/Zend/Module/Listener/ListenerOptions.php +++ b/library/Zend/Module/Listener/ListenerOptions.php @@ -14,12 +14,17 @@ class ListenerOptions extends Options /** * @var string */ - protected $configCacheKey = null; + protected $configCacheKey; /** * @var string */ - protected $cacheDir = null; + protected $cacheDir; + + /** + * @var string + */ + protected $applicationEnvironment; /** * Check if the config cache is enabled @@ -107,9 +112,25 @@ class ListenerOptions extends Options return $this; } - public function getApplicationEnv() + /** + * Get the application environment being used + * + * @return string + */ + public function getApplicationEnvironment() { - return defined('APPLICATION_ENV') APPLICATION_ENV : null; + return $this->applicationEnvironment : 'production'; + } + + /** + * Set the application environment to use + * + * @param string $applicationEnvironment the value to be set + */ + public function setApplicationEnvironment($applicationEnvironment) + { + $this->applicationEnvironment = $applicationEnvironment; + return $this; } /**]]> Wed, 16 Nov 2011 05:46:51 -0800 http://git.zendframework.com/?a=commit&p=zf&h=63a50a28b6ce0cedf0dd5bd153e66999383876cb http://git.zendframework.com/?a=commit&p=zf&h=63a50a28b6ce0cedf0dd5bd153e66999383876cb