XSD schema fix and Converter implementation

Author: maciejslawik

Model/Config/Converter.php

@@ -10,6 +10,9 @@
 
 namespace MSlwk\XmlUrlRewrites\Model\Config;
 
+use DOMDocument;
+use DOMNode;
+use DOMXPath;
 use Magento\Framework\Config\ConverterInterface;
 
 /**
@@ -19,13 +22,20 @@
 class Converter implements ConverterInterface
 {
     /**
-     * Convert config
-     *
-     * @param \DOMDocument $source
+     * @param DOMDocument $source
      * @return array
      */
     public function convert($source)
     {
-        // TODO: Implement convert() method.
+        $xpath = new DOMXPath($source);
+        $rewrites = [];
+        /** @var $rewriteNode DOMNode */
+        foreach ($xpath->query('/config/rewrites/rewrite') as $rewriteNode) {
+            $rewriteAttributes = $rewriteNode->attributes;
+            $pathAttribute = $rewriteAttributes->getNamedItem('path');
+            $targetAttribute = $rewriteAttributes->getNamedItem('target');
+            $rewrites[$pathAttribute->nodeValue] = $targetAttribute->nodeValue;
+        }
+        return $rewrites;
     }
 }

Model/Config/Reader.php

@@ -21,8 +21,10 @@
 class Reader extends Filesystem
 {
     const XML_FILE_NAME = 'url_rewrites.xml';
+    const ID_ATTRIBUTES = ['/config/rewrites/rewrite' => 'target'];
 
     /**
+     * Reader constructor.
      * @param FileResolverInterface $fileResolver
      * @param Converter $converter
      * @param SchemaLocator $schemaLocator
@@ -42,7 +44,7 @@ public function __construct(
             $schemaLocator,
             $validationState,
             $fileName,
-            $this->_idAttributes
+            self::ID_ATTRIBUTES
         );
     }
 }

etc/url_rewrites.xsd

@@ -6,28 +6,22 @@
     <xs:element name="config">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="url_rewrites">
+                <xs:element name="rewrites">
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element name="rewrites">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element minOccurs="0" maxOccurs="unbounded" name="rewrite" type="rewrite" />
-                                    </xs:sequence>
-                                </xs:complexType>
-
-                                <xs:unique name="uniqueRewritePath">
-                                    <xs:annotation>
-                                        <xs:documentation>
-                                            URL rewrite path must be unique
-                                        </xs:documentation>
-                                    </xs:annotation>
-                                    <xs:selector xpath=".//*"/>
-                                    <xs:field xpath="@path"/>
-                                </xs:unique>
-                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="rewrite" type="rewrite" />
                         </xs:sequence>
                     </xs:complexType>
+
+                    <xs:unique name="uniqueRewritePath">
+                        <xs:annotation>
+                            <xs:documentation>
+                                URL rewrite path must be unique
+                            </xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="rewrite"/>
+                        <xs:field xpath="@path"/>
+                    </xs:unique>
                 </xs:element>
             </xs:sequence>
         </xs:complexType>
@@ -40,7 +34,7 @@
             </xs:documentation>
         </xs:annotation>
 
-        <xs:attribute name="parth" type="xs:string" use="required" />
+        <xs:attribute name="path" type="xs:string" use="required" />
         <xs:attribute name="target" type="xs:string" use="required" />
     </xs:complexType>
 </xs:schema>

registration.php

@@ -8,6 +8,6 @@
 
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'MSlwk_RepositorySearchResultBuilder',
+    'MSlwk_XmlUrlRewrites',
     __DIR__
 );