merged branch Seldaek/console_tests (PR #3071)
Commits
-------
bea7a9c
[Console] Fix tests on windows
Discussion
----------
[Console] Fix tests on windows
Rebased version of #3059 after merging #3066. This code isn't in 2.0 but still needs fixing.
This commit is contained in:
commit
46b00b1001
@ -253,7 +253,7 @@ class Application
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return implode("\n", $messages);
|
return implode(PHP_EOL, $messages);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -649,7 +649,7 @@ class Application
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return implode("\n", $messages);
|
return implode(PHP_EOL, $messages);
|
||||||
}
|
}
|
||||||
|
|
||||||
$messages = array($this->getHelp(), '');
|
$messages = array($this->getHelp(), '');
|
||||||
@ -764,11 +764,13 @@ class Application
|
|||||||
|
|
||||||
$messages[] = str_repeat(' ', $len);
|
$messages[] = str_repeat(' ', $len);
|
||||||
|
|
||||||
$output->writeln("\n");
|
$output->writeln("");
|
||||||
|
$output->writeln("");
|
||||||
foreach ($messages as $message) {
|
foreach ($messages as $message) {
|
||||||
$output->writeln('<error>'.$message.'</error>');
|
$output->writeln('<error>'.$message.'</error>');
|
||||||
}
|
}
|
||||||
$output->writeln("\n");
|
$output->writeln("");
|
||||||
|
$output->writeln("");
|
||||||
|
|
||||||
if (OutputInterface::VERBOSITY_VERBOSE === $output->getVerbosity()) {
|
if (OutputInterface::VERBOSITY_VERBOSE === $output->getVerbosity()) {
|
||||||
$output->writeln('<comment>Exception trace:</comment>');
|
$output->writeln('<comment>Exception trace:</comment>');
|
||||||
@ -792,7 +794,8 @@ class Application
|
|||||||
$output->writeln(sprintf(' %s%s%s() at <info>%s:%s</info>', $class, $type, $function, $file, $line));
|
$output->writeln(sprintf(' %s%s%s() at <info>%s:%s</info>', $class, $type, $function, $file, $line));
|
||||||
}
|
}
|
||||||
|
|
||||||
$output->writeln("\n");
|
$output->writeln("");
|
||||||
|
$output->writeln("");
|
||||||
}
|
}
|
||||||
} while ($e = $e->getPrevious());
|
} while ($e = $e->getPrevious());
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testHelp()
|
public function testHelp()
|
||||||
{
|
{
|
||||||
$application = new Application();
|
$application = new Application();
|
||||||
$this->assertStringEqualsFile(self::$fixturesPath.'/application_gethelp.txt', $application->getHelp(), '->setHelp() returns a help message');
|
$this->assertStringEqualsFile(self::$fixturesPath.'/application_gethelp.txt', str_replace(PHP_EOL, "\n", $application->getHelp()), '->setHelp() returns a help message');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testAll()
|
public function testAll()
|
||||||
|
@ -33,6 +33,6 @@ help Displays help for a command
|
|||||||
list Lists commands
|
list Lists commands
|
||||||
|
|
||||||
EOF;
|
EOF;
|
||||||
$this->assertEquals($output, $commandTester->getDisplay(), 'boo');
|
$this->assertEquals(str_replace("\n", PHP_EOL, $output), $commandTester->getDisplay(), 'boo');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user