From 437bbf134e015c678f9d4b8a5b8da53429a9a12d Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Thu, 20 Sep 2018 15:10:00 +0000 Subject: [PATCH] Show inherited constants We do this for the classes of the core and bundled extensions only, for now. This also allows us to remove some slightly incorrect and unnecessary copy and paste documentation, where inherited constants have been explicitly documented for child classes. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345662 c90b9560-bf6c-de11-be94-00142212c4b1 --- language-defs.ent | 1 + reference/intl/intlcodepointbreakiterator.xml | 262 +-------- reference/intl/intlgregoriancalendar.xml | 524 +----------------- reference/intl/intlrulebasedbreakiterator.xml | 262 +-------- reference/phar/Phar.xml | 5 + reference/phar/PharData.xml | 5 + reference/reflection/reflectionobject.xml | 23 +- reference/spl/globiterator.xml | 7 +- reference/spl/recursivearrayiterator.xml | 6 + reference/spl/recursivecachingiterator.xml | 7 +- reference/spl/recursivedirectoryiterator.xml | 7 +- reference/spl/recursiveregexiterator.xml | 5 + reference/spl/recursivetreeiterator.xml | 5 + reference/spl/spltempfileobject.xml | 6 +- 14 files changed, 66 insertions(+), 1059 deletions(-) diff --git a/language-defs.ent b/language-defs.ent index 05bdf9f645..2dc065058f 100644 --- a/language-defs.ent +++ b/language-defs.ent @@ -76,6 +76,7 @@ + diff --git a/reference/intl/intlcodepointbreakiterator.xml b/reference/intl/intlcodepointbreakiterator.xml index 58ea433e7a..b31d203716 100644 --- a/reference/intl/intlcodepointbreakiterator.xml +++ b/reference/intl/intlcodepointbreakiterator.xml @@ -41,121 +41,10 @@ - Constants - - const - integer - IntlCodePointBreakIterator::DONE - -1 - - - const - integer - IntlCodePointBreakIterator::WORD_NONE - 0 - - - const - integer - IntlCodePointBreakIterator::WORD_NONE_LIMIT - 100 - - - const - integer - IntlCodePointBreakIterator::WORD_NUMBER - 100 - - - const - integer - IntlCodePointBreakIterator::WORD_NUMBER_LIMIT - 200 - - - const - integer - IntlCodePointBreakIterator::WORD_LETTER - 200 - - - const - integer - IntlCodePointBreakIterator::WORD_LETTER_LIMIT - 300 - - - const - integer - IntlCodePointBreakIterator::WORD_KANA - 300 - - - const - integer - IntlCodePointBreakIterator::WORD_KANA_LIMIT - 400 - - - const - integer - IntlCodePointBreakIterator::WORD_IDEO - 400 - - - const - integer - IntlCodePointBreakIterator::WORD_IDEO_LIMIT - 500 - - - const - integer - IntlCodePointBreakIterator::LINE_SOFT - 0 - - - const - integer - IntlCodePointBreakIterator::LINE_SOFT_LIMIT - 100 - - - const - integer - IntlCodePointBreakIterator::LINE_HARD - 100 - - - const - integer - IntlCodePointBreakIterator::LINE_HARD_LIMIT - 200 - - - const - integer - IntlCodePointBreakIterator::SENTENCE_TERM - 0 - - - const - integer - IntlCodePointBreakIterator::SENTENCE_TERM_LIMIT - 100 - - - const - integer - IntlCodePointBreakIterator::SENTENCE_SEP - 100 - - - const - integer - IntlCodePointBreakIterator::SENTENCE_SEP_LIMIT - 200 - + &InheritedConstants; + + + &Methods; @@ -168,149 +57,6 @@ - -
- &reftitle.constants; - - - - IntlCodePointBreakIterator::DONE - - - - - - - IntlCodePointBreakIterator::WORD_NONE - - - - - - - IntlCodePointBreakIterator::WORD_NONE_LIMIT - - - - - - - IntlCodePointBreakIterator::WORD_NUMBER - - - - - - - IntlCodePointBreakIterator::WORD_NUMBER_LIMIT - - - - - - - IntlCodePointBreakIterator::WORD_LETTER - - - - - - - IntlCodePointBreakIterator::WORD_LETTER_LIMIT - - - - - - - IntlCodePointBreakIterator::WORD_KANA - - - - - - - IntlCodePointBreakIterator::WORD_KANA_LIMIT - - - - - - - IntlCodePointBreakIterator::WORD_IDEO - - - - - - - IntlCodePointBreakIterator::WORD_IDEO_LIMIT - - - - - - - IntlCodePointBreakIterator::LINE_SOFT - - - - - - - IntlCodePointBreakIterator::LINE_SOFT_LIMIT - - - - - - - IntlCodePointBreakIterator::LINE_HARD - - - - - - - IntlCodePointBreakIterator::LINE_HARD_LIMIT - - - - - - - IntlCodePointBreakIterator::SENTENCE_TERM - - - - - - - IntlCodePointBreakIterator::SENTENCE_TERM_LIMIT - - - - - - - IntlCodePointBreakIterator::SENTENCE_SEP - - - - - - - IntlCodePointBreakIterator::SENTENCE_SEP_LIMIT - - - - - - -
- - - &reference.intl.entities.intlcodepointbreakiterator; diff --git a/reference/intl/intlgregoriancalendar.xml b/reference/intl/intlgregoriancalendar.xml index a1d5f7d9ad..9bc9290461 100644 --- a/reference/intl/intlgregoriancalendar.xml +++ b/reference/intl/intlgregoriancalendar.xml @@ -36,242 +36,11 @@ - Constants - - const - integer - IntlGregorianCalendar::FIELD_ERA - 0 - - - const - integer - IntlGregorianCalendar::FIELD_YEAR - 1 - - - const - integer - IntlGregorianCalendar::FIELD_MONTH - 2 - - - const - integer - IntlGregorianCalendar::FIELD_WEEK_OF_YEAR - 3 - - - const - integer - IntlGregorianCalendar::FIELD_WEEK_OF_MONTH - 4 - - - const - integer - IntlGregorianCalendar::FIELD_DATE - 5 - - - const - integer - IntlGregorianCalendar::FIELD_DAY_OF_YEAR - 6 - - - const - integer - IntlGregorianCalendar::FIELD_DAY_OF_WEEK - 7 - - - const - integer - IntlGregorianCalendar::FIELD_DAY_OF_WEEK_IN_MONTH - 8 - - - const - integer - IntlGregorianCalendar::FIELD_AM_PM - 9 - - - const - integer - IntlGregorianCalendar::FIELD_HOUR - 10 - - - const - integer - IntlGregorianCalendar::FIELD_HOUR_OF_DAY - 11 - - - const - integer - IntlGregorianCalendar::FIELD_MINUTE - 12 - - - const - integer - IntlGregorianCalendar::FIELD_SECOND - 13 - - - const - integer - IntlGregorianCalendar::FIELD_MILLISECOND - 14 - - - const - integer - IntlGregorianCalendar::FIELD_ZONE_OFFSET - 15 - - - const - integer - IntlGregorianCalendar::FIELD_DST_OFFSET - 16 - - - const - integer - IntlGregorianCalendar::FIELD_YEAR_WOY - 17 - - - const - integer - IntlGregorianCalendar::FIELD_DOW_LOCAL - 18 - - - const - integer - IntlGregorianCalendar::FIELD_EXTENDED_YEAR - 19 - - - const - integer - IntlGregorianCalendar::FIELD_JULIAN_DAY - 20 - - - const - integer - IntlGregorianCalendar::FIELD_MILLISECONDS_IN_DAY - 21 - - - const - integer - IntlGregorianCalendar::FIELD_IS_LEAP_MONTH - 22 - - - const - integer - IntlGregorianCalendar::FIELD_FIELD_COUNT - 23 - - - const - integer - IntlGregorianCalendar::FIELD_DAY_OF_MONTH - 5 - - - const - integer - IntlGregorianCalendar::DOW_SUNDAY - 1 - - - const - integer - IntlGregorianCalendar::DOW_MONDAY - 2 - - - const - integer - IntlGregorianCalendar::DOW_TUESDAY - 3 - - - const - integer - IntlGregorianCalendar::DOW_WEDNESDAY - 4 - - - const - integer - IntlGregorianCalendar::DOW_THURSDAY - 5 - - - const - integer - IntlGregorianCalendar::DOW_FRIDAY - 6 - - - const - integer - IntlGregorianCalendar::DOW_SATURDAY - 7 - - - const - integer - IntlGregorianCalendar::DOW_TYPE_WEEKDAY - 0 - - - const - integer - IntlGregorianCalendar::DOW_TYPE_WEEKEND - 1 - - - const - integer - IntlGregorianCalendar::DOW_TYPE_WEEKEND_OFFSET - 2 - - - const - integer - IntlGregorianCalendar::DOW_TYPE_WEEKEND_CEASE - 3 - - - const - integer - IntlGregorianCalendar::WALLTIME_FIRST - 1 - - - const - integer - IntlGregorianCalendar::WALLTIME_LAST - 0 - - - const - integer - IntlGregorianCalendar::WALLTIME_NEXT_VALID - 2 - - + &InheritedConstants; + + + + &Methods; @@ -284,289 +53,6 @@ - -
- &reftitle.constants; - - - - IntlGregorianCalendar::FIELD_ERA - - - - - - - IntlGregorianCalendar::FIELD_YEAR - - - - - - - IntlGregorianCalendar::FIELD_MONTH - - - - - - - IntlGregorianCalendar::FIELD_WEEK_OF_YEAR - - - - - - - IntlGregorianCalendar::FIELD_WEEK_OF_MONTH - - - - - - - IntlGregorianCalendar::FIELD_DATE - - - - - - - IntlGregorianCalendar::FIELD_DAY_OF_YEAR - - - - - - - IntlGregorianCalendar::FIELD_DAY_OF_WEEK - - - - - - - IntlGregorianCalendar::FIELD_DAY_OF_WEEK_IN_MONTH - - - - - - - IntlGregorianCalendar::FIELD_AM_PM - - - - - - - IntlGregorianCalendar::FIELD_HOUR - - - - - - - IntlGregorianCalendar::FIELD_HOUR_OF_DAY - - - - - - - IntlGregorianCalendar::FIELD_MINUTE - - - - - - - IntlGregorianCalendar::FIELD_SECOND - - - - - - - IntlGregorianCalendar::FIELD_MILLISECOND - - - - - - - IntlGregorianCalendar::FIELD_ZONE_OFFSET - - - - - - - IntlGregorianCalendar::FIELD_DST_OFFSET - - - - - - - IntlGregorianCalendar::FIELD_YEAR_WOY - - - - - - - IntlGregorianCalendar::FIELD_DOW_LOCAL - - - - - - - IntlGregorianCalendar::FIELD_EXTENDED_YEAR - - - - - - - IntlGregorianCalendar::FIELD_JULIAN_DAY - - - - - - - IntlGregorianCalendar::FIELD_MILLISECONDS_IN_DAY - - - - - - - IntlGregorianCalendar::FIELD_IS_LEAP_MONTH - - - - - - - IntlGregorianCalendar::FIELD_FIELD_COUNT - - - - - - - IntlGregorianCalendar::FIELD_DAY_OF_MONTH - - - - - - - IntlGregorianCalendar::DOW_SUNDAY - - - - - - - IntlGregorianCalendar::DOW_MONDAY - - - - - - - IntlGregorianCalendar::DOW_TUESDAY - - - - - - - IntlGregorianCalendar::DOW_WEDNESDAY - - - - - - - IntlGregorianCalendar::DOW_THURSDAY - - - - - - - IntlGregorianCalendar::DOW_FRIDAY - - - - - - - IntlGregorianCalendar::DOW_SATURDAY - - - - - - - IntlGregorianCalendar::DOW_TYPE_WEEKDAY - - - - - - - IntlGregorianCalendar::DOW_TYPE_WEEKEND - - - - - - - IntlGregorianCalendar::DOW_TYPE_WEEKEND_OFFSET - - - - - - - IntlGregorianCalendar::DOW_TYPE_WEEKEND_CEASE - - - - - - - IntlGregorianCalendar::WALLTIME_FIRST - - - - - - - IntlGregorianCalendar::WALLTIME_LAST - - - - - - - IntlGregorianCalendar::WALLTIME_NEXT_VALID - - - - - - -
- - - &reference.intl.entities.intlgregoriancalendar; diff --git a/reference/intl/intlrulebasedbreakiterator.xml b/reference/intl/intlrulebasedbreakiterator.xml index 2ec5ff8926..6e90ab86f6 100644 --- a/reference/intl/intlrulebasedbreakiterator.xml +++ b/reference/intl/intlrulebasedbreakiterator.xml @@ -47,121 +47,10 @@ - Constants - - const - integer - IntlRuleBasedBreakIterator::DONE - -1 - - - const - integer - IntlRuleBasedBreakIterator::WORD_NONE - 0 - - - const - integer - IntlRuleBasedBreakIterator::WORD_NONE_LIMIT - 100 - - - const - integer - IntlRuleBasedBreakIterator::WORD_NUMBER - 100 - - - const - integer - IntlRuleBasedBreakIterator::WORD_NUMBER_LIMIT - 200 - - - const - integer - IntlRuleBasedBreakIterator::WORD_LETTER - 200 - - - const - integer - IntlRuleBasedBreakIterator::WORD_LETTER_LIMIT - 300 - - - const - integer - IntlRuleBasedBreakIterator::WORD_KANA - 300 - - - const - integer - IntlRuleBasedBreakIterator::WORD_KANA_LIMIT - 400 - - - const - integer - IntlRuleBasedBreakIterator::WORD_IDEO - 400 - - - const - integer - IntlRuleBasedBreakIterator::WORD_IDEO_LIMIT - 500 - - - const - integer - IntlRuleBasedBreakIterator::LINE_SOFT - 0 - - - const - integer - IntlRuleBasedBreakIterator::LINE_SOFT_LIMIT - 100 - - - const - integer - IntlRuleBasedBreakIterator::LINE_HARD - 100 - - - const - integer - IntlRuleBasedBreakIterator::LINE_HARD_LIMIT - 200 - - - const - integer - IntlRuleBasedBreakIterator::SENTENCE_TERM - 0 - - - const - integer - IntlRuleBasedBreakIterator::SENTENCE_TERM_LIMIT - 100 - - - const - integer - IntlRuleBasedBreakIterator::SENTENCE_SEP - 100 - - - const - integer - IntlRuleBasedBreakIterator::SENTENCE_SEP_LIMIT - 200 - + &InheritedConstants; + + + &Methods; @@ -174,149 +63,6 @@ - -
- &reftitle.constants; - - - - IntlRuleBasedBreakIterator::DONE - - - - - - - IntlRuleBasedBreakIterator::WORD_NONE - - - - - - - IntlRuleBasedBreakIterator::WORD_NONE_LIMIT - - - - - - - IntlRuleBasedBreakIterator::WORD_NUMBER - - - - - - - IntlRuleBasedBreakIterator::WORD_NUMBER_LIMIT - - - - - - - IntlRuleBasedBreakIterator::WORD_LETTER - - - - - - - IntlRuleBasedBreakIterator::WORD_LETTER_LIMIT - - - - - - - IntlRuleBasedBreakIterator::WORD_KANA - - - - - - - IntlRuleBasedBreakIterator::WORD_KANA_LIMIT - - - - - - - IntlRuleBasedBreakIterator::WORD_IDEO - - - - - - - IntlRuleBasedBreakIterator::WORD_IDEO_LIMIT - - - - - - - IntlRuleBasedBreakIterator::LINE_SOFT - - - - - - - IntlRuleBasedBreakIterator::LINE_SOFT_LIMIT - - - - - - - IntlRuleBasedBreakIterator::LINE_HARD - - - - - - - IntlRuleBasedBreakIterator::LINE_HARD_LIMIT - - - - - - - IntlRuleBasedBreakIterator::SENTENCE_TERM - - - - - - - IntlRuleBasedBreakIterator::SENTENCE_TERM_LIMIT - - - - - - - IntlRuleBasedBreakIterator::SENTENCE_SEP - - - - - - - IntlRuleBasedBreakIterator::SENTENCE_SEP_LIMIT - - - - - - -
- - - &reference.intl.entities.intlrulebasedbreakiterator; diff --git a/reference/phar/Phar.xml b/reference/phar/Phar.xml index d996c4d0b4..85a941ce01 100644 --- a/reference/phar/Phar.xml +++ b/reference/phar/Phar.xml @@ -47,6 +47,11 @@ + &InheritedConstants; + + + + &Methods; diff --git a/reference/phar/PharData.xml b/reference/phar/PharData.xml index fea688cad9..a6ef62a959 100644 --- a/reference/phar/PharData.xml +++ b/reference/phar/PharData.xml @@ -41,6 +41,11 @@ + &InheritedConstants; + + + + &Methods; diff --git a/reference/reflection/reflectionobject.xml b/reference/reflection/reflectionobject.xml index b66362fcfd..cb0f6827fe 100644 --- a/reference/reflection/reflectionobject.xml +++ b/reference/reflection/reflectionobject.xml @@ -41,25 +41,10 @@ - &Constants; - - const - integer - ReflectionObject::IS_IMPLICIT_ABSTRACT - 16 - - - const - integer - ReflectionObject::IS_EXPLICIT_ABSTRACT - 32 - - - const - integer - ReflectionObject::IS_FINAL - 64 - + &InheritedConstants; + + + &Properties; diff --git a/reference/spl/globiterator.xml b/reference/spl/globiterator.xml index dbaaa8aa36..f44ba9e92f 100644 --- a/reference/spl/globiterator.xml +++ b/reference/spl/globiterator.xml @@ -45,7 +45,12 @@ - + + &InheritedConstants; + + + + &Methods; diff --git a/reference/spl/recursivearrayiterator.xml b/reference/spl/recursivearrayiterator.xml index e7a3d69f7b..e1ef78d8b3 100644 --- a/reference/spl/recursivearrayiterator.xml +++ b/reference/spl/recursivearrayiterator.xml @@ -40,6 +40,12 @@ + + &InheritedConstants; + + + + &Constants; const diff --git a/reference/spl/recursivecachingiterator.xml b/reference/spl/recursivecachingiterator.xml index 8a79f3321d..3ae8aef559 100644 --- a/reference/spl/recursivecachingiterator.xml +++ b/reference/spl/recursivecachingiterator.xml @@ -51,7 +51,12 @@ - + + &InheritedConstants; + + + + - + + &InheritedConstants; + + + + + &InheritedConstants; + + + + + &InheritedConstants; + + + + &Constants; const diff --git a/reference/spl/spltempfileobject.xml b/reference/spl/spltempfileobject.xml index 9088c98efb..2c8d812a1b 100644 --- a/reference/spl/spltempfileobject.xml +++ b/reference/spl/spltempfileobject.xml @@ -45,8 +45,10 @@ - Inherited Constants - + &InheritedConstants; + + + &Methods;