Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"description": "Applies a patch from a local or remote file to any package that is part of a given composer project. Patches can be defined both on project and on package level. Optional support for patch versioning, sequencing, custom patch applier configuration and patch command for testing/troubleshooting added patches.",
"require": {
"php": ">=7.0.0",
"php": ">=7.1.0",
"ext-json": "*",
"composer-plugin-api": "^1.0 || ^2.0",
"composer-runtime-api": "^1.0 || ^2.0",
Expand Down
2 changes: 1 addition & 1 deletion phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<rule ref="PHPCompatibility" />

<config name="testVersion" value="5.3-"/>
<config name="testVersion" value="7.1-"/>

<rule ref="PSR1"/>
<rule ref="PSR2"/>
Expand Down
6 changes: 6 additions & 0 deletions src/Config/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
*/
namespace Vaimo\ComposerPatches\Config;

if (!class_exists('loophp\phposinfo\OsInfo') && class_exists('drupol\phposinfo\OsInfo')) {
class_alias('drupol\phposinfo\OsInfo', 'loophp\phposinfo\OsInfo');
class_alias('drupol\phposinfo\Enum\FamilyName', 'loophp\phposinfo\Enum\FamilyName');
class_alias('drupol\phposinfo\Enum\OsName', 'loophp\phposinfo\Enum\OsName');
}

use loophp\phposinfo\OsInfo;
use loophp\phposinfo\Enum\OsName;
use loophp\phposinfo\Enum\FamilyName;
Expand Down
4 changes: 2 additions & 2 deletions src/Utils/FileSystemUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public function collectGlobs($rootPath, $pattern)
$files = array();

foreach ($iterator as $info) {
if($info->isDir()) {
$files = [...$files, ...$this->collectPathsRecursively($info->getRealPath(), $pattern)];
if ($info->isDir()) {
$files = array_merge($files, $this->collectPathsRecursively($info->getRealPath(), $pattern));
continue;
}

Expand Down