Skip to content

Commit b0de374

Browse files
committed
Remove unnecessary packager overrides
Requires wintercms/packager#6
1 parent 1dd8e84 commit b0de374

File tree

3 files changed

+11
-177
lines changed

3 files changed

+11
-177
lines changed

src/Packager/Commands/InfoCommand.php

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/Packager/Commands/RemoveCommand.php

Lines changed: 0 additions & 75 deletions
This file was deleted.

src/Packager/Composer.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44

55
use Illuminate\Support\Facades\Cache;
66
use Winter\Packager\Composer as PackagerComposer;
7+
use Winter\Packager\Enums\ShowMode;
78
use Winter\Storm\Exception\ApplicationException;
89
use Winter\Storm\Foundation\Extension\WinterExtension;
910
use Winter\Storm\Network\Http;
10-
use Winter\Storm\Packager\Commands\InfoCommand;
11-
use Winter\Storm\Packager\Commands\RemoveCommand;
1211
use Winter\Storm\Packager\Commands\RequireCommand;
1312
use Winter\Storm\Packager\Commands\SearchCommand;
14-
use Winter\Storm\Packager\Commands\ShowCommand;
1513
use Winter\Storm\Packager\Commands\UpdateCommand;
1614
use Winter\Storm\Support\Facades\File;
1715

@@ -20,8 +18,7 @@
2018
* @method static i(): array
2119
* @method static install(): array
2220
* @method static search(string $query, ?string $type = null, bool $onlyNames = false, bool $onlyVendors = false): \Winter\Packager\Commands\Search
23-
* @method static info(?string $package = null, bool $all = false, bool $latest = false): array
24-
* @method static show(?string $mode = 'installed', string $package = null, bool $noDev = false, bool $path = false): object
21+
* @method static show(?string $mode = 'installed', string $package = null, bool $noDev = false, bool $latest = false): mixed
2522
* @method static update(bool $includeDev = true, bool $lockFileOnly = false, bool $ignorePlatformReqs = false, string $installPreference = 'none', bool $ignoreScripts = false, bool $dryRun = false, ?string $package = null): \Winter\Packager\Commands\Update
2623
* @method static remove(?string $package = null, bool $dryRun = false): array
2724
* @method static require(?string $package = null, bool $dryRun = false, bool $dev = false, bool $returnRequired = false): string
@@ -40,12 +37,10 @@ public static function make(bool $fresh = false): PackagerComposer
4037
}
4138

4239
static::$composer = new PackagerComposer();
43-
static::$composer->setWorkDir(base_path());
40+
static::$composer->setWorkDir(realpath(base_path()));
4441

45-
static::$composer->setCommand('remove', RemoveCommand::class);
4642
static::$composer->setCommand('require', new RequireCommand(static::$composer));
4743
static::$composer->setCommand('search', SearchCommand::class);
48-
static::$composer->setCommand('info', new InfoCommand(static::$composer));
4944
static::$composer->setCommand('update', UpdateCommand::class);
5045

5146
return static::$composer;
@@ -63,10 +58,10 @@ public static function __callStatic(string $name, array $args = []): mixed
6358
public static function getWinterPackages(): array
6459
{
6560
return static::remember(__METHOD__, function () {
66-
$installed = static::info();
61+
$installed = static::show(returnArray: true);
6762
$packages = [];
6863
foreach ($installed as $package) {
69-
$details = static::info($package['name']);
64+
$details = static::show(package: $package['name'], returnArray: true);
7065

7166
$type = match ($details['type']) {
7267
'winter-plugin', 'october-plugin' => 'plugins',
@@ -102,7 +97,12 @@ public static function getAvailableUpdates(): array
10297
'to' => $details[1],
10398
];
10499

105-
$info = static::info($name, all: true, latest: true);
100+
$info = static::show(
101+
package: $name,
102+
mode: ShowMode::AVAILABLE,
103+
latest: true,
104+
returnArray: true
105+
);
106106

107107
$winterPackages[$name] = [
108108
'from' => $details[0],

0 commit comments

Comments
 (0)