From a8e0b24b953a41b0242c16e6a22654e9c1ca3196 Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Fri, 20 Jul 2012 02:02:45 +0200
Subject: [PATCH] Fix tests, fix markdown/html requirements output

---
 Formatter/MarkdownFormatter.php           |  3 ++-
 Resources/views/method.html.twig          |  2 +-
 Tests/Formatter/MarkdownFormatterTest.php | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Formatter/MarkdownFormatter.php b/Formatter/MarkdownFormatter.php
index e01dd23..06befaa 100644
--- a/Formatter/MarkdownFormatter.php
+++ b/Formatter/MarkdownFormatter.php
@@ -46,6 +46,7 @@ class MarkdownFormatter extends AbstractFormatter
                 if (!empty($infos['type'])) {
                     $markdown .= sprintf("  - Type: %s\n", $infos['type']);
                 }
+
                 if (!empty($infos['description'])) {
                     $markdown .= sprintf("  - Description: %s\n", $infos['description']);
                 }
@@ -61,7 +62,7 @@ class MarkdownFormatter extends AbstractFormatter
                 $markdown .= sprintf("%s:\n\n", $name);
 
                 foreach ($filter as $key => $value) {
-                    $markdown .= sprintf("  * %s: %s\n", $key, trim(json_encode($value), '"'));
+                    $markdown .= sprintf("  * %s: %s\n", ucwords($key), trim(str_replace('\\\\', '\\', json_encode($value)), '"'));
                 }
 
                 $markdown .= "\n";
diff --git a/Resources/views/method.html.twig b/Resources/views/method.html.twig
index d749cd4..e6068ff 100644
--- a/Resources/views/method.html.twig
+++ b/Resources/views/method.html.twig
@@ -72,7 +72,7 @@
                                 {% for key, value in infos %}
                                     <tr>
                                         <td>{{ key|title }}</td>
-                                        <td>{{ value|json_encode|trim('"') }}</td>
+                                        <td>{{ value|json_encode|replace({'\\\\': '\\'})|trim('"') }}</td>
                                     </tr>
                                 {% endfor %}
                                 </table>
diff --git a/Tests/Formatter/MarkdownFormatterTest.php b/Tests/Formatter/MarkdownFormatterTest.php
index 2fd6d51..f686655 100644
--- a/Tests/Formatter/MarkdownFormatterTest.php
+++ b/Tests/Formatter/MarkdownFormatterTest.php
@@ -34,12 +34,12 @@ _index action_
 
 a:
 
-  * dataType: integer
+  * DataType: integer
 
 b:
 
-  * dataType: string
-  * arbitrary: ["arg1","arg2"]
+  * DataType: string
+  * Arbitrary: ["arg1","arg2"]
 
 
 ### `GET` /tests ###
@@ -50,12 +50,12 @@ _index action_
 
 a:
 
-  * dataType: integer
+  * DataType: integer
 
 b:
 
-  * dataType: string
-  * arbitrary: ["arg1","arg2"]
+  * DataType: string
+  * Arbitrary: ["arg1","arg2"]
 
 
 ### `POST` /tests ###
@@ -167,8 +167,8 @@ _This method is useful to test if the getDocComment works._
 
 page:
 
-  * requirement: \d+
-  * description: Page of the overview.
+  * Requirement: \d+
+  * Description: Page of the overview.
 MARKDOWN;
 
         $this->assertEquals($expected, $result);
@@ -191,12 +191,12 @@ _index action_
 
 a:
 
-  * dataType: integer
+  * DataType: integer
 
 b:
 
-  * dataType: string
-  * arbitrary: ["arg1","arg2"]
+  * DataType: string
+  * Arbitrary: ["arg1","arg2"]
 
 
 MARKDOWN;