Merge branch 'hotfix/370' into develop

Forward port #370

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#370](https://github.com/zfcampus/zf-apigility-admin/pull/370) provides a fix
+  to the `RpcServiceModel::fetchAll()` method that allows it to work with PSR-4
+  structured modules.
 
 ## 1.5.9 - 2016-10-12
 

src/Model/RpcServiceModel.php

@@ -146,7 +146,7 @@ public function fetchAll($version = null)
             $namespaceSep = preg_quote('\\');
             $pattern = sprintf(
                 '#%s%sV%s#',
-                $this->module,
+                $this->moduleNameToRegex(),
                 $namespaceSep,
                 $version
             );
@@ -763,4 +763,19 @@ public function createMediaType()
             $this->moduleEntity->getLatestVersion()
         );
     }
+
+    /**
+     * Converts a module name (which could include namespace separators) into a string that can be used in regex
+     * matches. Use-cases:
+     *      - Acme\Account => Acme\\Account
+     *      - Acme\\Account (ideally it should never happen) => Acme\\Account
+     *      - Acme => Acme
+     *
+     * @return string
+     */
+    private function moduleNameToRegex()
+    {
+        // find all backslashes (\) that are NOT followed by another \ and replace them with \\ (two of them)
+        return preg_replace('#\\\\(?!\\\\)#', '\\\\\\\\', $this->module);
+    }
 }