Make changes to pass new Marketplace test expectations (#906)

Author: damcou

Helper/ConfigHelper.php

@@ -8,6 +8,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\DataObject;
 use Magento\Framework\Locale\Currency;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -119,6 +120,7 @@ class ConfigHelper
     private $productMetadata;
     private $eventManager;
     private $currencyManager;
+    private $serializer;
     private $maxRecordSize;
 
     public function __construct(
@@ -131,7 +133,8 @@ public function __construct(
         Magento\Framework\Module\ResourceInterface $moduleResource,
         Magento\Framework\App\ProductMetadataInterface $productMetadata,
         Magento\Framework\Event\ManagerInterface $eventManager,
-        Magento\Directory\Model\Currency $currencyManager
+        Magento\Directory\Model\Currency $currencyManager,
+        SerializerInterface $serializer
     ) {
         $this->objectManager = $objectManager;
         $this->configInterface = $configInterface;
@@ -143,6 +146,7 @@ public function __construct(
         $this->productMetadata = $productMetadata;
         $this->eventManager = $eventManager;
         $this->currencyManager = $currencyManager;
+        $this->serializer = $serializer;
     }
 
     public function indexOutOfStockOptions($storeId = null)
@@ -1063,13 +1067,17 @@ private function addIndexableAttributes(
 
     private function unserialize($value)
     {
+        if (false === $value || null === $value || '' === $value) {
+            return false;
+        }
+
         $unserialized = json_decode($value, true);
 
         if (json_last_error() === JSON_ERROR_NONE) {
             return $unserialized;
         }
 
-        return unserialize($value);
+        return $this->serializer->unserialize($value);
     }
 
     public function getDefaultMaxRecordSize()

Helper/Entity/PageHelper.php

@@ -162,22 +162,24 @@ private function strip($s, $completeRemoveTags = [])
     {
         if ($completeRemoveTags && $completeRemoveTags !== [] && $s) {
             $dom = new \DOMDocument();
-            if (@$dom->loadHTML(mb_convert_encoding($s, 'HTML-ENTITIES', 'UTF-8'))) {
-                $toRemove = [];
-                foreach ($completeRemoveTags as $tag) {
-                    $removeTags = $dom->getElementsByTagName($tag);
-
-                    foreach ($removeTags as $item) {
-                        $toRemove[] = $item;
-                    }
-                }
+            libxml_use_internal_errors(true);
+            $dom->loadHTML(mb_convert_encoding($s, 'HTML-ENTITIES', 'UTF-8'));
+            libxml_use_internal_errors(false);
+
+            $toRemove = [];
+            foreach ($completeRemoveTags as $tag) {
+                $removeTags = $dom->getElementsByTagName($tag);
 
-                foreach ($toRemove as $item) {
-                    $item->parentNode->removeChild($item);
+                foreach ($removeTags as $item) {
+                    $toRemove[] = $item;
                 }
+            }
 
-                $s = $dom->saveHTML();
+            foreach ($toRemove as $item) {
+                $item->parentNode->removeChild($item);
             }
+
+            $s = $dom->saveHTML();
         }
 
         $s = html_entity_decode($s, null, 'UTF-8');

Helper/Entity/SuggestionHelper.php

@@ -7,6 +7,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Search\Model\Query;
 
 class SuggestionHelper
@@ -19,18 +20,22 @@ class SuggestionHelper
 
     private $configHelper;
 
+    private $serializer;
+
     private $popularQueriesCacheId = 'algoliasearch_popular_queries_cache_tag';
 
     public function __construct(
         ManagerInterface $eventManager,
         ObjectManagerInterface $objectManager,
         ConfigCache $cache,
-        ConfigHelper $configHelper
+        ConfigHelper $configHelper,
+        SerializerInterface $serializer
     ) {
         $this->eventManager = $eventManager;
         $this->objectManager = $objectManager;
         $this->cache = $cache;
         $this->configHelper = $configHelper;
+        $this->serializer = $serializer;
     }
 
     public function getIndexNameSuffix()
@@ -81,7 +86,7 @@ public function getPopularQueries($storeId)
     {
         $queries = $this->cache->load($this->popularQueriesCacheId);
         if ($queries !== false) {
-            return unserialize($queries);
+            return $this->serializer->unserialize($queries);
         }
 
         $collection = $this->objectManager->create('\Magento\Search\Model\ResourceModel\Query\Collection');
@@ -111,7 +116,7 @@ public function getPopularQueries($storeId)
 
         $queries = array_slice($suggestions, 0, 9);
 
-        $this->cache->save(serialize($queries), $this->popularQueriesCacheId, [], 24*3600);
+        $this->cache->save($this->serializer->serialize($queries), $this->popularQueriesCacheId, [], 24*3600);
 
         return $queries;
     }

Test/Integration/CategoriesIndexingTest.php

@@ -15,7 +15,10 @@ public function testCategories()
 
     public function testDefaultIndexableAttributes()
     {
-        $this->setConfig('algoliasearch_categories/categories/category_additional_attributes', serialize([]));
+        $this->setConfig(
+            'algoliasearch_categories/categories/category_additional_attributes',
+            $this->getSerializer()->serialize([])
+        );
 
         /** @var Category $categoriesIndexer */
         $categoriesIndexer = $this->getObjectManager()->create('\Algolia\AlgoliaSearch\Model\Indexer\Category');

Test/Integration/ConfigTest.php

@@ -65,7 +65,7 @@ public function testAutomaticalSetOfCategoriesFacet()
             }
         }
 
-        $this->setConfig('algoliasearch_instant/instant/facets', serialize($facets));
+        $this->setConfig('algoliasearch_instant/instant/facets', $this->getSerializer()->serialize($facets));
 
         // Set don't replace category pages with Algolia - categories attribute shouldn't be included in facets
         $this->setConfig('algoliasearch_instant/instant/replace_categories', '0');
@@ -172,7 +172,7 @@ private function replicaCreationTest($withCustomerGroups = false)
         ];
 
         $this->setConfig('algoliasearch_instant/instant/is_instant_enabled', '1'); // Needed to set replicas to Algolia
-        $this->setConfig('algoliasearch_instant/instant/sorts', serialize($sortingIndicesData));
+        $this->setConfig('algoliasearch_instant/instant/sorts', $this->getSerializer()->serialize($sortingIndicesData));
         $this->setConfig('algoliasearch_advanced/advanced/customer_groups_enable', $enableCustomGroups);
 
         $sortingIndicesWithRankingWhichShouldBeCreated = [

Test/Integration/PagesIndexingTest.php

@@ -9,7 +9,10 @@ class PagesIndexingTest extends IndexingTestCase
 {
     public function testOnlyOnStockProducts()
     {
-        $this->setConfig('algoliasearch_autocomplete/autocomplete/excluded_pages', serialize([]));
+        $this->setConfig(
+            'algoliasearch_autocomplete/autocomplete/excluded_pages',
+            $this->getSerializer()->serialize([])
+        );
 
         /** @var Page $indexer */
         $indexer = $this->getObjectManager()->create('\Algolia\AlgoliaSearch\Model\Indexer\Page');
@@ -23,7 +26,10 @@ public function testExcludedPages()
             ['attribute' => 'no-route'],
             ['attribute' => 'home'],
         ];
-        $this->setConfig('algoliasearch_autocomplete/autocomplete/excluded_pages', serialize($excludedPages));
+        $this->setConfig(
+            'algoliasearch_autocomplete/autocomplete/excluded_pages',
+            $this->getSerializer()->serialize($excludedPages)
+        );
 
         /** @var Page $indexer */
         $indexer = $this->getObjectManager()->create('\Algolia\AlgoliaSearch\Model\Indexer\Page');

Test/Integration/ProductsIndexingTest.php

@@ -33,7 +33,7 @@ public function testIncludingOutOfStock()
 
     public function testDefaultIndexableAttributes()
     {
-        $empty = serialize([]);
+        $empty = $this->getSerializer()->serialize([]);
 
         $this->setConfig('algoliasearch_products/products/product_additional_attributes', $empty);
         $this->setConfig('algoliasearch_instant/instant/facets', $empty);
@@ -89,7 +89,10 @@ public function testNoProtocolImageUrls()
             'order' => 'unordered',
         ];
 
-        $this->setConfig('algoliasearch_products/products/product_additional_attributes', serialize($additionAttributes));
+        $this->setConfig(
+            'algoliasearch_products/products/product_additional_attributes',
+            $this->getSerializer()->serialize($additionAttributes)
+        );
 
         /** @var Product $indexer */
         $indexer = $this->getObjectManager()->create('\Algolia\AlgoliaSearch\Model\Indexer\Product');

Test/Integration/TestCase.php

@@ -149,4 +149,9 @@ private function getMagentoVersion()
 
         return $productMetadata->getVersion();
     }
+
+    protected function getSerializer()
+    {
+        return $this->getObjectManager()->get('Magento\Framework\Serialize\SerializerInterface');
+    }
 }