Merge pull request #2 from swisnl/issue/1

Change logic for converting GET-params to a filename

Author: JaZo

README.md

@@ -46,12 +46,12 @@ Please see the following table for some examples.
 |                                   |     | /path/to/fixtures/example.com/api/articles/1.mock |
 | http://example.com/api/articles | POST | /path/to/fixtures/example.com/api/articles.post.mock |
 |                                 |      | /path/to/fixtures/example.com/api/articles.mock |
-| http://example.com/api/comments?query=json | GET | /path/to/fixtures/example.com/api/comments.query-json.get.mock |
-|                                            |     | /path/to/fixtures/example.com/api/comments.query-json.mock |
+| http://example.com/api/comments?query=json | GET | /path/to/fixtures/example.com/api/comments.query=json.get.mock |
+|                                            |     | /path/to/fixtures/example.com/api/comments.query=json.mock |
 |                                            |     | /path/to/fixtures/example.com/api/comments.get.mock |
 |                                            |     | /path/to/fixtures/example.com/api/comments.mock |
-| http://example.com/api/comments?query=json&order=id | GET | /path/to/fixtures/example.com/api/comments.order-id-query-json.get.mock |
-|                                                     |     | /path/to/fixtures/example.com/api/comments.order-id-query-json.mock |
+| http://example.com/api/comments?query=json&order=id | GET | /path/to/fixtures/example.com/api/comments.order=id&query=json.get.mock |
+|                                                     |     | /path/to/fixtures/example.com/api/comments.order=id&query=json.mock |
 |                                                     |     | /path/to/fixtures/example.com/api/comments.get.mock |
 |                                                     |     | /path/to/fixtures/example.com/api/comments.mock |
 

src/ResponseBuilder.php

@@ -225,22 +225,22 @@ protected function getMethodFromRequest(RequestInterface $request): string
 
     /**
      * @param \Psr\Http\Message\RequestInterface $request
-     * @param string                             $separator
+     * @param string                             $replacement
      *
      * @return string
      */
-    protected function getQueryFromRequest(RequestInterface $request, $separator = '-'): string
+    protected function getQueryFromRequest(RequestInterface $request, $replacement = '-'): string
     {
         $query = urldecode($request->getUri()->getQuery());
-        $parts = array_map(
-            function (string $part) use ($separator) {
-                return str_replace('=', $separator, $part);
-            },
-            explode('&', $query)
-        );
+        $parts = explode('&', $query);
         sort($parts);
+        $query = implode('&', $parts);
 
-        return Stringy::create(implode($separator, $parts))->slugify($separator);
+        return (string)Stringy::create(str_replace(['\\', '/', '?', ':', '*', '"', '>', '<', '|'], $replacement, $query))
+            ->toAscii()
+            ->delimit($replacement)
+            ->removeLeft($replacement)
+            ->removeRight($replacement);
     }
 
     /**

tests/ResponseBuilderTest.php

@@ -45,16 +45,18 @@ public function getResponses(): array
             ['http://example.com/api/articles', 'GET', 'example.com/api/articles.mock'],
             // Nested
             ['http://example.com/api/articles/1', 'GET', 'example.com/api/articles/1.mock'],
-            // With query
-            ['http://example.com/api/comments?query=json', 'GET', 'example.com/api/comments.query-json.mock'],
+            // With simple query
+            ['http://example.com/api/comments?query=json', 'GET', 'example.com/api/comments.query=json.mock'],
+            // With complex query
+            ['http://example.com/api/comments?query=json&foo[]=bar&foo[]=baz', 'GET', 'example.com/api/comments.foo[]=bar&foo[]=baz&query=json.mock'],
             // With query fallback
             ['http://example.com/api/comments?foo=bar', 'GET', 'example.com/api/comments.mock'],
             // With method
             ['http://example.com/api/people', 'GET', 'example.com/api/people.get.mock'],
             // With method fallback
             ['http://example.com/api/people', 'POST', 'example.com/api/people.mock'],
             // With query and method
-            ['http://example.com/api/tags?query=json', 'POST', 'example.com/api/tags.query-json.post.mock'],
+            ['http://example.com/api/tags?query=json', 'POST', 'example.com/api/tags.query=json.post.mock'],
             // With query and method fallback
             ['http://example.com/api/tags?foo=bar', 'GET', 'example.com/api/tags.mock'],
         ];

tests/_fixtures/example.com/api/comments.foo[]=bar&foo[]=baz&query=json.mock

@@ -0,0 +1 @@
+comments-foo-bar-foo-baz-query-json