Merge pull request #320 from emulienfou/master

Fixing issue #319
FriendsOfSymfony · Sep 29, 2018 · fce90c6 · fce90c6
2 parents cbe7ba6 + 2ccdbb5
commit fce90c6
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,7 @@ language: php
 
 matrix:
   include:
-    - php: 5.3
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
-      dist: precise
+    - php: 5.6
     - php: 7.1
     - php: 7.2
     - php: 7.1

diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
@@ -167,6 +167,7 @@ private function doDump(InputInterface $input, OutputInterface $output)
                 $extractor->getRoutes(),
                 $extractor->getPrefix($input->getOption('locale')),
                 $extractor->getHost(),
+                $extractor->getPort(),
                 $extractor->getScheme()
             ),
             'json',

diff --git a/Controller/Controller.php b/Controller/Controller.php
@@ -96,6 +96,7 @@ public function indexAction(Request $request, $_format)
             $exposedRoutes,
             $this->exposedRoutesExtractor->getPrefix($request->getLocale()),
             $this->exposedRoutesExtractor->getHost(),
+            $this->exposedRoutesExtractor->getPort(),
             $this->exposedRoutesExtractor->getScheme(),
             $request->getLocale()
         );

diff --git a/Extractor/ExposedRoutesExtractor.php b/Extractor/ExposedRoutesExtractor.php
@@ -104,14 +104,26 @@ public function getHost()
     {
         $requestContext = $this->router->getContext();
 
-        $host = $requestContext->getHost();
+        $host = $requestContext->getHost() .
+            ('' === $this->getPort() ? $this->getPort() : ':' . $this->getPort());
 
+        return $host;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPort()
+    {
+        $requestContext = $this->router->getContext();
+
+        $port="";
         if ($this->usesNonStandardPort()) {
             $method = sprintf('get%sPort', ucfirst($requestContext->getScheme()));
-            $host .= ':' . $requestContext->$method();
+            $port = $requestContext->$method();
         }
 
-        return $host;
+        return $port;
     }
 
     /**

diff --git a/Extractor/ExposedRoutesExtractorInterface.php b/Extractor/ExposedRoutesExtractorInterface.php
@@ -49,6 +49,13 @@ public function getPrefix($locale);
      */
     public function getHost();
 
+    /**
+     * Get the port from RequestContext, only if non standard port (Eg: "8080")
+     *
+     * @return string
+     */
+    public function getPort();
+
     /**
      * Get the scheme from RequestContext
      *

diff --git a/Resources/js/router.js b/Resources/js/router.js
@@ -19,7 +19,7 @@ class Router {
      * @param {Object.<string, Router.Route>=} routes
      */
     constructor(context, routes) {
-        this.context_ = context || {base_url: '', prefix: '', host: '', scheme: ''};
+        this.context_ = context || {base_url: '', prefix: '', host: '', port: '', scheme: ''};
         this.setRoutes(routes || {});
     }
 
@@ -52,6 +52,9 @@ class Router {
         if ('prefix' in data) {
             this.setPrefix(data['prefix']);
         }
+        if ('port' in data) {
+          this.setPort(data['port']);
+        }
 
         this.setHost(data['host']);
         this.setScheme(data['scheme']);
@@ -120,6 +123,20 @@ class Router {
         return this.context_.host;
     }
 
+    /**
+     * @param {string} port
+    */
+    setPort(port) {
+      this.context_.port = port;
+    }
+
+    /**
+     * @return {string}
+     */
+    getPort() {
+      return this.context_.port;
+    };
+
     /**
      * Builds query string params added to a URL.
      * Port of jQuery's $.param() function, so credit is due there.
@@ -184,7 +201,8 @@ class Router {
             unusedParams = Object.assign({}, params),
             url = '',
             optional = true,
-            host = '';
+            host = '',
+            port = (typeof this.getPort() == "undefined" || this.getPort() === null) ? '' : this.getPort();
 
         route.tokens.forEach((token) => {
             if ('text' === token[0]) {
@@ -263,8 +281,8 @@ class Router {
             url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + url;
         } else if ("undefined" !== typeof route.schemes && "undefined" !== typeof route.schemes[0] && 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 (host && this.getHost() !== host + ('' === port ? '' : ':' + port)) {
+          url = this.getScheme() + "://" + host + ('' === port ? '' : ':' + port) + url;
         } else if (absolute === true) {
             url = this.getScheme() + "://" + this.getHost() + url;
         }

diff --git a/Resources/js/router.test.js b/Resources/js/router.test.js
@@ -406,3 +406,19 @@ function testGenerateWithNullValue() {
 
     assertEquals('/blog-post//10', router.generate('posts', { page: null, id: 10 }));
 }
+
+function testGenerateWithPort() {
+  var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http", port: 443}, {
+    homepage: {
+      tokens: [['text', '/bar']],
+      defaults: {subdomain: 'api'},
+      requirements: {},
+      hosttokens: [
+        ['text', '.localhost'],
+        ['variable', '', '', 'subdomain']
+      ]
+    }
+  });
+
+  assertEquals('http://api.localhost:443/foo/bar', router.generate('homepage'));
+}
diff --git a/Resources/public/js/router.js b/Resources/public/js/router.js
@@ -48,7 +48,7 @@ var Router = function () {
     function Router(context, routes) {
         _classCallCheck(this, Router);
 
-        this.context_ = context || { base_url: '', prefix: '', host: '', scheme: '' };
+        this.context_ = context || { base_url: '', prefix: '', host: '', port: '', scheme: '' };
         this.setRoutes(routes || {});
     }
 
@@ -73,6 +73,9 @@ var Router = function () {
             if ('prefix' in data) {
                 this.setPrefix(data['prefix']);
             }
+            if ('port' in data) {
+                this.setPort(data['port']);
+            }
 
             this.setHost(data['host']);
             this.setScheme(data['scheme']);
@@ -168,6 +171,29 @@ var Router = function () {
             return this.context_.host;
         }
 
+        /**
+         * @param {string} port
+        */
+
+    }, {
+        key: 'setPort',
+        value: function setPort(port) {
+            this.context_.port = port;
+        }
+
+        /**
+         * @return {string}
+         */
+
+    }, {
+        key: 'getPort',
+        value: function getPort() {
+            return this.context_.port;
+        }
+    }, {
+        key: 'buildQueryParams',
+
+
         /**
          * Builds query string params added to a URL.
          * Port of jQuery's $.param() function, so credit is due there.
@@ -176,9 +202,6 @@ var Router = function () {
          * @param {Array|Object|string} params
          * @param {Function} add
          */
-
-    }, {
-        key: 'buildQueryParams',
         value: function buildQueryParams(prefix, params, add) {
             var _this = this;
 
@@ -245,7 +268,8 @@ var Router = function () {
                 unusedParams = _extends({}, params),
                 url = '',
                 optional = true,
-                host = '';
+                host = '',
+                port = typeof this.getPort() == "undefined" || this.getPort() === null ? '' : this.getPort();
 
             route.tokens.forEach(function (token) {
                 if ('text' === token[0]) {
@@ -324,8 +348,8 @@ var Router = function () {
                 url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + url;
             } else if ("undefined" !== typeof route.schemes && "undefined" !== typeof route.schemes[0] && 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 (host && this.getHost() !== host + ('' === port ? '' : ':' + port)) {
+                url = this.getScheme() + "://" + host + ('' === port ? '' : ':' + port) + url;
             } else if (absolute === true) {
                 url = this.getScheme() + "://" + this.getHost() + url;
             }

diff --git a/Resources/public/js/router.min.js b/Resources/public/js/router.min.js
diff --git a/Response/RoutesResponse.php b/Response/RoutesResponse.php
@@ -19,15 +19,17 @@ class RoutesResponse
     private $routes;
     private $prefix;
     private $host;
+    private $port;
     private $scheme;
     private $locale;
 
-    public function __construct($baseUrl, RouteCollection $routes = null, $prefix = null, $host = null, $scheme = null, $locale = null)
+    public function __construct($baseUrl, RouteCollection $routes = null, $prefix = null, $host = null, $port = null, $scheme = null, $locale = null)
     {
         $this->baseUrl = $baseUrl;
         $this->routes  = $routes ?: new RouteCollection();
         $this->prefix  = $prefix;
         $this->host    = $host;
+        $this->port    = $port;
         $this->scheme  = $scheme;
         $this->locale  = $locale;
     }
@@ -74,6 +76,11 @@ public function getHost()
         return $this->host;
     }
 
+    public function getPort()
+    {
+        return $this->port;
+    }
+
     public function getScheme()
     {
         return $this->scheme;

diff --git a/Serializer/Normalizer/RoutesResponseNormalizer.php b/Serializer/Normalizer/RoutesResponseNormalizer.php
@@ -29,6 +29,7 @@ public function normalize($data, $format = null, array $context = array())
             'routes'   => $data->getRoutes(),
             'prefix'   => $data->getPrefix(),
             'host'     => $data->getHost(),
+            'port'     => $data->getPort(),
             'scheme'   => $data->getScheme(),
         );
     }