Merge pull request #13 from magento-gl/GL_Arrows_Nov22_2022

Arrows Team - Bugfix delivery
magento · Dec 1, 2022 · 8549610 · 8549610
2 parents 0c1987b + 255b3f6
commit 8549610
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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.11.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

diff --git 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
  */
@@ -282,7 +284,7 @@ public function create($source, $dest)
         // If source doesn't exist, check if it's a glob expression, otherwise we have nothing we can do
         if (!file_exists($sourcePath)) {
             // Handle globing
-            $matches = glob($sourcePath);
+            $matches = Glob::glob($sourcePath);
             if ($matches) {
                 foreach ($matches as $match) {
                     $newDest = substr($destPath . '/' . basename($match), strlen($this->getDestDir()));
@@ -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)) {