Skip to content

Commit f4628b0

Browse files
committed
Fix line ending issue in Windows - 4
1 parent 20016f2 commit f4628b0

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

tests/spec/PathTest.php

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,26 +222,29 @@ public function testPathParametersAreArrays()
222222
$this->assertInstanceOf(\cebe\openapi\spec\Parameter::class, $userIdPath->parameters[1]);
223223
$this->assertEquals('id', $userIdPath->parameters[2]->name);
224224
$dirSep = DIRECTORY_SEPARATOR;
225-
shell_exec('php '.dirname(__DIR__, 2) . "{$dirSep}bin{$dirSep}php-openapi inline " . $file . ' ' . dirname(__DIR__) . $dirSep.'/compiled.yml');
225+
$output = dirname(__DIR__) . $dirSep . 'compiled.yml';
226+
shell_exec('php ' . dirname(__DIR__, 2) . "{$dirSep}bin{$dirSep}php-openapi inline " . $file . ' ' . $output);
226227

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

231232
if ($majorVersion == 6) {
232-
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-6.yml";
233+
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155{$dirSep}compiled-symfony-6.yml";
233234
if (version_compare(PHP_VERSION, '8.1', '>=') && version_compare($version, '6.0.0', '!=')) {
234-
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-7.yml";
235+
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155{$dirSep}compiled-symfony-7.yml";
235236
}
236237
} elseif ($majorVersion == 5) {
237-
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-6.yml";
238+
$expected = "{$dirSep}data{$dirSep}issue{$dirSep}155{$dirSep}compiled-symfony-6.yml";
239+
}
240+
if (stripos(PHP_OS, 'WIN') === 0) {
241+
// $expected = "{$dirSep}data{$dirSep}issue{$dirSep}155{$dirSep}compiled-symfony-6-windows-lf.yml";
242+
;
243+
file_put_contents($output, preg_replace('~\R~', "\n", file_get_contents($output)));
238244
}
239-
// if (stripos(PHP_OS, 'WIN') === 0) {
240-
//// $expected = "{$dirSep}data{$dirSep}issue{$dirSep}155/compiled-symfony-6-windows-lf.yml";
241-
// }
242245

243-
$this->assertFileEquals(dirname(__DIR__) . $dirSep.'compiled.yml', dirname(__DIR__) . $expected);
244-
unlink(dirname(__DIR__) . '/compiled.yml');
246+
$this->assertFileEquals($output, dirname(__DIR__) . $expected);
247+
unlink($output);
245248
}
246249

247250
public static function symfonyYamlVersion()

0 commit comments

Comments
 (0)