Skip to content

Commit 7e721bf

Browse files
committed
Fix issue in Github action 9 - related to different symfony/yaml version
1 parent 9811689 commit 7e721bf

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tests/spec/PathTest.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,31 +225,32 @@ public function testPathParametersAreArrays()
225225
shell_exec(dirname(__DIR__, 2) . "{$dirSep}bin{$dirSep}php-openapi inline " . $file . ' ' . dirname(__DIR__) . $dirSep.'/compiled.yml');
226226

227227
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-7.yml";
228+
$version = static::symfonyYamlVersion();
229+
$majorVersion = explode('.', $version)[0];
228230

229-
if (static::majorSymfonyYamlVersion() == 6) {
231+
if ($majorVersion == 6) {
230232
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-6.yml";
231-
if (version_compare(PHP_VERSION, '8.1', '>=')) {
233+
if (version_compare(PHP_VERSION, '8.1', '>=') && version_compare($version, '6.0.0', '!=')) {
232234
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-7.yml";
233235
}
234-
} elseif (static::majorSymfonyYamlVersion() == 5) {
236+
} elseif ($majorVersion == 5) {
235237
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-5.yml";
236238
}
237239

238240
$this->assertFileEquals(dirname(__DIR__) . $expected, dirname(__DIR__) . $dirSep.'compiled.yml');
239241
unlink(dirname(__DIR__) . '/compiled.yml');
240242
}
241243

242-
public static function majorSymfonyYamlVersion()
244+
public static function symfonyYamlVersion()
243245
{
244246
$package = 'symfony/yaml';
245247
$installed = json_decode(file_get_contents(__DIR__ . '/../../composer.lock'), true);
246248

247249
foreach ($installed['packages'] as $pkg) {
248250
if ($pkg['name'] === $package) {
249-
$version = explode('.', $pkg['version'])[0];
250-
return str_replace('v', '', $version);
251+
return str_replace('v', '', $pkg['version']);
251252
}
252253
}
253-
return 7;
254+
return '7.0.0';
254255
}
255256
}

0 commit comments

Comments
 (0)