From e3c1a77994cbf469468bfeff60cb6f444de9b86f Mon Sep 17 00:00:00 2001 From: matks Date: Mon, 6 Jan 2020 16:25:32 +0100 Subject: [PATCH 1/3] Release 4.10.1 - removal of vendor/phpunit in upgrade steps --- .gitignore | 3 +- autoupgrade.php | 2 +- config.xml | 2 +- upgrade/install-4-10-1.php | 66 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 upgrade/install-4-10-1.php diff --git a/.gitignore b/.gitignore index 8c25889e0..d3aaa30b4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ nbproject /tests/E2E/ /vendor/ -.php_cs.cache \ No newline at end of file +.php_cs.cache +.idea diff --git a/autoupgrade.php b/autoupgrade.php index 9c43c96ff..a9f1a2aed 100644 --- a/autoupgrade.php +++ b/autoupgrade.php @@ -31,7 +31,7 @@ public function __construct() $this->name = 'autoupgrade'; $this->tab = 'administration'; $this->author = 'PrestaShop'; - $this->version = '4.10.0'; + $this->version = '4.10.1'; $this->need_instance = 1; $this->bootstrap = true; diff --git a/config.xml b/config.xml index cdcbb9d0e..eb7c21dae 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ autoupgrade - + diff --git a/upgrade/install-4-10-1.php b/upgrade/install-4-10-1.php new file mode 100644 index 000000000..7dd78ee2d --- /dev/null +++ b/upgrade/install-4-10-1.php @@ -0,0 +1,66 @@ + +* @copyright 2007-2020 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +/** + * 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_4_10_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; +} From 5cc3539a0b280d6b46cff0faaa71ebee831c1578 Mon Sep 17 00:00:00 2001 From: matks Date: Mon, 6 Jan 2020 22:05:14 +0100 Subject: [PATCH 2/3] Fix 4.10.1 upgrade file name --- ...{install-4-10-1.php => install-4.10.1.php} | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) rename upgrade/{install-4-10-1.php => install-4.10.1.php} (56%) diff --git a/upgrade/install-4-10-1.php b/upgrade/install-4.10.1.php similarity index 56% rename from upgrade/install-4-10-1.php rename to upgrade/install-4.10.1.php index 7dd78ee2d..7ff537557 100644 --- a/upgrade/install-4-10-1.php +++ b/upgrade/install-4.10.1.php @@ -1,28 +1,31 @@ -* @copyright 2007-2020 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 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 + * @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. From 6e990577cd1aa4f7289fb71417703e1ed98c0dac Mon Sep 17 00:00:00 2001 From: matks Date: Tue, 7 Jan 2020 09:41:43 +0100 Subject: [PATCH 3/3] Apply php-cs-fixer --- upgrade/install-4.10.1.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/upgrade/install-4.10.1.php b/upgrade/install-4.10.1.php index 7ff537557..7fb22f015 100644 --- a/upgrade/install-4.10.1.php +++ b/upgrade/install-4.10.1.php @@ -48,6 +48,7 @@ function removeFromFsDuringUpgrade(array $files) return 'Deletion of file ' . $file . 'failed'; } } + return true; } /** @@ -62,8 +63,10 @@ function upgrade_module_4_10_1($module) $result = removeFromFsDuringUpgrade(array($path)); if ($result !== true) { PrestaShopLogger::addLog('Could not delete PHPUnit from module. ' . $result, 3); + return false; } } + return true; }