Skip to content

Commit 603435c

Browse files
authored
[skip-revcheck] Remove empty xi:fallback elements (#5699)
An empty <xi:fallback/> replaces a failed XInclude with nothing, hiding the failure from the reporting configure.php already provides. Continues #274 and the doc-base roadmap (#199). Imagick exception classes are handled separately, they need a content fix to their xpointers. An empty node set is swallowed by libxml 2.15 but surfaces as a failed XInclude on libxml 2.9 (CI), so only CI validates this.
1 parent 75772fd commit 603435c

359 files changed

Lines changed: 1003 additions & 2917 deletions

File tree

Some content is hidden

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

appendices/ini.list.xml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<entry><constant>INI_PERDIR</constant></entry>
107107
<entry></entry>
108108
</row>
109-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('bc.configuration.list')/*)"><xi:fallback/></xi:include>
109+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('bc.configuration.list')/*)"/>
110110
<row>
111111
<entry><link linkend="ini.browscap">browscap</link></entry>
112112
<entry>&null;</entry>
@@ -161,12 +161,12 @@
161161
<entry><constant>INI_ALL</constant></entry>
162162
<entry></entry>
163163
</row>
164-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('readline.configuration.list')/*)"><xi:fallback/></xi:include>
165-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('features.commandline.ini.list')/*)"><xi:fallback/></xi:include>
166-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('com.configuration.list')/*)"><xi:fallback/></xi:include>
167-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('curl.configuration.list')/*)"><xi:fallback/></xi:include>
168-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('datetime.configuration.list')/*)"><xi:fallback/></xi:include>
169-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('dba.configuration.list')/*)"><xi:fallback/></xi:include>
164+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('readline.configuration.list')/*)"/>
165+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('features.commandline.ini.list')/*)"/>
166+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('com.configuration.list')/*)"/>
167+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('curl.configuration.list')/*)"/>
168+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('datetime.configuration.list')/*)"/>
169+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('dba.configuration.list')/*)"/>
170170
<row>
171171
<entry><link linkend="ini.default-charset">default_charset</link></entry>
172172
<entry><literal>"UTF-8"</literal></entry>
@@ -295,14 +295,14 @@
295295
<entry><constant>INI_ALL</constant></entry>
296296
<entry></entry>
297297
</row>
298-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exif.configuration.list')/*)"><xi:fallback/></xi:include>
298+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exif.configuration.list')/*)"/>
299299
<row>
300300
<entry><link linkend="ini.exit-on-timeout">exit_on_timeout</link></entry>
301301
<entry><literal>""</literal></entry>
302302
<entry><constant>INI_ALL</constant></entry>
303303
<entry></entry>
304304
</row>
305-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('expect.configuration.list')/*)"><xi:fallback/></xi:include>
305+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('expect.configuration.list')/*)"/>
306306
<row>
307307
<entry><link linkend="ini.expose-php">expose_php</link></entry>
308308
<entry><literal>"1"</literal></entry>
@@ -339,15 +339,15 @@
339339
<entry><constant>INI_SYSTEM</constant></entry>
340340
<entry></entry>
341341
</row>
342-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('filter.configuration.list')/*)"><xi:fallback/></xi:include>
342+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('filter.configuration.list')/*)"/>
343343
<row>
344344
<entry><link linkend="ini.from">from</link></entry>
345345
<entry><literal>""</literal></entry>
346346
<entry><constant>INI_ALL</constant></entry>
347347
<entry></entry>
348348
</row>
349-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('image.configuration.list')/*)"><xi:fallback/></xi:include>
350-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('geoip.configuration.list')/*)"><xi:fallback/></xi:include>
349+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('image.configuration.list')/*)"/>
350+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('geoip.configuration.list')/*)"/>
351351
<row>
352352
<entry>hard_timeout</entry>
353353
<entry><literal>"2"</literal></entry>
@@ -390,9 +390,9 @@
390390
<entry><constant>INI_ALL</constant></entry>
391391
<entry></entry>
392392
</row>
393-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibase.configuration.list')/*)"><xi:fallback/></xi:include>
394-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibm-db2.configuration.list')/*)"><xi:fallback/></xi:include>
395-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('iconv.configuration.list')/*)"><xi:fallback/></xi:include>
393+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibase.configuration.list')/*)"/>
394+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibm-db2.configuration.list')/*)"/>
395+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('iconv.configuration.list')/*)"/>
396396
<row>
397397
<entry><link linkend="ini.ignore-repeated-errors">ignore_repeated_errors</link></entry>
398398
<entry><literal>"0"</literal></entry>
@@ -423,14 +423,14 @@
423423
<entry><constant>INI_ALL</constant></entry>
424424
<entry></entry>
425425
</row>
426-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('intl.configuration.list')/*)"><xi:fallback/></xi:include>
426+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('intl.configuration.list')/*)"/>
427427
<row>
428428
<entry><link linkend="ini.last-modified">last_modified</link></entry>
429429
<entry><literal>"0"</literal></entry>
430430
<entry><constant>INI_ALL</constant></entry>
431431
<entry></entry>
432432
</row>
433-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ldap.configuration.list')/*)"><xi:fallback/></xi:include>
433+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ldap.configuration.list')/*)"/>
434434
<row>
435435
<entry><link linkend="ini.log-errors">log_errors</link></entry>
436436
<entry><literal>"0"</literal></entry>
@@ -485,21 +485,21 @@
485485
<entry><constant>INI_PERDIR</constant></entry>
486486
<entry></entry>
487487
</row>
488-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mbstring.configuration.list')/*)"><xi:fallback/></xi:include>
489-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mcrypt.configuration.list')/*)"><xi:fallback/></xi:include>
490-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('memcache.ini.list')/*)"><xi:fallback/></xi:include>
488+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mbstring.configuration.list')/*)"/>
489+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mcrypt.configuration.list')/*)"/>
490+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('memcache.ini.list')/*)"/>
491491
<row>
492492
<entry><link linkend="ini.memory-limit">memory_limit</link></entry>
493493
<entry><literal>"128M"</literal></entry>
494494
<entry><constant>INI_ALL</constant></entry>
495495
<entry></entry>
496496
</row>
497-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysql.configuration.list')/*)"><xi:fallback/></xi:include>
498-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqli.configuration.list')/*)"><xi:fallback/></xi:include>
499-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd.config.options.list')/*)"><xi:fallback/></xi:include>
500-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('oci8.configuration.list')/*)"><xi:fallback/></xi:include>
501-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('odbc.configuration.list')/*)"><xi:fallback/></xi:include>
502-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('opcache.configuration.list')/*)"><xi:fallback/></xi:include>
497+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysql.configuration.list')/*)"/>
498+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqli.configuration.list')/*)"/>
499+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd.config.options.list')/*)"/>
500+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('oci8.configuration.list')/*)"/>
501+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('odbc.configuration.list')/*)"/>
502+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('opcache.configuration.list')/*)"/>
503503
<row>
504504
<entry><link linkend="ini.open-basedir">open_basedir</link></entry>
505505
<entry>&null;</entry>
@@ -518,11 +518,11 @@
518518
<entry><constant>INI_PERDIR</constant></entry>
519519
<entry></entry>
520520
</row>
521-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pcre.configuration.list')/*)"><xi:fallback/></xi:include>
522-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo.configuration.list')/*)"><xi:fallback/></xi:include>
523-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-odbc.configuration.list')/*)"><xi:fallback/></xi:include>
524-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pgsql.configuration.list')/*)"><xi:fallback/></xi:include>
525-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('phar.configuration.list')/*)"><xi:fallback/></xi:include>
521+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pcre.configuration.list')/*)"/>
522+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo.configuration.list')/*)"/>
523+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-odbc.configuration.list')/*)"/>
524+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pgsql.configuration.list')/*)"/>
525+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('phar.configuration.list')/*)"/>
526526
<row>
527527
<entry><link linkend="ini.post-max-size">post_max_size</link></entry>
528528
<entry><literal>"8M"</literal></entry>
@@ -571,7 +571,7 @@
571571
<entry><constant>INI_PERDIR</constant></entry>
572572
<entry></entry>
573573
</row>
574-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runkit7.configuration.list')/*)"><xi:fallback/></xi:include>
574+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runkit7.configuration.list')/*)"/>
575575
<row>
576576
<entry><link linkend="ini.sendmail-from">sendmail_from</link></entry>
577577
<entry>&null;</entry>
@@ -592,7 +592,7 @@
592592
Prior to PHP 7.1.0, the default value was <literal>17</literal>.
593593
</entry>
594594
</row>
595-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('session.configuration.list')/*)"><xi:fallback/></xi:include>
595+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('session.configuration.list')/*)"/>
596596
<row>
597597
<entry><link linkend="ini.short-open-tag">short_open_tag</link></entry>
598598
<entry><literal>"1"</literal></entry>
@@ -611,14 +611,14 @@
611611
<entry><constant>INI_ALL</constant></entry>
612612
<entry></entry>
613613
</row>
614-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('soap.configuration.list')/*)"><xi:fallback/></xi:include>
614+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('soap.configuration.list')/*)"/>
615615
<row>
616616
<entry><link linkend="ini.sql.safe-mode">sql.safe_mode</link></entry>
617617
<entry><literal>"0"</literal></entry>
618618
<entry><constant>INI_SYSTEM</constant></entry>
619619
<entry>Removed as of PHP 7.2.0</entry>
620620
</row>
621-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sqlite3.configuration.list')/*)"><xi:fallback/></xi:include>
621+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sqlite3.configuration.list')/*)"/>
622622
<row>
623623
<entry><link linkend="ini.syslog.facility">syslog.facility</link></entry>
624624
<entry><literal>"LOG_USER"</literal></entry>
@@ -643,15 +643,15 @@
643643
<entry><constant>INI_SYSTEM</constant></entry>
644644
<entry></entry>
645645
</row>
646-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sem.configuration.list')/*)"><xi:fallback/></xi:include>
647-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('tidy.configuration.list')/*)"><xi:fallback/></xi:include>
646+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('sem.configuration.list')/*)"/>
647+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('tidy.configuration.list')/*)"/>
648648
<row>
649649
<entry><link linkend="ini.track-errors">track_errors</link></entry>
650650
<entry><literal>"0"</literal></entry>
651651
<entry><constant>INI_ALL</constant></entry>
652652
<entry>Deprecated as of PHP 7.2.0, removed as of PHP 8.0.0</entry>
653653
</row>
654-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('unserialize.configuration.list')/*)"><xi:fallback/></xi:include>
654+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('unserialize.configuration.list')/*)"/>
655655
<row>
656656
<entry>uploadprogress.file.filename_template</entry>
657657
<entry><literal>"/tmp/upt_%s.txt"</literal></entry>
@@ -715,7 +715,7 @@
715715
<entry><constant>INI_SYSTEM</constant></entry>
716716
<entry></entry>
717717
</row>
718-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('uopz.configuration.list')/*)"><xi:fallback/></xi:include>
718+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('uopz.configuration.list')/*)"/>
719719
<row>
720720
<entry><link linkend="ini.variables-order">variables_order</link></entry>
721721
<entry><literal>"EGPCS"</literal></entry>
@@ -818,7 +818,7 @@
818818
<entry>&php.ini; only</entry>
819819
<entry></entry>
820820
</row>
821-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('zlib.configuration.list')/*)"><xi:fallback/></xi:include>
821+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('zlib.configuration.list')/*)"/>
822822
</tbody>
823823
</tgroup>
824824
</table>

install/ini.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ once libxml2 gets XInclude 1.1 attribute copying support.
271271
The below <xi:include> will include the appropriate elements
272272
but needs all top-level xml:id's removed (see XInclude 1.1 set-xml-id).
273273
274-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('constant.ini-mode')/*)"><xi:fallback/></xi:include>
274+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('constant.ini-mode')/*)"/>
275275
-->
276276
<title>INI mode constants</title>
277277
<varlistentry>

language/predefined/argumentcounterror.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,11 @@
3232
</ooclass>
3333

3434
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
35-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
36-
<xi:fallback/>
37-
</xi:include>
35+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
3836

3937
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
40-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
41-
<xi:fallback/>
42-
</xi:include>
43-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
44-
<xi:fallback/>
45-
</xi:include>
38+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])"/>
39+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])"/>
4640
</classsynopsis>
4741

4842
</section>

language/predefined/arithmeticerror.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@
3131
</ooclass>
3232

3333
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
34-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
35-
<xi:fallback/>
36-
</xi:include>
34+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
3735

3836
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
39-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
40-
<xi:fallback/>
41-
</xi:include>
42-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
43-
<xi:fallback/>
44-
</xi:include>
37+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])"/>
38+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])"/>
4539
</classsynopsis>
4640

4741
</section>

language/predefined/arrayaccess.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
</oointerface>
2424

2525
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
26-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.arrayaccess')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ArrayAccess'])">
27-
<xi:fallback/>
28-
</xi:include>
26+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.arrayaccess')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='ArrayAccess'])"/>
2927
</classsynopsis>
3028

3129
</section>

0 commit comments

Comments
 (0)