Resolve conflicts

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

src/Listener/ConfigListener.php

@@ -170,8 +170,12 @@ public function onLoadModulesPost(ModuleEvent $e)
         }
 
         // If enabled, update the config cache
-        if ($this->getOptions()->getConfigCacheEnabled()) {
-            $this->updateCache();
+        if (
+            $this->getOptions()->getConfigCacheEnabled()
+            && false === $this->skipConfig
+        ) {
+            $configFile = $this->getOptions()->getConfigCacheFile();
+            $this->writeArrayToFile($configFile, $this->getMergedConfig(false));
         }
 
         return $this;
@@ -392,18 +396,4 @@ protected function getCachedConfig()
     {
         return include $this->getOptions()->getConfigCacheFile();
     }
-
-    /**
-     * @return ConfigListener
-     */
-    protected function updateCache()
-    {
-        if (($this->getOptions()->getConfigCacheEnabled())
-            && (false === $this->skipConfig)
-        ) {
-            $configFile = $this->getOptions()->getConfigCacheFile();
-            $this->writeArrayToFile($configFile, $this->getMergedConfig(false));
-        }
-        return $this;
-    }
 }

src/Listener/DefaultListenerAggregate.php

@@ -12,7 +12,6 @@
 
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\ListenerAggregateInterface;
-use Zend\Loader\ModuleAutoloader;
 use Zend\ModuleManager\ModuleEvent;
 use Zend\Stdlib\CallbackHandler;
 
@@ -47,10 +46,9 @@ public function attach(EventManagerInterface $events)
         $options                     = $this->getOptions();
         $configListener              = $this->getConfigListener();
         $locatorRegistrationListener = new LocatorRegistrationListener($options);
-        $moduleAutoloader            = new ModuleAutoloader($options->getModulePaths());
 
         // High priority, we assume module autoloading (for FooNamespace\Module classes) should be available before anything else
-        $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($moduleAutoloader, 'register'), 9000);
+        $this->listeners[] = $events->attach(new ModuleLoaderListener($options));
         $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener);
         // High priority, because most other loadModule listeners will assume the module's classes are available via autoloading
         $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, new AutoloaderListener($options), 9000);

src/Listener/ListenerOptions.php

@@ -57,6 +57,16 @@ class ListenerOptions extends AbstractOptions
      */
     protected $cacheDir;
 
+    /**
+     * @var string
+     */
+    protected $moduleMapCacheEnabled = false;
+
+    /**
+     * @var string
+     */
+    protected $moduleMapCacheKey;
+
     /**
      * Get an array of paths where modules reside
      *
@@ -72,7 +82,7 @@ public function getModulePaths()
      *
      * @param  array|Traversable $modulePaths
      * @throws Exception\InvalidArgumentException
-     * @return ListenerOptions
+     * @return ListenerOptions Provides fluent interface
      */
     public function setModulePaths($modulePaths)
     {
@@ -84,6 +94,7 @@ public function setModulePaths($modulePaths)
                 __CLASS__, __METHOD__, gettype($modulePaths))
             );
         }
+
         $this->modulePaths = $modulePaths;
         return $this;
     }
@@ -113,7 +124,7 @@ public function getConfigStaticPaths()
      *
      * @param array|Traversable $configGlobPaths
      * @throws Exception\InvalidArgumentException
-     * @return ListenerOptions
+     * @return ListenerOptions Provides fluent interface
      */
     public function setConfigGlobPaths($configGlobPaths)
     {
@@ -125,6 +136,7 @@ public function setConfigGlobPaths($configGlobPaths)
                 __CLASS__, __METHOD__, gettype($configGlobPaths))
             );
         }
+
         $this->configGlobPaths = $configGlobPaths;
         return $this;
     }
@@ -134,7 +146,7 @@ public function setConfigGlobPaths($configGlobPaths)
      *
      * @param array|Traversable $configStaticPaths
      * @throws Exception\InvalidArgumentException
-     * @return ListenerOptions
+     * @return ListenerOptions Provides fluent interface
      */
     public function setConfigStaticPaths($configStaticPaths)
     {
@@ -146,6 +158,7 @@ public function setConfigStaticPaths($configStaticPaths)
                 __CLASS__, __METHOD__, gettype($configStaticPaths))
             );
         }
+
         $this->configStaticPaths = $configStaticPaths;
         return $this;
     }
@@ -166,7 +179,7 @@ public function getExtraConfig()
      *
      * @param array|Traversable $extraConfig
      * @throws Exception\InvalidArgumentException
-     * @return ListenerOptions
+     * @return ListenerOptions Provides fluent interface
      */
     public function setExtraConfig($extraConfig)
     {
@@ -178,6 +191,7 @@ public function setExtraConfig($extraConfig)
                 __CLASS__, __METHOD__, gettype($extraConfig))
             );
         }
+
         $this->extraConfig = $extraConfig;
         return $this;
     }
@@ -265,6 +279,60 @@ public function setCacheDir($cacheDir)
         return $this;
     }
 
+    /**
+     * Check if the module class map cache is enabled
+     *
+     * @return bool
+     */
+    public function getModuleMapCacheEnabled()
+    {
+        return $this->moduleMapCacheEnabled;
+    }
+
+    /**
+     * Set if the module class map cache should be enabled or not
+     *
+     * @param  bool $enabled
+     * @return ListenerOptions
+     */
+    public function setModuleMapCacheEnabled($enabled)
+    {
+        $this->moduleMapCacheEnabled = (bool) $enabled;
+        return $this;
+    }
+
+    /**
+     * Get key used to create the cache file name
+     *
+     * @return string
+     */
+    public function getModuleMapCacheKey()
+    {
+        return (string) $this->moduleMapCacheKey;
+    }
+
+    /**
+     * Set key used to create the cache file name
+     *
+     * @param  string $moduleMapCacheKey the value to be set
+     * @return ListenerOptions
+     */
+    public function setModuleMapCacheKey($moduleMapCacheKey)
+    {
+        $this->moduleMapCacheKey = $moduleMapCacheKey;
+        return $this;
+    }
+
+    /**
+     * Get the path to the module class map cache
+     *
+     * @return string
+     */
+    public function getModuleMapCacheFile()
+    {
+        return $this->getCacheDir() . '/module-classmap-cache.'.$this->getModuleMapCacheKey().'.php';
+    }
+
     /**
      * Normalize a path for insertion in the stack
      *

src/Listener/LocatorRegistrationListener.php

@@ -55,14 +55,14 @@ public function onLoadModule(ModuleEvent $e)
     }
 
     /**
-     * loadModulesPost
+     * loadModules
      *
      * Once all the modules are loaded, loop
      *
      * @param  Event $e
      * @return void
      */
-    public function onLoadModulesPost(Event $e)
+    public function onLoadModules(Event $e)
     {
         $moduleManager = $e->getTarget();
         $events        = $moduleManager->getEventManager()->getSharedManager();
@@ -122,7 +122,7 @@ public function onBootstrap(Event $e)
     public function attach(EventManagerInterface $events)
     {
         $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'onLoadModule'));
-        $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModulesPost'), -1000);
+        $this->listeners[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModules'), -1000);
         return $this;
     }