Merge branch 'hotfix/zendframework/zendframework#6552-remove-double-d…

…ot-in-merged-config-cache-file-name' into develop

Close zendframework/zendframework#6552

src/Listener/ListenerOptions.php

@@ -250,7 +250,11 @@ public function setConfigCacheKey($configCacheKey)
      */
     public function getConfigCacheFile()
     {
-        return $this->getCacheDir() . '/module-config-cache.' . $this->getConfigCacheKey().'.php';
+        if ($this->getConfigCacheKey()) {
+            return $this->getCacheDir() . '/module-config-cache.' . $this->getConfigCacheKey().'.php';
+        }
+
+        return $this->getCacheDir() . '/module-config-cache.php';
     }
 
     /**
@@ -330,7 +334,11 @@ public function setModuleMapCacheKey($moduleMapCacheKey)
      */
     public function getModuleMapCacheFile()
     {
-        return $this->getCacheDir() . '/module-classmap-cache.'.$this->getModuleMapCacheKey().'.php';
+        if ($this->getModuleMapCacheKey()) {
+            return $this->getCacheDir() . '/module-classmap-cache.' . $this->getModuleMapCacheKey() . '.php';
+        }
+
+        return $this->getCacheDir() . '/module-classmap-cache.php';
     }
 
     /**

test/Listener/ListenerOptionsTest.php

@@ -35,6 +35,42 @@ public function testCanConfigureWithArrayInConstructor()
         $this->assertSame(array('static', 'custom_paths'), $options->getConfigStaticPaths());
     }
 
+    /**
+     * @group 6552
+     */
+    public function testConfigCacheFileWithEmptyCacheKey()
+    {
+        $options = new ListenerOptions(array(
+           'cache_dir'               => __DIR__,
+           'config_cache_enabled'    => true,
+           'module_paths'            => array('module','paths'),
+           'config_glob_paths'       => array('glob','paths'),
+           'config_static_paths'     => array('static','custom_paths'),
+       ));
+
+        $this->assertEquals(__DIR__ . '/module-config-cache.php', $options->getConfigCacheFile());
+        $options->setConfigCacheKey('foo');
+        $this->assertEquals(__DIR__ . '/module-config-cache.foo.php', $options->getConfigCacheFile());
+    }
+
+    /**
+     * @group 6552
+     */
+    public function testModuleMapCacheFileWithEmptyCacheKey()
+    {
+        $options = new ListenerOptions(array(
+           'cache_dir'                => __DIR__,
+           'module_map_cache_enabled' => true,
+           'module_paths'             => array('module','paths'),
+           'config_glob_paths'        => array('glob','paths'),
+           'config_static_paths'      => array('static','custom_paths'),
+       ));
+
+        $this->assertEquals(__DIR__ . '/module-classmap-cache.php', $options->getModuleMapCacheFile());
+        $options->setModuleMapCacheKey('foo');
+        $this->assertEquals(__DIR__ . '/module-classmap-cache.foo.php', $options->getModuleMapCacheFile());
+    }
+
     public function testCanAccessKeysAsProperties()
     {
         $options = new ListenerOptions(array(