Fix regression introduced by fix for Symfony 3, check for undefined schemes key (#288)

* Fix regression introduced by fix for Symfony 3, check for undefined schemes key
* Fix tests and add test for new way of scheme definition
* Add additional check in schemes usage
* Remove duplicate check in router.js and revert changes to existing tests

Author: tobias-93

Resources/js/router.js

@@ -241,7 +241,7 @@ 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]) {
+    } else if (goog.object.containsKey(route, "schemes") && typeof route.schemes[0] !== "undefined" && this.getScheme() != route.schemes[0]) {
         url = route.schemes[0] + "://" + (host || this.getHost()) + url;
     } else if (host && this.getHost() !== host) {
         url = this.getScheme() + "://" + host + url;

Resources/js/router.test.js

@@ -78,6 +78,21 @@ function testGenerateUsesHostWhenTheSameSchemeRequirementGiven() {
     assertEquals('http://otherhost/foo/bar', router.generate('homepage'));
 }
 
+function testGenerateUsesHostWhenTheSameSchemeGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {},
+            hosttokens: [['text', 'otherhost']],
+            schemes: ['http'],
+            methods: []
+        }
+    });
+
+    assertEquals('http://otherhost/foo/bar', router.generate('homepage'));
+}
+
 function testGenerateUsesHostWhenAnotherSchemeRequirementGiven() {
     var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
         homepage: {
@@ -91,6 +106,21 @@ function testGenerateUsesHostWhenAnotherSchemeRequirementGiven() {
     assertEquals('https://otherhost/foo/bar', router.generate('homepage'));
 }
 
+function testGenerateUsesHostWhenAnotherSchemeGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {},
+            hosttokens: [['text', 'otherhost']],
+            schemes: ['https'],
+            methods: []
+        }
+    });
+
+    assertEquals('https://otherhost/foo/bar', router.generate('homepage'));
+}
+
 function testGenerateSupportsHostPlaceholders() {
     var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
         homepage: {
@@ -165,6 +195,21 @@ function testGenerateUsesAbsoluteUrlWhenSchemeRequirementGiven() {
     assertEquals('http://localhost/foo/bar', router.generate('homepage', [], true));
 }
 
+function testGenerateUsesAbsoluteUrlWhenSchemeGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {},
+            hosttokens: [],
+            schemes: ['http'],
+            methods: []
+        }
+    });
+
+    assertEquals('http://localhost/foo/bar', router.generate('homepage', [], true));
+}
+
 function testGenerateWithOptionalTrailingParam() {
     var router = new fos.Router({base_url: ''}, {
         posts: {