Skip to content

Commit f8da30b

Browse files
Fix resolving current version of MolliePlugin dynamically (#332)
2 parents 30d7adb + f8d914e commit f8da30b

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

src/Client/MollieApiClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MollieApiClient extends BaseMollieApiClient
2525

2626
public function getVersion(): string
2727
{
28-
return SyliusMolliePlugin::VERSION;
28+
return SyliusMolliePlugin::getVersion();
2929
}
3030

3131
public function getUserAgentToken(): string

src/SyliusMolliePlugin.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Sylius\MolliePlugin;
1515

16+
use Composer\InstalledVersions;
1617
use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
1718
use Sylius\MolliePlugin\DependencyInjection\SyliusMessageBusPolyfillPass;
1819
use Sylius\Telemetry\TelemetryCompilerPass;
@@ -21,10 +22,18 @@
2122

2223
final class SyliusMolliePlugin extends Bundle
2324
{
24-
public const VERSION = '5.0.0';
25-
2625
public const USER_AGENT_TOKEN = 'p5ACCDx8Tbn8vjpr';
2726

27+
public static function getVersion(): string
28+
{
29+
$currentVersion = InstalledVersions::getPrettyVersion('sylius/mollie-plugin') ?? 'unknown';
30+
if (str_starts_with($currentVersion, 'v')) {
31+
return substr($currentVersion, 1);
32+
}
33+
34+
return $currentVersion;
35+
}
36+
2837
use SyliusPluginTrait;
2938

3039
public function build(ContainerBuilder $container): void

src/Twig/Extension/MolliePluginLatestVersion.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public function getFunctions(): array
3636

3737
public function versionRenderWidget(Environment $environment): string
3838
{
39-
$latestVersion = str_replace('v', '', SyliusMolliePlugin::VERSION);
39+
$latestVersion = str_replace('v', '', SyliusMolliePlugin::getVersion());
4040

41-
if (SyliusMolliePlugin::VERSION === $latestVersion) {
41+
if (SyliusMolliePlugin::getVersion() === $latestVersion) {
4242
return '';
4343
}
4444

4545
return $environment->render('@SyliusMolliePlugin/admin/payment_method/version_notification.html.twig', [
4646
'latestVersion' => $latestVersion,
47-
'currentVersion' => SyliusMolliePlugin::VERSION,
47+
'currentVersion' => SyliusMolliePlugin::getVersion(),
4848
]);
4949
}
5050
}

0 commit comments

Comments
 (0)