Simplifying Escaper and AbstractBlock escapeJsQuote description and modifying PHPDoc param to specify can be string and array of strings

edward-simpson · edward-simpson · commit 9bbc8f2db899 · 2019-11-06T10:10:48.000Z
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -310,10 +310,9 @@ public function escapeCss($string)
     }
 
     /**
-     * Escape single quotes/apostrophes ('), or other specified $quote character
-     * in javascript (string or array of strings)
+     * Escape single quotes/apostrophes ('), or other specified $quote character in javascript
      *
-     * @param string|array $data
+     * @param string|string[]|array $data
      * @param string $quote
      * @return string|array
      * @deprecated 100.2.0
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -985,10 +985,9 @@ public function escapeQuote($data, $addSlashes = false)
     }
 
     /**
-     * Escape single quotes/apostrophes ('), or other specified $quote character
-     * in javascript (string or array of strings)
+     * Escape single quotes/apostrophes ('), or other specified $quote character in javascript
      *
-     * @param string|array $data
+     * @param string|string[]|array $data
      * @param string $quote
      *
      * @return string|array

Original file line number	Diff line number	Diff line change
`@@ -310,10 +310,9 @@ public function escapeCss($string)`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`/**`
`313`		`- * Escape single quotes/apostrophes ('), or other specified $quote character`
`314`		`- * in javascript (string or array of strings)`
	`313`	`+ * Escape single quotes/apostrophes ('), or other specified $quote character in javascript`
`315`	`314`	`*`
`316`		`- * @param string\|array $data`
	`315`	`+ * @param string\|string[]\|array $data`
`317`	`316`	`* @param string $quote`
`318`	`317`	`* @return string\|array`
`319`	`318`	`* @deprecated 100.2.0`
Original file line number	Diff line number	Diff line change
`@@ -985,10 +985,9 @@ public function escapeQuote($data, $addSlashes = false)`
`985`	`985`	`}`
`986`	`986`
`987`	`987`	`/**`
`988`		`- * Escape single quotes/apostrophes ('), or other specified $quote character`
`989`		`- * in javascript (string or array of strings)`
	`988`	`+ * Escape single quotes/apostrophes ('), or other specified $quote character in javascript`
`990`	`989`	`*`
`991`		`- * @param string\|array $data`
	`990`	`+ * @param string\|string[]\|array $data`
`992`	`991`	`* @param string $quote`
`993`	`992`	`*`
`994`	`993`	`* @return string\|array`