Apply patch to fix Schematron attribute paths (#11)

* Apply patch to fix Schematron attribute paths

* Change library and add output

* Add comment

* Add depth

Author: thewilkybarkid

.gitignore

@@ -3,4 +3,5 @@
 /phpcs.xml
 /phpstan.neon
 /phpunit.xml
+/tmp/
 /vendor/

bin/update-schematron.php

@@ -3,15 +3,22 @@
 
 declare(strict_types=1);
 
+use GitWrapper\GitWrapper;
 use Symfony\Component\Filesystem\Filesystem;
 
 require_once __DIR__.'/../vendor/autoload.php';
 
 $filesystem = new Filesystem();
-
-$target = __DIR__.'/../lib/schematron';
-
-$base = 'https://github.com/Schematron/schematron/raw/master';
+$git = new GitWrapper();
+$git->streamOutput();
+
+$repoUri = 'https://github.com/Schematron/schematron';
+$repoDir = __DIR__.'/../tmp/schematron';
+$patchesDir = __DIR__.'/../tmp/patches';
+$targetDir = __DIR__.'/../lib/schematron';
+$patches = [
+    'https://github.com/Schematron/schematron/pull/81.patch', // Fixes attribute paths.
+];
 $files = [
     'LICENSE',
     'trunk/schematron/code/iso_schematron_skeleton_for_xslt1.xsl',
@@ -20,8 +27,29 @@
     'trunk/converters/code/ToSchematron/ExtractSchFromXSD.xsl',
 ];
 
-$filesystem->remove(new FilesystemIterator($target));
+if (!$filesystem->exists($repoDir)) {
+    $filesystem->mkdir($repoDir);
+    $repo = $git->cloneRepository($repoUri, $repoDir, ['depth' => 1]);
+} else {
+    $repo = $git->workingCopy($repoDir);
+    $repo->fetch('origin', 'master', ['depth' => 1]);
+    $repo->reset(['hard' => true], 'origin/master');
+}
+
+foreach ($patches as $patch) {
+    $patchTarget = "${patchesDir}/".md5($patch);
+
+    echo "Downloading {$patch} to {$patchTarget}\n";
+    $filesystem->copy($patch, $patchTarget);
+    $repo->apply($patchTarget, ['verbose' => true]);
+}
+
+$filesystem->remove(new FilesystemIterator($targetDir));
 
 foreach ($files as $file) {
-    $filesystem->copy("{$base}/${file}", "{$target}/".basename($file));
+    $origin = "${repoDir}/${file}";
+    $target = "${targetDir}/".basename($file);
+
+    echo "Copying {$origin} to {$target}\n";
+    $filesystem->copy($origin, $target);
 }

composer.json

@@ -20,6 +20,7 @@
     },
     "require-dev": {
         "ext-xsl": "*",
+        "cpliakas/git-wrapper": "^2.0",
         "libero/coding-standard": "^0.3",
         "phpstan/phpstan": "^0.10",
         "phpstan/phpstan-phpunit": "^0.10",

lib/schematron/iso_schematron_skeleton_for_xslt1.xsl

@@ -692,6 +692,7 @@ THE SOFTWARE.
 
 
 		<axsl:template match="@*" mode="schematron-get-full-path">
+			<axsl:apply-templates select="parent::*" mode="schematron-get-full-path"/>
 
 			<!-- XSLT1 syntax -->
 		<axsl:text>/</axsl:text>

tests/SchematronValidatorTest.php

@@ -50,10 +50,15 @@ public function it_fails_on_invalid(string $format) : void
             $this->assertEquals(
                 [
                     new Failure(
-                        'Must not be empty',
+                        'Element must not be empty',
                         6,
                         $xpath->query('/example:parent/example:child')->item(0)
                     ),
+                    new Failure(
+                        'Attribute must not be empty',
+                        6,
+                        $xpath->query('/example:parent/example:child/@attribute')->item(0)
+                    ),
                 ],
                 $e->getFailures()
             );

tests/fixtures/invalid-empty-child.xml

@@ -3,6 +3,6 @@
 
 <parent xmlns="http://example.com">
 
-    <child> </child>
+    <child attribute=" "> </child>
 
 </parent>

tests/fixtures/schema.dtd

@@ -4,4 +4,7 @@
 <!ATTLIST parent xmlns CDATA #FIXED 'http://example.com'>
 
 <!ELEMENT child (#PCDATA)>
-<!ATTLIST child xmlns CDATA #FIXED 'http://example.com'>
+<!ATTLIST child
+    xmlns CDATA #FIXED 'http://example.com'
+    attribute CDATA #IMPLIED
+>

tests/fixtures/schema.rng

@@ -10,10 +10,20 @@
             <oneOrMore>
                 <element name="child">
                     <text/>
+                    <optional>
+                        <attribute name="attribute"/>
+                    </optional>
                     <sch:pattern>
                         <sch:rule context="example:child">
                             <sch:assert test="* or normalize-space()">
-                                Must not be empty
+                                Element must not be empty
+                            </sch:assert>
+                        </sch:rule>
+                    </sch:pattern>
+                    <sch:pattern>
+                        <sch:rule context="example:child/@attribute">
+                            <sch:assert test="* or normalize-space()" subject="..">
+                                Attribute must not be empty
                             </sch:assert>
                         </sch:rule>
                     </sch:pattern>

tests/fixtures/schema.sch

@@ -7,7 +7,14 @@
     <pattern>
         <rule context="example:child">
             <assert test="* or normalize-space()">
-                Must not be empty
+                Element must not be empty
+            </assert>
+        </rule>
+    </pattern>
+    <pattern>
+        <rule context="example:child/@attribute">
+            <assert test="* or normalize-space()">
+                Attribute must not be empty
             </assert>
         </rule>
     </pattern>

tests/fixtures/schema.xsd

@@ -12,18 +12,32 @@
     <element name="parent">
         <complexType>
             <sequence>
-                <element name="child" type="string">
+                <element name="child">
                     <annotation>
                         <appinfo>
                             <sch:pattern>
                                 <sch:rule context="example:child">
                                     <sch:assert test="* or normalize-space()">
-                                        Must not be empty
+                                        Element must not be empty
+                                    </sch:assert>
+                                </sch:rule>
+                            </sch:pattern>
+                            <sch:pattern>
+                                <sch:rule context="example:child/@attribute">
+                                    <sch:assert test="* or normalize-space()" subject="..">
+                                        Attribute must not be empty
                                     </sch:assert>
                                 </sch:rule>
                             </sch:pattern>
                         </appinfo>
                     </annotation>
+                    <complexType>
+                        <simpleContent>
+                            <extension base="string">
+                                <attribute name="attribute" type="string"/>
+                            </extension>
+                        </simpleContent>
+                    </complexType>
                 </element>
             </sequence>
         </complexType>