Merge branch '2.7' into 2.8
* 2.7: [FrameworkBundle] Fix test related to PSR-4
This commit is contained in:
commit
b09df56a4e
@ -362,7 +362,13 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
|
|
||||||
$xmlMappings = $calls[3][1][0];
|
$xmlMappings = $calls[3][1][0];
|
||||||
$this->assertCount(2, $xmlMappings);
|
$this->assertCount(2, $xmlMappings);
|
||||||
$this->assertStringEndsWith('Component'.DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
|
try {
|
||||||
|
// Testing symfony/symfony
|
||||||
|
$this->assertStringEndsWith('Component'.DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// Testing symfony/framework-bundle with deps=high
|
||||||
|
$this->assertStringEndsWith('symfony'.DIRECTORY_SEPARATOR.'form/Resources/config/validation.xml', $xmlMappings[0]);
|
||||||
|
}
|
||||||
$this->assertStringEndsWith('TestBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'validation.xml', $xmlMappings[1]);
|
$this->assertStringEndsWith('TestBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'validation.xml', $xmlMappings[1]);
|
||||||
|
|
||||||
$yamlMappings = $calls[4][1][0];
|
$yamlMappings = $calls[4][1][0];
|
||||||
|
Reference in New Issue
Block a user