Merge PR #299 from SimonSimCity/https-fixes

Fix #266
Close #283
Close #299

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' => '',

Resources/views/method.html.twig

@@ -193,6 +193,9 @@
 
             {% if enableSandbox %}
                 <div class="pane sandbox">
+                    {% 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 %}
                         <form method="{{ data.method|upper }}" action="{% if data.host is defined %}{{ data.https ? 'https://' : 'http://' }}{{ data.host }}{% endif %}{{ data.uri }}">
                             <fieldset class="parameters">
                                 <legend>Input</legend>
@@ -288,6 +291,7 @@
                             <h4>Response Body&nbsp;<small>[<a href="" class="to-raw">Raw</a>]</small></h4>
                             <pre class="response prettyprint"></pre>
                         </div>
+                    {% endif %}
                 </div>
             {% endif %}
         </div>

Tests/Formatter/MarkdownFormatterTest.php

@@ -401,12 +401,6 @@ nested_array[]:
 ### `ANY` /secure-route ###
 
 
-#### Requirements ####
-
-**_scheme**
-
-  - Requirement: https
-
 
 ### `ANY` /yet-another/{id} ###
 

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(),