Merge pull request LaravelCollective#620 from fabianocouto/6.0

mlantz · web-flow · commit f622d996dffe · 2020-05-17T15:59:18.000-04:00
Add escape param in all link methods
diff --git a/src/HtmlBuilder.php b/src/HtmlBuilder.php
@@ -171,12 +171,13 @@ public function link($url, $title = null, $attributes = [], $secure = null, $esc
      * @param string $url
      * @param string $title
      * @param array  $attributes
+     * @param bool   $escape
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function secureLink($url, $title = null, $attributes = [])
+    public function secureLink($url, $title = null, $attributes = [], $escape = true)
     {
-        return $this->link($url, $title, $attributes, true);
+        return $this->link($url, $title, $attributes, true, $escape);
     }
 
     /**
@@ -186,14 +187,15 @@ public function secureLink($url, $title = null, $attributes = [])
      * @param string $title
      * @param array  $attributes
      * @param bool   $secure
+     * @param bool   $escape
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function linkAsset($url, $title = null, $attributes = [], $secure = null)
+    public function linkAsset($url, $title = null, $attributes = [], $secure = null, $escape = true)
     {
         $url = $this->url->asset($url, $secure);
 
-        return $this->link($url, $title ?: $url, $attributes, $secure);
+        return $this->link($url, $title ?: $url, $attributes, $secure, $escape);
     }
 
     /**
@@ -202,12 +204,13 @@ public function linkAsset($url, $title = null, $attributes = [], $secure = null)
      * @param string $url
      * @param string $title
      * @param array  $attributes
+     * @param bool   $escape
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function linkSecureAsset($url, $title = null, $attributes = [])
+    public function linkSecureAsset($url, $title = null, $attributes = [], $escape = true)
     {
-        return $this->linkAsset($url, $title, $attributes, true);
+        return $this->linkAsset($url, $title, $attributes, true, $escape);
     }
 
     /**
@@ -217,12 +220,14 @@ public function linkSecureAsset($url, $title = null, $attributes = [])
      * @param string $title
      * @param array  $parameters
      * @param array  $attributes
+     * @param bool   $secure
+     * @param bool   $escape
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function linkRoute($name, $title = null, $parameters = [], $attributes = [])
+    public function linkRoute($name, $title = null, $parameters = [], $attributes = [], $secure = null, $escape = true)
     {
-        return $this->link($this->url->route($name, $parameters), $title, $attributes);
+        return $this->link($this->url->route($name, $parameters), $title, $attributes, $secure, $escape);
     }
 
     /**
@@ -232,12 +237,14 @@ public function linkRoute($name, $title = null, $parameters = [], $attributes =
      * @param string $title
      * @param array  $parameters
      * @param array  $attributes
+     * @param bool   $secure
+     * @param bool   $escape
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function linkAction($action, $title = null, $parameters = [], $attributes = [])
+    public function linkAction($action, $title = null, $parameters = [], $attributes = [], $secure = null, $escape = true)
     {
-        return $this->link($this->url->action($action, $parameters), $title, $attributes);
+        return $this->link($this->url->action($action, $parameters), $title, $attributes, $secure, $escape);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -171,12 +171,13 @@ public function link($url, $title = null, $attributes = [], $secure = null, $esc`
`171`	`171`	`* @param string $url`
`172`	`172`	`* @param string $title`
`173`	`173`	`* @param array $attributes`
	`174`	`+ * @param bool $escape`
`174`	`175`	`*`
`175`	`176`	`* @return \Illuminate\Support\HtmlString`
`176`	`177`	`*/`
`177`		`- public function secureLink($url, $title = null, $attributes = [])`
	`178`	`+ public function secureLink($url, $title = null, $attributes = [], $escape = true)`
`178`	`179`	`{`
`179`		`- return $this->link($url, $title, $attributes, true);`
	`180`	`+ return $this->link($url, $title, $attributes, true, $escape);`
`180`	`181`	`}`
`181`	`182`
`182`	`183`	`/**`
`@@ -186,14 +187,15 @@ public function secureLink($url, $title = null, $attributes = [])`
`186`	`187`	`* @param string $title`
`187`	`188`	`* @param array $attributes`
`188`	`189`	`* @param bool $secure`
	`190`	`+ * @param bool $escape`
`189`	`191`	`*`
`190`	`192`	`* @return \Illuminate\Support\HtmlString`
`191`	`193`	`*/`
`192`		`- public function linkAsset($url, $title = null, $attributes = [], $secure = null)`
	`194`	`+ public function linkAsset($url, $title = null, $attributes = [], $secure = null, $escape = true)`
`193`	`195`	`{`
`194`	`196`	`$url = $this->url->asset($url, $secure);`
`195`	`197`
`196`		`- return $this->link($url, $title ?: $url, $attributes, $secure);`
	`198`	`+ return $this->link($url, $title ?: $url, $attributes, $secure, $escape);`
`197`	`199`	`}`
`198`	`200`
`199`	`201`	`/**`
`@@ -202,12 +204,13 @@ public function linkAsset($url, $title = null, $attributes = [], $secure = null)`
`202`	`204`	`* @param string $url`
`203`	`205`	`* @param string $title`
`204`	`206`	`* @param array $attributes`
	`207`	`+ * @param bool $escape`
`205`	`208`	`*`
`206`	`209`	`* @return \Illuminate\Support\HtmlString`
`207`	`210`	`*/`
`208`		`- public function linkSecureAsset($url, $title = null, $attributes = [])`
	`211`	`+ public function linkSecureAsset($url, $title = null, $attributes = [], $escape = true)`
`209`	`212`	`{`
`210`		`- return $this->linkAsset($url, $title, $attributes, true);`
	`213`	`+ return $this->linkAsset($url, $title, $attributes, true, $escape);`
`211`	`214`	`}`
`212`	`215`
`213`	`216`	`/**`
`@@ -217,12 +220,14 @@ public function linkSecureAsset($url, $title = null, $attributes = [])`
`217`	`220`	`* @param string $title`
`218`	`221`	`* @param array $parameters`
`219`	`222`	`* @param array $attributes`
	`223`	`+ * @param bool $secure`
	`224`	`+ * @param bool $escape`
`220`	`225`	`*`
`221`	`226`	`* @return \Illuminate\Support\HtmlString`
`222`	`227`	`*/`
`223`		`- public function linkRoute($name, $title = null, $parameters = [], $attributes = [])`
	`228`	`+ public function linkRoute($name, $title = null, $parameters = [], $attributes = [], $secure = null, $escape = true)`
`224`	`229`	`{`
`225`		`- return $this->link($this->url->route($name, $parameters), $title, $attributes);`
	`230`	`+ return $this->link($this->url->route($name, $parameters), $title, $attributes, $secure, $escape);`
`226`	`231`	`}`
`227`	`232`
`228`	`233`	`/**`
`@@ -232,12 +237,14 @@ public function linkRoute($name, $title = null, $parameters = [], $attributes =`
`232`	`237`	`* @param string $title`
`233`	`238`	`* @param array $parameters`
`234`	`239`	`* @param array $attributes`
	`240`	`+ * @param bool $secure`
	`241`	`+ * @param bool $escape`
`235`	`242`	`*`
`236`	`243`	`* @return \Illuminate\Support\HtmlString`
`237`	`244`	`*/`
`238`		`- public function linkAction($action, $title = null, $parameters = [], $attributes = [])`
	`245`	`+ public function linkAction($action, $title = null, $parameters = [], $attributes = [], $secure = null, $escape = true)`
`239`	`246`	`{`
`240`		`- return $this->link($this->url->action($action, $parameters), $title, $attributes);`
	`247`	`+ return $this->link($this->url->action($action, $parameters), $title, $attributes, $secure, $escape);`
`241`	`248`	`}`
`242`	`249`
`243`	`250`	`/**`