8000 Further refactorings to PHPUnit namespaces by peterrehm · Pull Request #21688 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Further refactorings to PHPUnit namespaces #21688

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

Closed
wants to merge 6 commits into from
Closed

Further refactorings to PHPUnit namespaces #21688

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
602638d
Refactored PHPUnit Skipped Tests
peterrehm Feb 20, 2017
87ed7ce
Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
peterrehm Feb 20, 2017
54c28b4
Removed leading backslashes
peterrehm Feb 20, 2017
d784a2f
Updated according comments
peterrehm Feb 20, 2017
f0263d3
Provided compatibility for the deprecated setExpectedException
peterrehm Feb 21, 2017
58cb402
Fixed exception messages
peterrehm Feb 21, 2017
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
Prev Previous commit
Fixed exception messages
  • Loading branch information
@peterrehm
peterrehm committed Feb 21, 2017
commit 58cb402aa5e8a87dc65c6ca1375a2bff6d13c1be
4 changes: 2 additions & 2 deletions src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public function testNormalizeThrowsExceptionWithErrorMessage()

if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
$this->expectExceptionMessage('Invalid type for path "test". Expected scalar, but got array.\nHint: "the test value"');
$this->expectExceptionMessage("Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
} else {
$this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.\nHint: "the test value"');
$this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
}

$node->normalize(array());
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public function testInvalidModes($mode)
{
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage('sprintf(\'Option mode "%s" is not valid.\', $mode)');
$this->expectExceptionMessage(sprintf('Option mode "%s" is not valid.', $mode));
} else {
$this->setExpectedException('InvalidArgumentException', 'sprintf(\'Option mode "%s" is not valid.\', $mode)');
$this->setExpectedException('InvalidArgumentException', sprintf('Option mode "%s" is not valid.', $mode));
}

new InputOption('foo', 'f', $mode);
Expand Down
0