ENGCOM-3466: [FEATURE] added ability to create default/fixed value no…

…des during XSD Schema Validation #13184
magento · Mar 13, 2019 · fa58c70 · fa58c70
2 parents eb3a122 + 88111b4
commit fa58c70
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 1 deletion.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
@@ -35,6 +35,7 @@
             'match_query' => [
                 'value' => '$match_term_override$',
                 'name' => 'match_query',
+                'boost' => '1',
                 'match' => [
                     0 => [
                         'field' => 'match_field',
@@ -50,6 +51,7 @@
             ],
             'must_query' => [
                 'name' => 'must_query',
+                'boost' => '1',
                 'filterReference' =>  [
                     0 => [
                         'clause' => 'must',
@@ -60,6 +62,7 @@
             ],
             'should_query' => [
                 'name' => 'should_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 => [
                         'clause' => 'should',
@@ -70,6 +73,7 @@
             ],
             'not_query' => [
                 'name' => 'not_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 => [
                         'clause' => 'not',
@@ -80,6 +84,7 @@
             ],
             'match_query_2' => [
                 'value' => '$match_term_override$',
+                'boost' => '1',
                 'name' => 'match_query_2',
                 'match' => [
                     0 => [
@@ -163,6 +168,7 @@
         'queries' => [
             'filter_query' => [
                 'name' => 'filter_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 =>
                         [
@@ -230,6 +236,7 @@
             'new_match_query' => [
                 'value' => '$match_term$',
                 'name' => 'new_match_query',
+                'boost' => '1',
                 'match' => [
                     0 =>
                         [

diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
@@ -318,7 +318,7 @@ public static function validateDomDocument(
         libxml_set_external_entity_loader([self::$urnResolver, 'registerEntityLoader']);
         $errors = [];
         try {
-            $result = $dom->schemaValidate($schema);
+            $result = $dom->schemaValidate($schema, LIBXML_SCHEMA_CREATE);
             if (!$result) {
                 $errors = self::getXmlErrors($errorFormat);
             }

diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
@@ -135,6 +135,48 @@ public function validateDataProvider()
         ];
     }
 
+    /**
+     * @param string $xml
+     * @param string $expectedValue
+     * @dataProvider validateWithDefaultValueDataProvider
+     */
+    public function testValidateWithDefaultValue($xml, $expectedValue)
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+
+        $actualErrors = [];
+
+        $dom = new \Magento\Framework\Config\Dom($xml, $this->validationStateMock);
+        $dom->validate(__DIR__ . '/_files/sample.xsd', $actualErrors);
+
+        $actualValue = $dom->getDom()
+            ->getElementsByTagName('root')->item(0)
+            ->getElementsByTagName('node')->item(0)
+            ->getAttribute('attribute_with_default_value');
+
+        $this->assertEmpty($actualErrors);
+        $this->assertEquals($expectedValue, $actualValue);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateWithDefaultValueDataProvider()
+    {
+        return [
+            'default_value' => [
+                '<root><node id="id1"/></root>',
+                'default_value'
+            ],
+            'custom_value' => [
+                '<root><node id="id1" attribute_with_default_value="non_default_value"/></root>',
+                'non_default_value'
+            ],
+        ];
+    }
+
     public function testValidateCustomErrorFormat()
     {
         $xml = '<root><unknown_node/></root>';

diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
@@ -21,6 +21,7 @@
         <xs:simpleContent>
             <xs:extension base="xs:string">
                 <xs:attribute name="id" type="xs:string" use="required"/>
+                <xs:attribute name="attribute_with_default_value" type="xs:string" default="default_value"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>