diff --git a/Extractor/Handler/PhpDocHandler.php b/Extractor/Handler/PhpDocHandler.php index fc72a93..42c475d 100644 --- a/Extractor/Handler/PhpDocHandler.php +++ b/Extractor/Handler/PhpDocHandler.php @@ -47,7 +47,7 @@ class PhpDocHandler implements HandlerInterface // requirements $requirements = $annotation->getRequirements(); foreach ($route->getRequirements() as $name => $value) { - if (!isset($requirements[$name]) && '_method' !== $name) { + if (!isset($requirements[$name]) && '_method' !== $name && '_scheme' !== $name) { $requirements[$name] = array( 'requirement' => $value, 'dataType' => '', diff --git a/Resources/views/method.html.twig b/Resources/views/method.html.twig index 1279b72..2a982cf 100644 --- a/Resources/views/method.html.twig +++ b/Resources/views/method.html.twig @@ -193,101 +193,105 @@ {% if enableSandbox %}
-
-
- Input - {% if data.requirements is defined %} -

Requirements

- {% for name, infos in data.requirements %} + {% if app.request.secure != data.https %} + Please reload the documentation using the scheme {% if data.https %}HTTPS{% else %}HTTP{% endif %} if you want to use the sandbox. + {% else %} + +
+ Input + {% if data.requirements is defined %} +

Requirements

+ {% for name, infos in data.requirements %} +

+ + = + - +

+ {% endfor %} + {% endif %} + {% if data.filters is defined %} +

Filters

+ {% for name, infos in data.filters %} +

+ + = + - +

+ {% endfor %} + {% endif %} + {% if data.parameters is defined %} +

Parameters

+ {% for name, infos in data.parameters %} + {% if not infos.readonly %} +

+ + = + - +

+ {% endif %} + {% endfor %} + + {% endif %} + +
+ +
+ Headers + + {% if acceptType %}

- + = - - -

- {% endfor %} - {% endif %} - {% if data.filters is defined %} -

Filters

- {% for name, infos in data.filters %} -

- - = - - -

- {% endfor %} - {% endif %} - {% if data.parameters is defined %} -

Parameters

- {% for name, infos in data.parameters %} - {% if not infos.readonly %} -

- - = - - + -

{% endif %} - {% endfor %} - - {% endif %} -
- -
- Headers - - {% if acceptType %}

- + = - - + -

- {% endif %} -

- - = - - -

+ +
- -
+
+ Content -
- Content + - +

+ + = + + Replaces header if set +

+
-

- - = - - Replaces header if set -

-
+
+ +
+
-
- + + +
+

Request URL

+

+
+                            

Response Headers [Expand]

+

+
+                            

Response Body [Raw]

+

                         
- - - - -
-

Request URL

-

-
-                        

Response Headers [Expand]

-

-
-                        

Response Body [Raw]

-

-                    
+ {% endif %}
{% endif %}
diff --git a/Tests/Formatter/MarkdownFormatterTest.php b/Tests/Formatter/MarkdownFormatterTest.php index 31a894a..afec19d 100644 --- a/Tests/Formatter/MarkdownFormatterTest.php +++ b/Tests/Formatter/MarkdownFormatterTest.php @@ -401,12 +401,6 @@ nested_array[]: ### `ANY` /secure-route ### -#### Requirements #### - -**_scheme** - - - Requirement: https - ### `ANY` /yet-another/{id} ### diff --git a/Tests/Formatter/SimpleFormatterTest.php b/Tests/Formatter/SimpleFormatterTest.php index d696b21..dfa5b5e 100644 --- a/Tests/Formatter/SimpleFormatterTest.php +++ b/Tests/Formatter/SimpleFormatterTest.php @@ -707,15 +707,6 @@ With multiple lines.', array( 'method' => 'ANY', 'uri' => '/secure-route', - 'requirements' => - array( - '_scheme' => - array( - 'requirement' => 'https', - 'dataType' => '', - 'description' => '', - ), - ), 'https' => true, 'authentication' => false, 'authenticationRoles' => array(),