From 8a4bd4ad653f53e3f910a45d5dda0855622a0705 Mon Sep 17 00:00:00 2001
From: Igor Melnikov <imelnikov@ebay.com>
Date: Tue, 12 Jul 2016 17:12:57 -0500
Subject: [PATCH] MAGETWO-54652: Replace usages of deprecated escaper functions
Fixing unit tests
---
lib/internal/Magento/Framework/Escaper.php | 2 +-
lib/internal/Magento/Framework/Test/Unit/UrlTest.php | 2 +-
lib/internal/Magento/Framework/View/Element/AbstractBlock.php | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index f1425497196..312e61bb6e4 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -22,7 +22,7 @@ class Escaper
* @param array $allowedTags
* @return string|array
*/
- public function escapeHtml($data, $allowedTags = [])
+ public function escapeHtml($data, $allowedTags = null)
{
if (is_array($data)) {
$result = [];
diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index abcb31a5b4f..0ba64d05b96 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -152,7 +152,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$zendEscaper = new \Magento\Framework\ZendEscaper();
$escaper = new \Magento\Framework\Escaper();
- $objectManager->setBackwardCompatibleProperty($escaper, 'zendEscaper', $zendEscaper);
+ $objectManager->setBackwardCompatibleProperty($escaper, 'escaper', $zendEscaper);
$objectManager->setBackwardCompatibleProperty($model, 'escaper', $escaper);
return $model;
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 8e4b4bd32be..3e21ff1b762 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -871,14 +871,14 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
* @param array|null $allowedTags
* @return string
*/
- public function escapeHtml($data, $allowedTags = [])
+ public function escapeHtml($data, $allowedTags = null)
{
return $this->_escaper->escapeHtml($data, $allowedTags);
}
/**
* Escape string for the JavaScript context
- *
+ *
* @param string $string
* @return string
*/
--
GitLab