Merge pull request #286 from tobias-93/fix-symfony3-1.x

Fix for new way of handling scheme in Symfony 3.0 (1.x)

Author: GuilhemN

Extractor/ExposedRoutesExtractor.php

@@ -73,7 +73,9 @@ public function getRoutes()
                 $compiledRoute->getTokens(),
                 $defaults,
                 $requirements,
-                $hostTokens
+                $hostTokens,
+                $route->getMethods(),
+                $route->getSchemes()
             );
         }
 

Extractor/ExtractedRoute.php

@@ -17,13 +17,17 @@ class ExtractedRoute
     private $defaults;
     private $requirements;
     private $hosttokens;
+    private $methods;
+    private $schemes;
 
-    public function __construct(array $tokens, array $defaults, array $requirements, array $hosttokens = array())
+    public function __construct(array $tokens, array $defaults, array $requirements, array $hosttokens = array(), array $methods = array(), array $schemes = array())
     {
         $this->tokens = $tokens;
         $this->defaults = $defaults;
         $this->requirements = $requirements;
         $this->hosttokens = $hosttokens;
+        $this->methods = $methods;
+        $this->schemes = $schemes;
     }
 
     public function getTokens()
@@ -45,4 +49,14 @@ public function getHosttokens()
     {
         return $this->hosttokens;
     }
+
+    public function getMethods()
+    {
+        return $this->methods;
+    }
+
+    public function getSchemes()
+    {
+        return $this->schemes;
+    }
 }

Resources/js/externs.js

@@ -6,5 +6,7 @@ var externs = {
     tokens: '',
     defaults: '',
     requirements: '',
-    hosttokens: ''
+    hosttokens: '',
+    schemes: '',
+    methods: ''
 };

Resources/js/router.js

@@ -21,7 +21,9 @@ goog.addSingletonGetter(fos.Router);
  *     tokens: (Array.<Array.<string>>),
  *     defaults: (Object.<string, string>),
  *     requirements: Object,
- *     hosttokens: (Array.<string>)
+ *     hosttokens: (Array.<string>),
+ *     schemes: (Array.<string>),
+ *     methods: (Array.<string>)
  * }}
  */
 fos.Router.Route;
@@ -239,6 +241,8 @@ fos.Router.prototype.generate = function(name, opt_params, absolute) {
     url = this.context_.base_url + url;
     if (goog.object.containsKey(route.requirements, "_scheme") && this.getScheme() != route.requirements["_scheme"]) {
         url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + url;
+    } else if (goog.object.containsKey(route, "schemes") && this.getScheme() != route.schemes[0]) {
+        url = route.schemes[0] + "://" + (host || this.getHost()) + url;
     } else if (host && this.getHost() !== host) {
         url = this.getScheme() + "://" + host + url;
     } else if (absolute === true) {

Resources/public/js/router.js

@@ -37,7 +37,7 @@ public function testIndexAction()
         );
         $response = $controller->indexAction($this->getRequest('/'), 'json');
 
-        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[]},"blog":{"tokens":[["variable","\/","[^\/]+?","slug"],["text","\/blog-post"]],"defaults":[],"requirements":[],"hosttokens":[["text","localhost"]]}},"prefix":"","host":"","scheme":""}', $response->getContent());
+        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"blog":{"tokens":[["variable","\/","[^\/]+?","slug"],["text","\/blog-post"]],"defaults":[],"requirements":[],"hosttokens":[["text","localhost"]],"methods":[],"schemes":[]}},"prefix":"","host":"","scheme":""}', $response->getContent());
     }
 
     public function testConfigCache()
@@ -50,11 +50,11 @@ public function testConfigCache()
         );
 
         $response = $controller->indexAction($this->getRequest('/'), 'json');
-        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[]}},"prefix":"","host":"","scheme":""}', $response->getContent());
+        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]}},"prefix":"","host":"","scheme":""}', $response->getContent());
 
         // second call should serve the cached content
         $response = $controller->indexAction($this->getRequest('/'), 'json');
-        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[]}},"prefix":"","host":"","scheme":""}', $response->getContent());
+        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]}},"prefix":"","host":"","scheme":""}', $response->getContent());
     }
 
     /**