Skip to content

Commit 8549610

Browse files
authored
Merge pull request #13 from magento-gl/GL_Arrows_Nov22_2022
Arrows Team - Bugfix delivery
2 parents 0c1987b + 255b3f6 commit 8549610

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
],
3838
"require": {
3939
"composer-plugin-api": "^1.1 || ^2.0",
40-
"composer/composer": "^1.9 || ^2.0"
40+
"composer/composer": "^1.9 || ^2.0",
41+
"laminas/laminas-stdlib": "^3.11.0"
4142
},
4243
"require-dev": {
4344
"phpunit/phpunit": "^9.5",

src/MagentoHackathon/Composer/Magento/Deploystrategy/DeploystrategyAbstract.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
namespace MagentoHackathon\Composer\Magento\Deploystrategy;
77

8+
use Laminas\Stdlib\Glob;
9+
810
/**
911
* Abstract deploy strategy
1012
*/
@@ -282,7 +284,7 @@ public function create($source, $dest)
282284
// If source doesn't exist, check if it's a glob expression, otherwise we have nothing we can do
283285
if (!file_exists($sourcePath)) {
284286
// Handle globing
285-
$matches = glob($sourcePath);
287+
$matches = Glob::glob($sourcePath);
286288
if ($matches) {
287289
foreach ($matches as $match) {
288290
$newDest = substr($destPath . '/' . basename($match), strlen($this->getDestDir()));
@@ -342,7 +344,7 @@ public function remove($source, $dest)
342344
protected function removeContentOfCategory($sourcePath, $destPath)
343345
{
344346
$sourcePath = preg_replace('#/\*$#', '/{,.}*', $sourcePath);
345-
$matches = glob($sourcePath, GLOB_BRACE);
347+
$matches = Glob::glob($sourcePath, Glob::GLOB_BRACE);
346348
if ($matches) {
347349
foreach ($matches as $match) {
348350
if (preg_match("#/\.{1,2}$#", $match)) {

0 commit comments

Comments
 (0)