From ff3b80ea3fe1091c54aa6268751411f96e5f8512 Mon Sep 17 00:00:00 2001
From: Sergey Panteleev <sergey@php.net>
Date: Mon, 3 Jul 2023 16:56:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=20=D0=B0=D0=BD=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B9=D1=81=D0=BA=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reference/ds/ds.collection.xml         | 14 +++++++++++---
 reference/ds/ds.deque.xml              |  4 ++--
 reference/ds/ds.hashable.xml           |  6 +++---
 reference/ds/ds.map.xml                |  4 ++--
 reference/ds/ds.pair.xml               |  4 ++--
 reference/ds/ds.priorityqueue.xml      |  4 ++--
 reference/ds/ds.queue.xml              |  4 ++--
 reference/ds/ds.sequence.xml           | 14 +++++++++++---
 reference/ds/ds.set.xml                |  4 ++--
 reference/ds/ds.stack.xml              |  4 ++--
 reference/ds/ds.vector.xml             |  4 ++--
 reference/ds/ds/collection/clear.xml   |  4 ++--
 reference/ds/ds/collection/copy.xml    |  4 ++--
 reference/ds/ds/collection/isempty.xml |  4 ++--
 reference/ds/ds/collection/toarray.xml |  4 ++--
 15 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/reference/ds/ds.collection.xml b/reference/ds/ds.collection.xml
index acf29306d..bcf2ef915 100644
--- a/reference/ds/ds.collection.xml
+++ b/reference/ds/ds.collection.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 12ce6e72ca28e72210106583c62e098458c63e24 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: d8a8d40e32ce1bb90915f9ffdf5e72e1a764c1f1 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-collection" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Интерфейс Collection</title>
- <titleabbrev>Коллекция</titleabbrev>
+ <titleabbrev>Ds\Collection</titleabbrev>
 
  <partintro>
 
@@ -24,7 +24,7 @@
    &reftitle.interfacesynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass><classname>Ds\Collection</classname></ooclass>
 
     <!-- {{{ Class synopsis -->
@@ -41,6 +41,14 @@
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+
+    <classsynopsisinfo role="comment">Inherited methods</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.countable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.jsonserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
    <!-- }}} -->
 
diff --git a/reference/ds/ds.deque.xml b/reference/ds/ds.deque.xml
index 6b57e029b..98e5d676f 100644
--- a/reference/ds/ds.deque.xml
+++ b/reference/ds/ds.deque.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-deque" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Deque</title>
- <titleabbrev>Двухсторонняя очередь</titleabbrev>
+ <titleabbrev>Ds\Deque</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.hashable.xml b/reference/ds/ds.hashable.xml
index 813418daa..65f754b73 100644
--- a/reference/ds/ds.hashable.xml
+++ b/reference/ds/ds.hashable.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: da1b2b494ae55fa085f27bbd6b706e07675f8689 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: d8a8d40e32ce1bb90915f9ffdf5e72e1a764c1f1 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-hashable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Интерфейс Hashable</title>
- <titleabbrev>Хешируемое</titleabbrev>
+ <titleabbrev>Ds\Hashable</titleabbrev>
 
  <partintro>
 
