From 47e61cecddf33f1b31ef5d0c80f1ea42117b9b28 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Thu, 25 Mar 2021 15:14:22 +0200 Subject: [PATCH] Upgrade scripts --- upgrades/6.1.4-6.1.5/scripts/AfterUpgrade.php | 8 +- .../6.1.4-6.1.5/scripts/BeforeUpgrade.php | 8 +- upgrades/6.1/scripts/AfterUpgrade.php | 48 +++++++++++ upgrades/6.1/scripts/BeforeUpgrade.php | 84 +++++++++++++++++++ 4 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 upgrades/6.1/scripts/BeforeUpgrade.php diff --git a/upgrades/6.1.4-6.1.5/scripts/AfterUpgrade.php b/upgrades/6.1.4-6.1.5/scripts/AfterUpgrade.php index 18c09b4e3f..46692b1289 100644 --- a/upgrades/6.1.4-6.1.5/scripts/AfterUpgrade.php +++ b/upgrades/6.1.4-6.1.5/scripts/AfterUpgrade.php @@ -49,7 +49,9 @@ class AfterUpgrade ]; foreach ($fileList as $file) { - if (!file_exists($file)) continue; + if (!file_exists($file)) { + continue; + } $result = unlink($file); @@ -72,7 +74,9 @@ class AfterUpgrade ]; foreach ($directoryList as $directory) { - if (!file_exists($directory)) continue; + if (!file_exists($directory)) { + continue; + } $this->container->get('fileManager')->removeInDir($directory, true); } diff --git a/upgrades/6.1.4-6.1.5/scripts/BeforeUpgrade.php b/upgrades/6.1.4-6.1.5/scripts/BeforeUpgrade.php index 98bba2da66..a481307e36 100644 --- a/upgrades/6.1.4-6.1.5/scripts/BeforeUpgrade.php +++ b/upgrades/6.1.4-6.1.5/scripts/BeforeUpgrade.php @@ -49,7 +49,9 @@ class BeforeUpgrade ]; foreach ($fileList as $file) { - if (!file_exists($file)) continue; + if (!file_exists($file)) { + continue; + } $result = unlink($file); @@ -72,7 +74,9 @@ class BeforeUpgrade ]; foreach ($directoryList as $directory) { - if (!file_exists($directory)) continue; + if (!file_exists($directory)) { + continue; + } $this->container->get('fileManager')->removeInDir($directory, true); } diff --git a/upgrades/6.1/scripts/AfterUpgrade.php b/upgrades/6.1/scripts/AfterUpgrade.php index 0cf969fe9d..1696d5cb8a 100644 --- a/upgrades/6.1/scripts/AfterUpgrade.php +++ b/upgrades/6.1/scripts/AfterUpgrade.php @@ -29,6 +29,8 @@ class AfterUpgrade { + private $container; + public function run($container) { $this->container = $container; @@ -38,5 +40,51 @@ class AfterUpgrade $config->set('pdfEngine', 'Tcpdf'); $config->save(); + + $this->removeUnnecessaryFiles(); + $this->removeUnnecessaryDirectories(); + } + + public function removeUnnecessaryFiles() + { + $fileList = [ + 'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx', + 'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.pack', + 'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.pack', + 'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.idx', + ]; + + foreach ($fileList as $file) { + if (!file_exists($file)) { + continue; + } + + $result = unlink($file); + + if (!$result) { + $this->container->get('fileManager')->getPermissionUtils()->chmod($file, [ + 'file' => '0664', + 'dir' => '0775', + ]); + + unlink($file); + } + } + } + + public function removeUnnecessaryDirectories() + { + $directoryList = [ + 'vendor/spatie/async/.git', + 'vendor/zordius/lightncandy/.git', + ]; + + foreach ($directoryList as $directory) { + if (!file_exists($directory)) { + continue; + } + + $this->container->get('fileManager')->removeInDir($directory, true); + } } } diff --git a/upgrades/6.1/scripts/BeforeUpgrade.php b/upgrades/6.1/scripts/BeforeUpgrade.php new file mode 100644 index 0000000000..a481307e36 --- /dev/null +++ b/upgrades/6.1/scripts/BeforeUpgrade.php @@ -0,0 +1,84 @@ +container = $container; + + $this->removeUnnecessaryFiles(); + $this->removeUnnecessaryDirectories(); + } + + public function removeUnnecessaryFiles() + { + $fileList = [ + 'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx', + 'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.pack', + 'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.pack', + 'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.idx', + ]; + + foreach ($fileList as $file) { + if (!file_exists($file)) { + continue; + } + + $result = unlink($file); + + if (!$result) { + $this->container->get('fileManager')->getPermissionUtils()->chmod($file, [ + 'file' => '0664', + 'dir' => '0775', + ]); + + unlink($file); + } + } + } + + public function removeUnnecessaryDirectories() + { + $directoryList = [ + 'vendor/spatie/async/.git', + 'vendor/zordius/lightncandy/.git', + ]; + + foreach ($directoryList as $directory) { + if (!file_exists($directory)) { + continue; + } + + $this->container->get('fileManager')->removeInDir($directory, true); + } + } +}