Skip to content

Commit 1fe6141

Browse files
lacatoirelacatoire
authored
ext/imagick: fix broken methodsynopsis xpointers in exception classes (#5700)
These five exception classes have no own methods, so the &Methods; include pointed at a non-existent refentry. The &InheritedMethods; include used the class's own name as methodsynopsis role instead of 'Exception', so both selected an empty node set, which older libxml (2.9, CI) reports as a failed XInclude while newer libxml (2.15) silently swallows. Drop the own-methods include and mirror the working jsonexception pattern: inherit the Exception constructor and methods with role='Exception'.
1 parent 462dddd commit 1fe6141

5 files changed

Lines changed: 15 additions & 55 deletions

File tree

‎reference/imagick/imagickdrawexception.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,12 @@
3838
</oointerface>
3939
</classsynopsisinfo>
4040
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
41-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)">
42-
<xi:fallback/>
43-
</xi:include>
41+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
4442

4543

46-
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
47-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickdrawexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickDrawException'])">
48-
<xi:fallback/>
49-
</xi:include>
50-
5144
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
52-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickDrawException'])">
53-
<xi:fallback/>
54-
</xi:include>
45+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
46+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
5547

5648
</classsynopsis>
5749
<!-- }}} -->

‎reference/imagick/imagickexception.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,12 @@
3838
</oointerface>
3939
</classsynopsisinfo>
4040
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
41-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)">
42-
<xi:fallback/>
43-
</xi:include>
41+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
4442

4543

46-
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
47-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickException'])">
48-
<xi:fallback/>
49-
</xi:include>
50-
5144
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
52-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickException'])">
53-
<xi:fallback/>
54-
</xi:include>
45+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
46+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
5547

5648
</classsynopsis>
5749
<!-- }}} -->

‎reference/imagick/imagickkernelexception.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,12 @@
3737
</classsynopsisinfo>
3838
<!-- }}} -->
3939
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
40-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)">
41-
<xi:fallback/>
42-
</xi:include>
40+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
4341

4442

45-
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
46-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickkernelexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickKernelException'])">
47-
<xi:fallback/>
48-
</xi:include>
49-
5043
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
51-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickKernelException'])">
52-
<xi:fallback/>
53-
</xi:include>
44+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
45+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
5446

5547
</classsynopsis>
5648
<!-- }}} -->

‎reference/imagick/imagickpixelexception.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,12 @@
3838
</oointerface>
3939
</classsynopsisinfo>
4040
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
41-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)">
42-
<xi:fallback/>
43-
</xi:include>
41+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
4442

4543

46-
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
47-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickpixelexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickPixelException'])">
48-
<xi:fallback/>
49-
</xi:include>
50-
5144
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
52-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickPixelException'])">
53-
<xi:fallback/>
54-
</xi:include>
45+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
46+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
5547

5648
</classsynopsis>
5749
<!-- }}} -->

‎reference/imagick/imagickpixeliteratorexception.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,12 @@
3838
</oointerface>
3939
</classsynopsisinfo>
4040
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
41-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)">
42-
<xi:fallback/>
43-
</xi:include>
41+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
4442

4543

46-
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
47-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickpixeliteratorexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickPixelIteratorException'])">
48-
<xi:fallback/>
49-
</xi:include>
50-
5144
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
52-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ImagickPixelIteratorException'])">
53-
<xi:fallback/>
54-
</xi:include>
45+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
46+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
5547

5648
</classsynopsis>
5749
<!-- }}} -->

0 commit comments

Comments
 (0)