Skip to content

Commit c1e2736

Browse files
author
Joan He
committed
MAGETWO-43679: Fixed XML validation happens in production mode
1 parent 80c5e2b commit c1e2736

File tree

61 files changed

+437
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+437
-270
lines changed

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/ReaderTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ protected function setUp()
7373
$this->_schemaLocator = new \Magento\Catalog\Model\Attribute\Config\SchemaLocator($moduleReader);
7474

7575
$this->_validationState = $this->getMock('Magento\Framework\Config\ValidationStateInterface');
76-
$this->_validationState->expects($this->once())->method('isValidated')->will($this->returnValue(false));
76+
$this->_validationState->expects($this->any())
77+
->method('isValidationRequired')
78+
->willReturn(false);
7779

7880
$this->_model = new \Magento\Catalog\Model\Attribute\Config\Reader(
7981
$this->_fileResolverMock,

‎app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ protected function setUp()
2727
*/
2828
public function testExemplarXml($fixtureXml, array $expectedErrors)
2929
{
30-
$dom = new \Magento\Framework\Config\Dom($fixtureXml, [], null, null, '%message%');
30+
$validationStateMock = $this->getMock('\Magento\Framework\Config\ValidationStateInterface', [], [], '', false);
31+
$validationStateMock->method('isValidationRequired')
32+
->willReturn(true);
33+
$dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationStateMock, [], null, null, '%message%');
3134
$actualResult = $dom->validate($this->_schemaFile, $actualErrors);
3235
$this->assertEquals(empty($expectedErrors), $actualResult);
3336
$this->assertEquals($expectedErrors, $actualErrors);

‎app/code/Magento/Config/Model/Config/Structure/Reader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected function _readFiles($fileList)
100100
}
101101
}
102102

103-
if ($this->_isValidated) {
103+
if ($this->validationState->isValidationRequired()) {
104104
$errors = [];
105105
if ($configMerger && !$configMerger->validate($this->_schemaFile, $errors)) {
106106
$message = "Invalid Document \n";

‎app/code/Magento/Customer/Test/Unit/Model/Address/Config/ReaderTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ protected function setUp()
7474

7575
$this->_schemaLocator = new \Magento\Customer\Model\Address\Config\SchemaLocator($moduleReader);
7676
$this->_validationState = $this->getMock('Magento\Framework\Config\ValidationStateInterface');
77-
$this->_validationState->expects($this->once())->method('isValidated')->will($this->returnValue(false));
77+
$this->_validationState->expects($this->any())
78+
->method('isValidationRequired')
79+
->willReturn(false);
7880

7981
$this->_model = new \Magento\Customer\Model\Address\Config\Reader(
8082
$this->_fileResolverMock,

‎app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ protected function setUp()
2727
*/
2828
public function testExemplarXml($fixtureXml, array $expectedErrors)
2929
{
30-
$dom = new \Magento\Framework\Config\Dom($fixtureXml, [], null, null, '%message%');
30+
$validationStateMock = $this->getMock('\Magento\Framework\Config\ValidationStateInterface', [], [], '', false);
31+
$validationStateMock->method('isValidationRequired')
32+
->willReturn(true);
33+
$dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationStateMock, [], null, null, '%message%');
3134
$actualResult = $dom->validate($this->_schemaFile, $actualErrors);
3235
$this->assertEquals(empty($expectedErrors), $actualResult);
3336
$this->assertEquals($expectedErrors, $actualErrors);

‎app/code/Magento/Email/Test/Unit/Model/Template/Config/ReaderTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ protected function setUp()
6969
);
7070
$schemaLocator = new \Magento\Email\Model\Template\Config\SchemaLocator($moduleReader);
7171

72-
$validationState = $this->getMock('Magento\Framework\Config\ValidationStateInterface');
73-
$validationState->expects($this->once())->method('isValidated')->will($this->returnValue(false));
72+
$validationStateMock = $this->getMock('Magento\Framework\Config\ValidationStateInterface', [], [], '', true);
73+
$validationStateMock->expects($this->any())
74+
->method('isValidationRequired')
75+
->willReturn(false);
7476

7577
$this->_moduleDirResolver = $this->getMock(
7678
'Magento\Framework\Module\Dir\ReverseResolver',
@@ -109,7 +111,7 @@ protected function setUp()
109111
$fileResolver,
110112
$this->_converter,
111113
$schemaLocator,
112-
$validationState
114+
$validationStateMock
113115
);
114116
}
115117

‎app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ public function mergedXmlDataProvider()
113113
*/
114114
protected function _testXmlAgainstXsd($fixtureXml, $schemaFile, array $expectedErrors)
115115
{
116-
$dom = new \Magento\Framework\Config\Dom($fixtureXml, [], null, null, '%message%');
116+
$validationStateMock = $this->getMock('\Magento\Framework\Config\ValidationStateInterface', [], [], '', false);
117+
$validationStateMock->method('isValidationRequired')
118+
->willReturn(true);
119+
$dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationStateMock, [], null, null, '%message%');
117120
$actualResult = $dom->validate($schemaFile, $actualErrors);
118121
$this->assertEquals(empty($expectedErrors), $actualResult);
119122
$this->assertEquals($expectedErrors, $actualErrors);

‎app/code/Magento/Integration/Test/Unit/Model/Config/Integration/XsdTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ protected function setUp()
3030
*/
3131
public function testExemplarXml($fixtureXml, array $expectedErrors)
3232
{
33+
$validationStateMock = $this->getMock('\Magento\Framework\Config\ValidationStateInterface', [], [], '', false);
34+
$validationStateMock->method('isValidationRequired')
35+
->willReturn(true);
3336
$messageFormat = '%message%';
34-
$dom = new \Magento\Framework\Config\Dom($fixtureXml, [], null, null, $messageFormat);
37+
$dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationStateMock, [], null, null, $messageFormat);
3538
$actualResult = $dom->validate($this->_schemaFile, $actualErrors);
3639
$this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
3740
$this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");

‎app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ protected function setUp()
3030
*/
3131
public function testExemplarXml($fixtureXml, array $expectedErrors)
3232
{
33+
$validationStateMock = $this->getMock('\Magento\Framework\Config\ValidationStateInterface', [], [], '', false);
34+
$validationStateMock->method('isValidationRequired')
35+
->willReturn(true);
3336
$messageFormat = '%message%';
34-
$dom = new \Magento\Framework\Config\Dom($fixtureXml, [], null, null, $messageFormat);
37+
$dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationStateMock, [], null, null, $messageFormat);
3538
$actualResult = $dom->validate($this->_schemaFile, $actualErrors);
3639
$this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
3740
$this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");

0 commit comments

Comments
 (0)