Browse Source

Fix bound URI

shalvah 4 years ago
parent
commit
362d305c29
3 changed files with 29 additions and 3 deletions
  1. 1 1
      camel/Output/OutputEndpointData.php
  2. 26 0
      resources/css/theme-default.style.css
  3. 2 2
      src/Tools/Utils.php

+ 1 - 1
camel/Output/OutputEndpointData.php

@@ -92,12 +92,12 @@ class OutputEndpointData extends BaseDTO
 
         parent::__construct($parameters);
 
-        $this->boundUri = u::getUrlWithBoundParameters($this->uri, $this->cleanUrlParameters);
         $this->nestedBodyParameters = Extractor::nestArrayAndObjectFields($this->bodyParameters);
 
         $this->cleanBodyParameters = Extractor::cleanParams($this->bodyParameters);
         $this->cleanQueryParameters = Extractor::cleanParams($this->queryParameters);
         $this->cleanUrlParameters = Extractor::cleanParams($this->urlParameters);
+        $this->boundUri = u::getUrlWithBoundParameters($this->uri, $this->cleanUrlParameters);
 
         [$files, $regularParameters] = collect($this->cleanBodyParameters)
             ->partition(

+ 26 - 0
resources/css/theme-default.style.css

@@ -926,6 +926,32 @@ html {
     .content ul {
         margin-right: 0
     }
+    .content>aside,
+    .content>details,
+    .content>dl,
+    .content>h1,
+    .content>h2,
+    .content>h3,
+    .content>h4,
+    .content>h5,
+    .content>h6,
+    .content>ol,
+    .content>p,
+    .content>table,
+    .content>ul,
+    .content>form>aside,
+    .content>form>details,
+    .content>form>h1,
+    .content>form>h2,
+    .content>form>h3,
+    .content>form>h4,
+    .content>form>h5,
+    .content>form>h6,
+    .content>form>p,
+    .content>form>table,
+    .content>form>ul {
+        margin-right: 0;
+    }
     .content blockquote,
     .content pre {
         float: none;

+ 2 - 2
src/Tools/Utils.php

@@ -30,9 +30,9 @@ class Utils
      * @param string $uri
      * @param array $urlParameters Dictionary of url params and example values
      *
-     * @return mixed
+     * @return string
      */
-    public static function replaceUrlParameterPlaceholdersWithValues(string $uri, array $urlParameters)
+    public static function replaceUrlParameterPlaceholdersWithValues(string $uri, array $urlParameters): string
     {
         if (empty($urlParameters)) {
             return $uri;