Skip to content

Commit 5a95cd2

Browse files
Merge branch '3.4' into 4.3
* 3.4: Re-enable previously failing PHP 7.4 test cases Revert "bug #33618 fix tests depending on other components' tests (xabbuh)" install from source to include components tests
2 parents 9fd00d7 + 72badbe commit 5a95cd2

File tree

5 files changed

+5
-43
lines changed

5 files changed

+5
-43
lines changed

Tests/CacheWarmer/ValidatorCacheWarmerTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020

2121
class ValidatorCacheWarmerTest extends TestCase
2222
{
23-
/**
24-
* @group issue-32995
25-
*
26-
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
27-
*/
2823
public function testWarmUp()
2924
{
3025
$validatorBuilder = new ValidatorBuilder();

Tests/Command/XliffLintCommandTest.php

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,13 @@ public function testGetHelp()
3535
{
3636
$command = new XliffLintCommand();
3737
$expected = <<<EOF
38-
The <info>%command.name%</info> command lints a XLIFF file and outputs to STDOUT
39-
the first encountered syntax error.
40-
41-
You can validates XLIFF contents passed from STDIN:
42-
43-
<info>cat filename | php %command.full_name%</info>
44-
45-
You can also validate the syntax of a file:
46-
47-
<info>php %command.full_name% filename</info>
48-
49-
Or of a whole directory:
50-
51-
<info>php %command.full_name% dirname</info>
52-
<info>php %command.full_name% dirname --format=json</info>
53-
5438
Or find all files in a bundle:
5539
5640
<info>php %command.full_name% @AcmeDemoBundle</info>
5741
5842
EOF;
5943

60-
$this->assertEquals($expected, $command->getHelp());
44+
$this->assertStringContainsString($expected, $command->getHelp());
6145
}
6246

6347
public function testLintFilesFromBundleDirectory()

Tests/Command/YamlLintCommandTest.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,29 +72,12 @@ public function testGetHelp()
7272
{
7373
$command = new YamlLintCommand();
7474
$expected = <<<EOF
75-
The <info>%command.name%</info> command lints a YAML file and outputs to STDOUT
76-
the first encountered syntax error.
77-
78-
You can validates YAML contents passed from STDIN:
79-
80-
<info>cat filename | php %command.full_name%</info>
81-
82-
You can also validate the syntax of a file:
83-
84-
<info>php %command.full_name% filename</info>
85-
86-
Or of a whole directory:
87-
88-
<info>php %command.full_name% dirname</info>
89-
<info>php %command.full_name% dirname --format=json</info>
90-
9175
Or find all files in a bundle:
9276
9377
<info>php %command.full_name% @AcmeDemoBundle</info>
94-
9578
EOF;
9679

97-
$this->assertEquals($expected, $command->getHelp());
80+
$this->assertStringContainsString($expected, $command->getHelp());
9881
}
9982

10083
public function testLintFilesFromBundleDirectory()

Tests/Controller/ControllerResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
2121
use Symfony\Component\DependencyInjection\ContainerInterface;
2222
use Symfony\Component\HttpFoundation\Request;
23-
use Symfony\Component\HttpKernel\Test\Controller\ContainerControllerResolverTestCase;
23+
use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
2424

25-
class ControllerResolverTest extends ContainerControllerResolverTestCase
25+
class ControllerResolverTest extends ContainerControllerResolverTest
2626
{
2727
public function testGetControllerOnContainerAware()
2828
{

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/debug": "~4.0",
2424
"symfony/dependency-injection": "^4.3",
2525
"symfony/http-foundation": "^4.3",
26-
"symfony/http-kernel": "^4.3.5",
26+
"symfony/http-kernel": "^4.3.4",
2727
"symfony/polyfill-mbstring": "~1.0",
2828
"symfony/filesystem": "~3.4|~4.0",
2929
"symfony/finder": "~3.4|~4.0",

0 commit comments

Comments
 (0)