8000 minor #10620 Fix travis build (romainneutron) · symfony/symfony@8774a34 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8774a34

Browse files
fabpotfabpot
committed
minor #10620 Fix travis build (romainneutron)
This PR was merged into the 2.5-dev branch. Discussion ---------- Fix travis build | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT Since #10287 and #10606 have been merged, errors occur in FrameworkBundle and Console component. This patch solves this. After merging 2.4 in master (that would fix Process suite), everything should be green. Commits ------- 099e480 Fix travis build
2 parents db4230e + 099e480 commit 8774a34

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public function testValidationAnnotations()
302302
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
303303

304304
$this->assertCount(6, $calls);
305-
$this->assertSame('enableAnnotations', $calls[4][0]);
305+
$this->assertSame('enableAnnotationMapping', $calls[4][0]);
306306
$this->assertEquals(array(new Reference('annotation_reader')), $calls[4][1]);
307307
$this->assertSame('addMethodMapping', $calls[5][0]);
308308
$this->assertSame(array('loadClassMetadata'), $calls[5][1]);
@@ -322,7 +322,7 @@ public function testValidationPaths()
322322
$this->assertCount(7, $calls);
323323
$this->assertSame('addXmlMappings', $calls[3][0]);
324324
$this->assertSame('addYamlMappings', $calls[4][0]);
325-
$this->assertSame('enableAnnotations', $calls[5][0]);
325+
$this->assertSame('enableAnnotationMapping', $calls[5][0]);
326326
$this->assertSame('addMethodMapping', $calls[6][0]);
327327
$this->assertSame(array('loadClassMetadata'), $calls[6][1]);
328328

‎src/Symfony/Component/Console/Helper/QuestionHelper.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ public function getName()
102102
/**
103103
* Asks the question to the user.
104104
*
105+
* This method is public for PHP 5.3 compatibility, it should be private.
106+
*
105107
* @param OutputInterface $output
106108
* @param Question $question
107109
*
@@ -110,7 +112,7 @@ public function getName()
110112
* @throws \Exception
111113
* @throws \RuntimeException
112114
*/
113-
private function doAsk(OutputInterface $output, Question $question)
115+
public function doAsk(OutputInterface $output, Question $question)
114116
{
115117
$message = $question->getQuestion();
116118
if ($question instanceof ChoiceQuestion) {

‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,37 +53,37 @@ public function testParseFile()
5353
{
5454
$loader = new XmlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
5555
$r = new \ReflectionObject($loader);
56-
$m = $r->getMethod('parseFile');
56+
$m = $r->getMethod('parseFileToDOM');
5757
$m->setAccessible(true);
5858

5959
try {
6060
$m->invoke($loader, self::$fixturesPath.'/ini/parameters.ini');
61-
$this->fail('->parseFile() throws an InvalidArgumentException if the loaded file is not a valid XML file');
61+
$this->fail('->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
6262
} catch (\Exception $e) {
63-
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFile() throws an InvalidArgumentException if the loaded file is not a valid XML file');
64-
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s".$#', 'parameters.ini'), $e->getMessage(), '->parseFile() throws an InvalidArgumentException if the loaded file is not a valid XML file');
63+
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
64+
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s".$#', 'parameters.ini'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
6565

6666
$e = $e->getPrevious();
67-
$this->assertInstanceOf('InvalidArgumentException', $e, '->parseFile() throws an InvalidArgumentException if the loaded file is not a valid XML file');
68-
$this->assertStringStartsWith('[ERROR 4] Start tag expected, \'<\' not found (in', $e->getMessage(), '->parseFile() throws an InvalidArgumentException if the loaded file is not a valid XML file');
67+
$this->assertInstanceOf('InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
68+
$this->assertStringStartsWith('[ERROR 4] Start tag expected, \'<\' not found (in', $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
6969
}
7070

7171
$loader = new XmlFileLoader(n 67E6 ew ContainerBuilder(), new FileLocator(self::$fixturesPath.'/xml'));
7272

7373
try {
7474
$m->invoke($loader, self::$fixturesPath.'/xml/nonvalid.xml');
75-
$this->fail('->parseFile() throws an InvalidArgumentException if the loaded file does not validate the XSD');
75+
$this->fail('->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
7676
} catch (\Exception $e) {
77-
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFile() throws an InvalidArgumentException if the loaded file does not validate the XSD');
78-
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s".$#', 'nonvalid.xml'), $e->getMessage(), '->parseFile() throws an InvalidArgumentException if the loaded file is not a valid XML file');
77+
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
78+
$this->assertRegExp(sprintf('#^Unable to parse file ".+%s".$#', 'nonvalid.xml'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
7979

8080
$e = $e->getPrevious();
81-
$this->assertInstanceOf('InvalidArgumentException', $e, '->parseFile() throws an InvalidArgumentException if the loaded file does not validate the XSD');
82-
$this->assertStringStartsWith('[ERROR 1845] Element \'nonvalid\': No matching global declaration available for the validation root. (in', $e->getMessage(), '->parseFile() throws an InvalidArgumentException if the loaded file does not validate the XSD');
81+
$this->assertInstanceOf('InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
82+
$this->assertStringStartsWith('[ERROR 1845] Element \'nonvalid\': No matching global declaration available for the validation root. (in', $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
8383
}
8484

8585
$xml = $m->invoke($loader, self::$fixturesPath.'/xml/services1.xml');
86-
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\SimpleXMLElement', $xml, '->parseFile() returns an SimpleXMLElement object');
86+
$this->assertInstanceOf('DOMDocument', $xml, '->parseFileToDOM() returns an SimpleXMLElement object');
8787
}
8888

8989
public function testLoadParameters()

0 commit comments

Comments
 (0)
0