Merge pull request #27 from loic425/feature/fix-redirection

Fix redirection

composer.json

@@ -41,10 +41,10 @@
     },
     "scripts": {
         "analyse": [
-            "@php vendor/bin/ecs check src"
+            "@php vendor/bin/ecs check src tests --set symfony"
         ],
         "fix": [
-            "@php vendor/bin/ecs check src --fix"
+            "@php vendor/bin/ecs check src tests --set symfony --fix"
         ]
     },
     "extra": {

src/Controller/MenuAction.php

@@ -36,7 +36,7 @@ public function __invoke(Request $request): Response
         $menuItems = [];
 
         foreach ($finder as $file) {
-            $slug = rtrim($file->getRelativePathName(), '.md');
+            $slug = preg_replace('/\.md$/', '', $file->getRelativePathName());
             $menuItems[] = [
                 'slug' => $slug,
                 'path' => $this->generateUrl('mobizel_markdown_docs_page_show', ['slug' => $slug]),

src/Controller/PageAction.php

@@ -32,7 +32,9 @@ public function __construct(TemplateHandlerInterface $templateHandler)
     public function __invoke(string $slug): Response
     {
         if (false !== strpos($slug, '.md')) {
-            return $this->redirectToRoute('mobizel_markdown_docs_page_show', ['slug' => rtrim($slug, '.md')]);
+            $slug = preg_replace('/\.md$/', '', $slug);
+
+            return $this->redirectToRoute('mobizel_markdown_docs_page_show', ['slug' => $slug]);
         }
 
         try {

src/Resources/views/search/index.html.twig

@@ -4,7 +4,7 @@
     <h1>Search results for terms "<em>{{ app.request.get('query') }}</em>"</h1>
     <ul>
         {% for file in files %}
-            {% set slug = file.relativePathname|trim('.md', 'right') %}
+            {% set slug = file.relativePathname|split('.md')[0] %}
             <li>
                 <a href="{{ path('mobizel_markdown_docs_page_show', { 'slug': slug }) }}">
                     {{ page_title(slug) }} [{{ slug }}]

tests/Controller/PageActionTest.php

@@ -21,9 +21,10 @@ public function testRedirection()
     {
         $client = static::createClient();
 
-        $client->request('GET', 'index.md');
+        $client->request('GET', 'bdd.md');
 
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
+        $this->assertEquals('/bdd', $client->getResponse()->getTargetUrl());
     }
 
     public function testShowPage()

tests/docs/bdd.md

@@ -0,0 +1 @@
+# BDD - Behaviour-driven development