@@ -38,7 +38,7 @@
    &reftitle.interfacesynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass><classname>Ds\Hashable</classname></ooclass>
 
     <!-- {{{ Class synopsis -->
diff --git a/reference/ds/ds.map.xml b/reference/ds/ds.map.xml
index f28877ad4..c9c38d131 100644
--- a/reference/ds/ds.map.xml
+++ b/reference/ds/ds.map.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-map" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Map</title>
- <titleabbrev>Коллекция пар ключ-значение</titleabbrev>
+ <titleabbrev>Ds\Map</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.pair.xml b/reference/ds/ds.pair.xml
index 37b21c844..4a3b7ea15 100644
--- a/reference/ds/ds.pair.xml
+++ b/reference/ds/ds.pair.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: b04617a197b30060f88e1f7392168291adfbaec7 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-pair" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Pair</title>
- <titleabbrev>Пара</titleabbrev>
+ <titleabbrev>Ds\Pair</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.priorityqueue.xml b/reference/ds/ds.priorityqueue.xml
index 6333ab537..775d6af1d 100644
--- a/reference/ds/ds.priorityqueue.xml
+++ b/reference/ds/ds.priorityqueue.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: da1b2b494ae55fa085f27bbd6b706e07675f8689 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 
 <phpdoc:classref xml:id="class.ds-priorityqueue" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс PriorityQueue</title>
- <titleabbrev>Очередь с приоритетом</titleabbrev>
+ <titleabbrev>Ds\PriorityQueue</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.queue.xml b/reference/ds/ds.queue.xml
index 420741859..13ff16f5e 100644
--- a/reference/ds/ds.queue.xml
+++ b/reference/ds/ds.queue.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-queue" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Queue</title>
- <titleabbrev>Очередь</titleabbrev>
+ <titleabbrev>Ds\Queue</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.sequence.xml b/reference/ds/ds.sequence.xml
index 6d05250bd..9faae0216 100644
--- a/reference/ds/ds.sequence.xml
+++ b/reference/ds/ds.sequence.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: f8cfba6f0b37346761745e2a78d1cfa1201b5b2c Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-sequence" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Интерфейс Sequence</title>
- <titleabbrev>Последовательность</titleabbrev>
+ <titleabbrev>Ds\Sequence</titleabbrev>
 
  <partintro>
 
@@ -38,7 +38,7 @@
    &reftitle.interfacesynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass><classname>Ds\Sequence</classname></ooclass>
 
     <!-- {{{ Class synopsis -->
@@ -53,6 +53,14 @@
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-sequence')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+
+    <classsynopsisinfo role="comment">Inherited methods</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.arrayaccess')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
    <!-- }}} -->
 
diff --git a/reference/ds/ds.set.xml b/reference/ds/ds.set.xml
index 915ab5f2c..33fcf1cee 100644
--- a/reference/ds/ds.set.xml
+++ b/reference/ds/ds.set.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-set" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Set</title>
- <titleabbrev>Набор</titleabbrev>
+ <titleabbrev>Ds\Set</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.stack.xml b/reference/ds/ds.stack.xml
index 2ee9bb726..b8606558d 100644
--- a/reference/ds/ds.stack.xml
+++ b/reference/ds/ds.stack.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-stack" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Stack</title>
- <titleabbrev>Стек</titleabbrev>
+ <titleabbrev>Ds\Stack</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds.vector.xml b/reference/ds/ds.vector.xml
index 0314fe1f6..eb9954998 100644
--- a/reference/ds/ds.vector.xml
+++ b/reference/ds/ds.vector.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 120c22c98da2e643a41537f570da1cd5162df47f Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: b2a26b15a817e66ca3f4fe945bd21444cfc5a567 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <phpdoc:classref xml:id="class.ds-vector" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>Класс Vector</title>
- <titleabbrev>Вектор</titleabbrev>
+ <titleabbrev>Ds\Vector</titleabbrev>
 
  <partintro>
 
diff --git a/reference/ds/ds/collection/clear.xml b/reference/ds/ds/collection/clear.xml
index bbf592173..986dd3442 100644
--- a/reference/ds/ds/collection/clear.xml
+++ b/reference/ds/ds/collection/clear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: dd07341fae2c414adc1f700be0890ff32e8daab4 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 6bd5455a1182b2fde145efde92d654815eed7459 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <refentry xml:id="ds-collection.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Collection::clear</methodname>
+   <modifier>public</modifier> <type>void</type><methodname>Ds\Collection::clear</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/ds/ds/collection/copy.xml b/reference/ds/ds/collection/copy.xml
index 82a3c4c76..19250ae8a 100644
--- a/reference/ds/ds/collection/copy.xml
+++ b/reference/ds/ds/collection/copy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: dd07341fae2c414adc1f700be0890ff32e8daab4 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 6bd5455a1182b2fde145efde92d654815eed7459 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <refentry xml:id="ds-collection.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Collection</type><methodname>Ds\Collection::copy</methodname>
+   <modifier>public</modifier> <type>Ds\Collection</type><methodname>Ds\Collection::copy</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/ds/ds/collection/isempty.xml b/reference/ds/ds/collection/isempty.xml
index 08825efec..4deb29c74 100644
--- a/reference/ds/ds/collection/isempty.xml
+++ b/reference/ds/ds/collection/isempty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 845661fc0754def49ac430acb36a9fedc13ea95a Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 6bd5455a1182b2fde145efde92d654815eed7459 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <refentry xml:id="ds-collection.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Ds\Collection::isEmpty</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>Ds\Collection::isEmpty</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/ds/ds/collection/toarray.xml b/reference/ds/ds/collection/toarray.xml
index 213b6a44f..7c6927a1a 100644
--- a/reference/ds/ds/collection/toarray.xml
+++ b/reference/ds/ds/collection/toarray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: dd07341fae2c414adc1f700be0890ff32e8daab4 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 6bd5455a1182b2fde145efde92d654815eed7459 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 <refentry xml:id="ds-collection.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -12,7 +12,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>array</type><methodname>Ds\Collection::toArray</methodname>
+   <modifier>public</modifier> <type>array</type><methodname>Ds\Collection::toArray</methodname>
    <void />
   </methodsynopsis>
   <para>