Fix accepted types for escaper methods #40114
+22
−22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,7 +1,7 @@ | ||||||
| <?php | ||||||
| /** | ||||||
| * Copyright 2014 Adobe | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * All Rights Reserved. | ||||||
| */ | ||||||
| declare(strict_types=1); | ||||||
|
|
||||||
|
|
@@ -70,9 +70,9 @@ class Escaper | |||||
| * AllowedTags will not be escaped, except the following: script, img, embed, | ||||||
| * iframe, video, source, object, audio | ||||||
| * | ||||||
| * @param string|int|float|\Stringable|array<string|int|float|\Stringable> $data | ||||||
| * @param array|null $allowedTags | ||||||
| * @return ($data is array ? string[] : string) | ||||||
| */ | ||||||
| public function escapeHtml($data, $allowedTags = null) | ||||||
| { | ||||||
|
|
@@ -267,7 +267,7 @@ private function escapeAttributeValue($name, $value) | |||||
| /** | ||||||
| * Escape a string for the HTML attribute context | ||||||
| * | ||||||
| * @param string|int|float|\Stringable $string | ||||||
| * @param boolean $escapeSingleQuote | ||||||
| * @return string | ||||||
| * @since 101.0.0 | ||||||
|
|
@@ -313,7 +313,7 @@ public function encodeUrlParam($string) | |||||
| /** | ||||||
| * Escape string for the JavaScript context | ||||||
| * | ||||||
| * @param string|int|float|\Stringable $string | ||||||
| * @return string | ||||||
| * @since 101.0.0 | ||||||
| */ | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,7 +1,7 @@ | ||||||
| <?php | ||||||
| /** | ||||||
| * Copyright 2014 Adobe | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * All Rights Reserved. | ||||||
| */ | ||||||
| declare(strict_types=1); | ||||||
|
|
||||||
|
|
@@ -892,9 +892,9 @@ public static function extractModuleName($className) | |||||
| /** | ||||||
| * Escape HTML entities | ||||||
| * | ||||||
| * @param string|int|float|\Stringable|array<string|int|float|\Stringable> $data | ||||||
| * @param array|null $allowedTags | ||||||
| * @return ($data is array ? string[] : string) | ||||||
| * @deprecated 103.0.0 Use $escaper directly in templates and in blocks. | ||||||
| * @see Escaper Usage | ||||||
| */ | ||||||
|
|
@@ -906,7 +906,7 @@ public function escapeHtml($data, $allowedTags = null) | |||||
| /** | ||||||
| * Escape string for the JavaScript context | ||||||
| * | ||||||
| * @param string|int|float|\Stringable $string | ||||||
| * @return string | ||||||
| * @since 101.0.0 | ||||||
| * @deprecated 103.0.0 Use $escaper directly in templates and in blocks. | ||||||
|
|
@@ -920,7 +920,7 @@ public function escapeJs($string) | |||||
| /** | ||||||
| * Escape a string for the HTML attribute context | ||||||
| * | ||||||
| * @param string|int|float|\Stringable $string | ||||||
| * @param boolean $escapeSingleQuote | ||||||
| * @return string | ||||||
| * @since 101.0.0 | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@engcom-Hotel: it should be 2013, not 2011. Looking at the git history, github is guessing it got renamed from
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.phptoapp/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExportHeader.phpin 2011 and then toapp/code/Magento/Adminhtml/Block/Sales/Order/View/History.phpin 2013But going from a PriceScopeBackendConfig to a TaxRateImportExportHeader to a SalesOrderViewHistoryBlock makes no sense to me. So in my opinion it should be 2013.
Can you double check this again?
I didn't check the other files, only this one...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you really believe it should be 2011, go ahead and change it yourself because I'm unavailable for the next 2 weeks, since I'll go on holiday. Thanks!