Merge master into dev

.gitignore

@@ -3,3 +3,4 @@
 tests/php/coverage
 config_*.xml
 .php_cs.cache
+.idea

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_facetedsearch</name>
     <displayName><![CDATA[Faceted search]]></displayName>
-    <version><![CDATA[3.4.0]]></version>
+    <version><![CDATA[3.4.1]]></version>
     <description><![CDATA[Displays a block allowing multiple filters.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

ps_facetedsearch.php

@@ -97,7 +97,7 @@ public function __construct()
     {
         $this->name = 'ps_facetedsearch';
         $this->tab = 'front_office_features';
-        $this->version = '3.4.0';
+        $this->version = '3.4.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->bootstrap = true;

upgrade/upgrade-3.4.1.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * 2007-2020 PrestaShop.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2020 PrestaShop SA
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+/**
+ * Removes files or directories.
+ *
+ * @param array $files An array of files to remove
+ *
+ * @return true|string True if everything goes fine, error details otherwise
+ */
+function removeFromFsDuringUpgrade(array $files)
+{
+    $files = array_reverse($files);
+    foreach ($files as $file) {
+        if (is_dir($file)) {
+            $iterator = new FilesystemIterator($file, FilesystemIterator::CURRENT_AS_PATHNAME | FilesystemIterator::SKIP_DOTS);
+            removeFromFsDuringUpgrade(iterator_to_array($iterator));
+            if (!rmdir($file) && file_exists($file)) {
+                return 'Deletion of directory ' . $file . 'failed';
+            }
+        } elseif (!unlink($file) && file_exists($file)) {
+            return 'Deletion of file ' . $file . 'failed';
+        }
+    }
+
+    return true;
+}
+/**
+ * This upgrade file removes the folder vendor/phpunit, when added from a previous release installed on the shop.
+ *
+ * @return true|array
+ */
+function upgrade_module_3_4_1($module)
+{
+    $path = __DIR__ . '/../vendor/phpunit';
+    if (file_exists($path)) {
+        $result = removeFromFsDuringUpgrade(array($path));
+        if ($result !== true) {
+            PrestaShopLogger::addLog('Could not delete PHPUnit from module. ' . $result, 3);
+
+            return false;
+        }
+    }
+
+    return true;
+}