Skip to content

fix(em): skip incompatible extension updates #4177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SychO9 merged 2 commits into from
Feb 8, 2025
Merged

fix(em): skip incompatible extension updates #4177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec01335
fix(em): skip incompatible extension updates
SychO9 Feb 7, 2025
a7a3e76
chore: phpstan
SychO9 Feb 8, 2025
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
57 changes: 56 additions & 1 deletion extensions/package-manager/src/Command/CheckForUpdatesHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,29 @@

namespace Flarum\ExtensionManager\Command;

use Composer\Semver\Semver;
use Flarum\Extension\Extension;
use Flarum\Extension\ExtensionManager;
use Flarum\ExtensionManager\Composer\ComposerAdapter;
use Flarum\ExtensionManager\Composer\ComposerJson;
use Flarum\ExtensionManager\Exception\ComposerCommandFailedException;
use Flarum\ExtensionManager\Settings\LastUpdateCheck;
use Flarum\ExtensionManager\Support\Util;
use Flarum\Foundation\Application;
use GuzzleHttp\Client;
use Illuminate\Support\Collection;
use Symfony\Component\Console\Input\ArrayInput;

class CheckForUpdatesHandler
{
protected array $meta = [];

public function __construct(
protected ComposerAdapter $composer,
protected LastUpdateCheck $lastUpdateCheck,
protected ExtensionManager $extensions,
protected ComposerJson $composerJson
protected ComposerJson $composerJson,
protected Client $http
) {
}

Expand Down Expand Up @@ -97,6 +103,10 @@ public function handle(CheckForUpdates $command): array

$mainPackageUpdate['required-as'] = $composerJson['require'][$mainPackageUpdate['name']] ?? null;

if (! $this->compatibleWithCurrentFlarumVersion($mainPackageUpdate)) {
continue;
}

$updates->push($mainPackageUpdate);
}

Expand Down Expand Up @@ -136,4 +146,49 @@ protected function runComposerCommand(bool $minorOnly, CheckForUpdates $command)

return $output->getContents();
}

private function compatibleWithCurrentFlarumVersion(array $mainPackageUpdate): bool
{
if (empty($mainPackageUpdate['latest-major']) || str_contains($mainPackageUpdate['latest-major'], 'dev-')) {
return true;
}

if (! empty($this->meta[$mainPackageUpdate['name']])) {
$json = $this->meta[$mainPackageUpdate['name']];
} else {
$response = $this->http->get("https://repo.packagist.org/p2/{$mainPackageUpdate['name']}.json");

$body = $response->getBody()->getContents();

if ($response->getStatusCode() > 299 || $response->getStatusCode() < 200) {
return true;
}

$json = json_decode($body, true);

$this->meta[$mainPackageUpdate['name']] = $json;
}

$packages = new Collection($json['packages'][$mainPackageUpdate['name']] ?? []);

if ($packages->isEmpty()) {
return true;
}

$package = $packages->firstWhere('version', $mainPackageUpdate['latest-major']);

if (! $package) {
return true;
}

$flarumVersion = Application::VERSION;

$require = $package['require']['flarum/core'] ?? null;

if (! $require || str_contains($require, 'dev-')) {
return true;
}

return Semver::satisfies($flarumVersion, $require);
}
}
3 changes: 3 additions & 0 deletions extensions/package-manager/src/Support/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public static function isMajorUpdate(string $currentVersion, string $latestVersi
if (str_starts_with($currentVersion, 'v')) {
$currentVersion = substr($currentVersion, 1);
}
if (str_starts_with($latestVersion, 'v')) {
$latestVersion = substr($latestVersion, 1);
}

$currentVersion = explode('.', $currentVersion);
$latestVersion = explode('.', $latestVersion);
Expand Down
Loading