From a227bf1505962d4e667a59b26535b3c4ab3e4621 Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Mon, 21 Nov 2011 13:59:55 -0700 Subject: [PATCH] Updated for latest zf2 conventions --- .gitmodules | 6 ++-- configs/application.config.php | 16 ---------- etc/application.config.php | 15 ++++++++++ etc/conf.d/README.md | 8 +++++ library/ZendFramework | 1 - {modules => module}/Application/Module.php | 25 +++++++--------- .../Application/autoload_classmap.php | 0 .../Application/autoload_function.php | 0 .../Application/autoload_register.php | 0 .../Application/config}/module.config.php | 0 .../Application/public/css/default.css | 0 .../Application/public/css/font.css | 0 .../Application/public/css/setup.css | 0 .../Application/public/images/active-tab.png | Bin .../Application/public/images/corner.png | Bin .../Application/public/images/corner.xcf | Bin .../Application/public/images/github.png | Bin .../public/images/inactive-tab.png | Bin .../Application/public/images/logo.png | Bin .../public/images/logov6-hover.svg | 0 .../Application/public/images/search.jpg | Bin .../Application/public/images/search.png | Bin .../Application/public/images/separator.jpg | Bin .../public/images/subtle-check.jpg | Bin .../public/images/subtle-waves.jpg | Bin .../public/images/zf2-logo-white-small.png | Bin .../Controller/ErrorController.php | 0 .../Controller/IndexController.php | 0 .../src/Application/View/Helper/Url.php | 0 .../src/Application/View/Listener.php | 0 .../Application/views/error/index.phtml | 0 .../Application/views/index/index.phtml | 0 .../Application/views/layouts/layout.phtml | 0 public/image | 2 +- public/index.php | 28 ++++++------------ public/style | 2 +- vendor/ZendFramework | 1 + 37 files changed, 49 insertions(+), 55 deletions(-) delete mode 100644 configs/application.config.php create mode 100644 etc/application.config.php create mode 100644 etc/conf.d/README.md delete mode 160000 library/ZendFramework rename {modules => module}/Application/Module.php (75%) rename {modules => module}/Application/autoload_classmap.php (100%) rename {modules => module}/Application/autoload_function.php (100%) rename {modules => module}/Application/autoload_register.php (100%) rename {modules/Application/configs => module/Application/config}/module.config.php (100%) rename {modules => module}/Application/public/css/default.css (100%) rename {modules => module}/Application/public/css/font.css (100%) rename {modules => module}/Application/public/css/setup.css (100%) rename {modules => module}/Application/public/images/active-tab.png (100%) rename {modules => module}/Application/public/images/corner.png (100%) rename {modules => module}/Application/public/images/corner.xcf (100%) rename {modules => module}/Application/public/images/github.png (100%) rename {modules => module}/Application/public/images/inactive-tab.png (100%) rename {modules => module}/Application/public/images/logo.png (100%) rename {modules => module}/Application/public/images/logov6-hover.svg (100%) rename {modules => module}/Application/public/images/search.jpg (100%) rename {modules => module}/Application/public/images/search.png (100%) rename {modules => module}/Application/public/images/separator.jpg (100%) rename {modules => module}/Application/public/images/subtle-check.jpg (100%) rename {modules => module}/Application/public/images/subtle-waves.jpg (100%) rename {modules => module}/Application/public/images/zf2-logo-white-small.png (100%) rename {modules => module}/Application/src/Application/Controller/ErrorController.php (100%) rename {modules => module}/Application/src/Application/Controller/IndexController.php (100%) rename {modules => module}/Application/src/Application/View/Helper/Url.php (100%) rename {modules => module}/Application/src/Application/View/Listener.php (100%) rename {modules => module}/Application/views/error/index.phtml (100%) rename {modules => module}/Application/views/index/index.phtml (100%) rename {modules => module}/Application/views/layouts/layout.phtml (100%) create mode 160000 vendor/ZendFramework diff --git a/.gitmodules b/.gitmodules index 670b03e3..8f630fff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "library/ZendFramework"] - path = library/ZendFramework - url = git://git.zendframework.com/zf.git +[submodule "vendor/ZendFramework"] + path = vendor/ZendFramework + url = git://github.com/zendframework/zf2.git diff --git a/configs/application.config.php b/configs/application.config.php deleted file mode 100644 index 873c275c..00000000 --- a/configs/application.config.php +++ /dev/null @@ -1,16 +0,0 @@ - array( - realpath(__DIR__ . '/../modules'), - ), - 'modules' => array( - 'Application', - ), - 'module_manager_options' => array( - 'enable_config_cache' => false, - 'cache_dir' => realpath(__DIR__ . '/../data/cache'), - 'enable_dependency_check' => false, - 'enable_auto_installation' => false, - 'manifest_dir' => realpath(__DIR__ . '/../data'), - ), -); diff --git a/etc/application.config.php b/etc/application.config.php new file mode 100644 index 00000000..273ebbee --- /dev/null +++ b/etc/application.config.php @@ -0,0 +1,15 @@ + array( + realpath(dirname(__DIR__) . '/module'), + realpath(dirname(__DIR__) . '/vendor'), + ), + 'modules' => array( + 'Application', + ), + 'module_listener_options' => array( + 'config_cache_enabled' => false, + 'cache_dir' => realpath(dirname(__DIR__) . '/data/cache'), + 'application_environment' => getenv('APPLICATION_ENV'), + ), +); diff --git a/etc/conf.d/README.md b/etc/conf.d/README.md new file mode 100644 index 00000000..a42ef5b8 --- /dev/null +++ b/etc/conf.d/README.md @@ -0,0 +1,8 @@ +About this directory: +===================== + +By default, this application is configured to load all configs in +`./config/autoload/*.config.php`. Doing this provides a location for a +developer to drop in configuration override files provided by modules, as well +as cleanly provide individual, application-wide config files for things like +database connections, etc. diff --git a/library/ZendFramework b/library/ZendFramework deleted file mode 160000 index 9ef861f3..00000000 --- a/library/ZendFramework +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9ef861f3ec5c8315e1392b9d3cac012b80fffaa5 diff --git a/modules/Application/Module.php b/module/Application/Module.php similarity index 75% rename from modules/Application/Module.php rename to module/Application/Module.php index 21dab988..d2d5d333 100644 --- a/modules/Application/Module.php +++ b/module/Application/Module.php @@ -2,26 +2,23 @@ namespace Application; -use Zend\Module\Manager, - Zend\Config\Config, - Zend\EventManager\StaticEventManager, - Zend\Loader\AutoloaderFactory; +use Zend\EventManager\StaticEventManager, + Zend\Module\Consumer\AutoloaderProvider; -class Module +class Module implements AutoloaderProvider { protected $view; protected $viewListener; - public function init(Manager $moduleManager) + public function init() { - $this->initAutoloader($moduleManager->getOptions()->getApplicationEnv()); $events = StaticEventManager::getInstance(); $events->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100); } - protected function initAutoloader($env = null) + public function getAutoloaderConfig() { - AutoloaderFactory::factory(array( + return array( 'Zend\Loader\ClassMapAutoloader' => array( __DIR__ . '/autoload_classmap.php', ), @@ -30,19 +27,19 @@ protected function initAutoloader($env = null) __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__, ), ), - )); + ); } - public function getConfig() + public function getConfig($env = null) { - return new Config(include __DIR__ . '/configs/module.config.php'); + return include __DIR__ . '/config/module.config.php'; } public function initializeView($e) { $app = $e->getParam('application'); $locator = $app->getLocator(); - $config = $e->getParam('modules')->getMergedConfig(); + $config = $e->getParam('config'); $view = $this->getView($app); $viewListener = $this->getViewListener($view, $config); $app->events()->attachAggregate($viewListener); @@ -76,7 +73,7 @@ protected function getView($app) $view->plugin('headTitle')->setSeparator(' - ') ->setAutoEscape(false) - ->append('modules.zendframework.com'); + ->append('ZF2 Modules'); $this->view = $view; return $view; } diff --git a/modules/Application/autoload_classmap.php b/module/Application/autoload_classmap.php similarity index 100% rename from modules/Application/autoload_classmap.php rename to module/Application/autoload_classmap.php diff --git a/modules/Application/autoload_function.php b/module/Application/autoload_function.php similarity index 100% rename from modules/Application/autoload_function.php rename to module/Application/autoload_function.php diff --git a/modules/Application/autoload_register.php b/module/Application/autoload_register.php similarity index 100% rename from modules/Application/autoload_register.php rename to module/Application/autoload_register.php diff --git a/modules/Application/configs/module.config.php b/module/Application/config/module.config.php similarity index 100% rename from modules/Application/configs/module.config.php rename to module/Application/config/module.config.php diff --git a/modules/Application/public/css/default.css b/module/Application/public/css/default.css similarity index 100% rename from modules/Application/public/css/default.css rename to module/Application/public/css/default.css diff --git a/modules/Application/public/css/font.css b/module/Application/public/css/font.css similarity index 100% rename from modules/Application/public/css/font.css rename to module/Application/public/css/font.css diff --git a/modules/Application/public/css/setup.css b/module/Application/public/css/setup.css similarity index 100% rename from modules/Application/public/css/setup.css rename to module/Application/public/css/setup.css diff --git a/modules/Application/public/images/active-tab.png b/module/Application/public/images/active-tab.png similarity index 100% rename from modules/Application/public/images/active-tab.png rename to module/Application/public/images/active-tab.png diff --git a/modules/Application/public/images/corner.png b/module/Application/public/images/corner.png similarity index 100% rename from modules/Application/public/images/corner.png rename to module/Application/public/images/corner.png diff --git a/modules/Application/public/images/corner.xcf b/module/Application/public/images/corner.xcf similarity index 100% rename from modules/Application/public/images/corner.xcf rename to module/Application/public/images/corner.xcf diff --git a/modules/Application/public/images/github.png b/module/Application/public/images/github.png similarity index 100% rename from modules/Application/public/images/github.png rename to module/Application/public/images/github.png diff --git a/modules/Application/public/images/inactive-tab.png b/module/Application/public/images/inactive-tab.png similarity index 100% rename from modules/Application/public/images/inactive-tab.png rename to module/Application/public/images/inactive-tab.png diff --git a/modules/Application/public/images/logo.png b/module/Application/public/images/logo.png similarity index 100% rename from modules/Application/public/images/logo.png rename to module/Application/public/images/logo.png diff --git a/modules/Application/public/images/logov6-hover.svg b/module/Application/public/images/logov6-hover.svg similarity index 100% rename from modules/Application/public/images/logov6-hover.svg rename to module/Application/public/images/logov6-hover.svg diff --git a/modules/Application/public/images/search.jpg b/module/Application/public/images/search.jpg similarity index 100% rename from modules/Application/public/images/search.jpg rename to module/Application/public/images/search.jpg diff --git a/modules/Application/public/images/search.png b/module/Application/public/images/search.png similarity index 100% rename from modules/Application/public/images/search.png rename to module/Application/public/images/search.png diff --git a/modules/Application/public/images/separator.jpg b/module/Application/public/images/separator.jpg similarity index 100% rename from modules/Application/public/images/separator.jpg rename to module/Application/public/images/separator.jpg diff --git a/modules/Application/public/images/subtle-check.jpg b/module/Application/public/images/subtle-check.jpg similarity index 100% rename from modules/Application/public/images/subtle-check.jpg rename to module/Application/public/images/subtle-check.jpg diff --git a/modules/Application/public/images/subtle-waves.jpg b/module/Application/public/images/subtle-waves.jpg similarity index 100% rename from modules/Application/public/images/subtle-waves.jpg rename to module/Application/public/images/subtle-waves.jpg diff --git a/modules/Application/public/images/zf2-logo-white-small.png b/module/Application/public/images/zf2-logo-white-small.png similarity index 100% rename from modules/Application/public/images/zf2-logo-white-small.png rename to module/Application/public/images/zf2-logo-white-small.png diff --git a/modules/Application/src/Application/Controller/ErrorController.php b/module/Application/src/Application/Controller/ErrorController.php similarity index 100% rename from modules/Application/src/Application/Controller/ErrorController.php rename to module/Application/src/Application/Controller/ErrorController.php diff --git a/modules/Application/src/Application/Controller/IndexController.php b/module/Application/src/Application/Controller/IndexController.php similarity index 100% rename from modules/Application/src/Application/Controller/IndexController.php rename to module/Application/src/Application/Controller/IndexController.php diff --git a/modules/Application/src/Application/View/Helper/Url.php b/module/Application/src/Application/View/Helper/Url.php similarity index 100% rename from modules/Application/src/Application/View/Helper/Url.php rename to module/Application/src/Application/View/Helper/Url.php diff --git a/modules/Application/src/Application/View/Listener.php b/module/Application/src/Application/View/Listener.php similarity index 100% rename from modules/Application/src/Application/View/Listener.php rename to module/Application/src/Application/View/Listener.php diff --git a/modules/Application/views/error/index.phtml b/module/Application/views/error/index.phtml similarity index 100% rename from modules/Application/views/error/index.phtml rename to module/Application/views/error/index.phtml diff --git a/modules/Application/views/index/index.phtml b/module/Application/views/index/index.phtml similarity index 100% rename from modules/Application/views/index/index.phtml rename to module/Application/views/index/index.phtml diff --git a/modules/Application/views/layouts/layout.phtml b/module/Application/views/layouts/layout.phtml similarity index 100% rename from modules/Application/views/layouts/layout.phtml rename to module/Application/views/layouts/layout.phtml diff --git a/public/image b/public/image index f8466586..72963f9d 120000 --- a/public/image +++ b/public/image @@ -1 +1 @@ -../modules/Application/public/images \ No newline at end of file +../module/Application/public/images \ No newline at end of file diff --git a/public/index.php b/public/index.php index 84f5f903..fe226639 100644 --- a/public/index.php +++ b/public/index.php @@ -1,30 +1,20 @@ array())); -$appConfig = new Zend\Config\Config(include __DIR__ . '/../configs/application.config.php'); +$appConfig = include dirname(__DIR__) . '/etc/application.config.php'; $moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig['module_paths']); $moduleLoader->register(); -$moduleManager = new Zend\Module\Manager( - $appConfig['modules'], - new Zend\Module\ManagerOptions($appConfig['module_manager_options']) -); +$moduleManager = new Zend\Module\Manager($appConfig['modules']); +$listenerOptions = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']); +$moduleManager->setDefaultListenerOptions($listenerOptions); +$moduleManager->getConfigListener()->addConfigGlobPath(dirname(__DIR__) . '/etc/conf.d/*.config.php'); +$moduleManager->loadModules(); // Create application, bootstrap, and run -$bootstrap = new Zend\Mvc\Bootstrap($moduleManager); -$application = new Zend\Mvc\Application; +$bootstrap = new Zend\Mvc\Bootstrap($moduleManager->getMergedConfig()); +$application = new Zend\Mvc\Application; $bootstrap->bootstrap($application); $application->run()->send(); diff --git a/public/style b/public/style index 61d5c0ab..1c4d3efa 120000 --- a/public/style +++ b/public/style @@ -1 +1 @@ -../modules/Application/public/css \ No newline at end of file +../module/Application/public/css \ No newline at end of file diff --git a/vendor/ZendFramework b/vendor/ZendFramework new file mode 160000 index 00000000..a2777d1b --- /dev/null +++ b/vendor/ZendFramework @@ -0,0 +1 @@ +Subproject commit a2777d1bd615403635579804e1cb7a086ef47f88