From 14ee5c7109534ac2773acc68bd6a66983bdfce59 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 3 Jun 2022 13:59:15 +0200 Subject: [PATCH 1/2] use Laminas\Stdlib for glob compatibility --- composer.json | 5 +++-- .../Magento/Deploystrategy/DeploystrategyAbstract.php | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 2e0a23d..68b0136 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,8 @@ ], "require": { "composer-plugin-api": "^1.1 || ^2.0", - "composer/composer": "^1.9 || ^2.0" + "composer/composer": "^1.9 || ^2.0", + "laminas/laminas-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -70,4 +71,4 @@ ], "class": "MagentoHackathon\\Composer\\Magento\\Plugin" } -} \ No newline at end of file +} diff --git a/src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php b/src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php index 796e935..97dfc3d 100644 --- a/src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php +++ b/src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php @@ -5,6 +5,8 @@ namespace MagentoHackathon\Composer\Magento\Deploystrategy; +use Laminas\Stdlib\Glob; + /** * Abstract deploy strategy */ @@ -342,7 +344,7 @@ public function remove($source, $dest) protected function removeContentOfCategory($sourcePath, $destPath) { $sourcePath = preg_replace('#/\*$#', '/{,.}*', $sourcePath); - $matches = glob($sourcePath, GLOB_BRACE); + $matches = Glob::glob($sourcePath, Glob::GLOB_BRACE); if ($matches) { foreach ($matches as $match) { if (preg_match("#/\.{1,2}$#", $match)) { From bdc84e6e1eb1f06d04ded0fba2edee839c608e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kraus?= Date: Wed, 24 Aug 2022 19:55:05 +0200 Subject: [PATCH 2/2] updated laminas/laminas-stdlib dependency to 3.11.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 68b0136..9303037 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "require": { "composer-plugin-api": "^1.1 || ^2.0", "composer/composer": "^1.9 || ^2.0", - "laminas/laminas-stdlib": "^3.2.1" + "laminas/laminas-stdlib": "^3.11.0" }, "require-dev": { "phpunit/phpunit": "^9.5",