8000 [Config] extracted the xml parsing from XmlUtils::loadFile into XmlUtils::parse by Basster · Pull Request #23485 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Config] extracted the xml parsing from XmlUtils::loadFile into XmlUtils::parse #23485

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 12 commits into from
Closed

[Config] extracted the xml parsing from XmlUtils::loadFile into XmlUtils::parse #23485

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f409dfd
[Config] extracted the xml parsing from XmlUtils::loadFile into XmlUt…
Basster Jul 12, 2017
a56801b
code style fixes.
Basster Jul 12, 2017
c9bc727
renamed load to parse, that's more specific.
Basster Jul 12, 2017
860fd87
make the file test windows compatible
Basster Jul 12, 2017
2090407
reverted message const and refactored XmlUtilsTest.
Basster Jul 12, 2017
f3b6e7d
added myself to CONTRIBUTORS.md
Basster Jul 12, 2017
ee8ebb5
http://fabbot.io patch
Basster Jul 12, 2017
bce4007
reverted the refactorings in XmlUtilsTest, due to the fact that phpun…
Basster Jul 12, 2017
da07b89
applied proposed changes from @nicolas-grekas.
Basster Jul 13, 2017
9fcb50f
introduced dedicated exception classes related to XML parsing.
Basster Jul 18, 2017
d8438a5
fabbot.io patch
Basster Jul 18, 2017
1908988
another fabbot.io patch
Basster Sep 26, 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
Next Next commit
http://fabbot.io patch
  • Loading branch information
@Basster
Basster committed Sep 26, 2017
commit ee8ebb5a419e8cdac08e2fe6ed00c4c3b8230cef
8 changes: 4 additions & 4 deletions src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function testLoadWithValidator()
$mock = $this->createValidatorMock(true);

$this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
$this->assertSame([], libxml_get_errors());
$this->assertSame(array(), libxml_get_errors());
}

public function provideDataForTestLoadFileExceptions()
Expand All @@ -44,9 +44,9 @@ public function provideDataForTestLoadFileExceptions()
$mock = $this->createValidatorMock(false);

return array(
'invalid' => array($fixtures . 'invalid.xml', '/ERROR 77/'),
'document_type' => array($fixtures. 'document_type.xml', '/Document types are not allowed/'),
'invalid_schema' => array($fixtures . 'schema.xsd', '/ERROR 1845/',$fixtures.'schema.xsd'),
'invalid' => array($fixtures.'invalid.xml', '/ERROR 77/'),
'document_type' => array($fixtures.'document_type.xml', '/Document types are not allowed/'),
'invalid_schema' => array($fixtures.'schema.xsd', '/ERROR 1845/', $fixtures.'schema.xsd'),
'invalid_callback_or_file' => array($fixtures.'invalid_schema.xml', '/XSD file or callable/', 'invalid_callback_or_file'),
'invalid_callback_validator' => array($fixtures.'valid.xml', '/The XML file "[\w:\/\\\.]+" is not valid\./', array($mock, 'validate')),
);
Expand Down
0