From 255e5e1af6c00fbed853b2657215a8f98fb168da Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 6 Dec 2023 06:28:26 +0000
Subject: [PATCH 1/2] Add Override Attribute stub

---
 language/predefined/attributes.xml            |  1 +
 language/predefined/attributes/override.xml   | 64 +++++++++++++++++++
 .../attributes/override/construct.xml         | 44 +++++++++++++
 language/predefined/versions.xml              |  2 +
 4 files changed, 111 insertions(+)
 create mode 100644 language/predefined/attributes/override.xml
 create mode 100644 language/predefined/attributes/override/construct.xml

diff --git a/language/predefined/attributes.xml b/language/predefined/attributes.xml
index 4b94a82d5970..30d757915ecb 100644
--- a/language/predefined/attributes.xml
+++ b/language/predefined/attributes.xml
@@ -10,6 +10,7 @@
 
  &language.predefined.attributes.attribute;
  &language.predefined.attributes.allowdynamicproperties;
+ &language.predefined.attributes.override;
  &language.predefined.attributes.returntypewillchange;
  &language.predefined.attributes.sensitiveparameter;
 </part>
diff --git a/language/predefined/attributes/override.xml b/language/predefined/attributes/override.xml
new file mode 100644
index 000000000000..9da9e2fdea00
--- /dev/null
+++ b/language/predefined/attributes/override.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpdoc:classref xml:id="class.override" 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>The Override class</title>
+ <titleabbrev>Override</titleabbrev>
+
+ <partintro>
+
+  <section xml:id="override.intro">
+   &reftitle.intro;
+   <para>
+   </para>
+  </section>
+
+  <section xml:id="override.synopsis">
+   &reftitle.classsynopsis;
+
+   <classsynopsis class="class">
+    <ooclass>
+     <modifier>final</modifier>
+     <classname>Override</classname>
+    </ooclass>
+
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.override')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Override'])">
+     <xi:fallback/>
+    </xi:include>
+   </classsynopsis>
+
+  </section>
+
+  <section xml:id="override.seealso">
+   &reftitle.seealso;
+   <para>
+    <simplelist>
+     <member><link linkend="language.attributes">Attributes overview</link></member>
+    </simplelist>
+   </para>
+  </section>
+
+ </partintro>
+
+ &language.predefined.attributes.override.construct;
+
+</phpdoc:classref>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/language/predefined/attributes/override/construct.xml b/language/predefined/attributes/override/construct.xml
new file mode 100644
index 000000000000..baa4cda4f921
--- /dev/null
+++ b/language/predefined/attributes/override/construct.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+<refentry xml:id="override.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>Override::__construct</refname>
+  <refpurpose>Construct a new Override attribute instance</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <constructorsynopsis role="Override">
+   <modifier>public</modifier> <methodname>Override::__construct</methodname>
+   <void/>
+  </constructorsynopsis>
+  <para>
+   Constructs a new <classname>Override</classname> instance.
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+</refentry>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/language/predefined/versions.xml b/language/predefined/versions.xml
index fb8e12c8def4..a046fd4e17e3 100644
--- a/language/predefined/versions.xml
+++ b/language/predefined/versions.xml
@@ -173,6 +173,8 @@
  <function name="SensitiveParameterValue::__construct" from="PHP 8 &gt;= 8.2.0"/>
  <function name="SensitiveParameterValue::__debugInfo" from="PHP 8 &gt;= 8.2.0"/>
  <function name="SensitiveParameterValue::getValue" from="PHP 8 &gt;= 8.2.0"/>
+ <function name="Override" from="PHP 8 &gt;= 8.3.0"/>
+ <function name="Override::__construct" from="PHP 8 &gt;= 8.3.0"/>
 </versions>
 <!-- Keep this comment at the end of the file
 Local variables:

From 9db49a5ef75ea11fe32e44919dd67d4d476c1d4d Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Sun, 31 Dec 2023 17:27:33 +0000
Subject: [PATCH 2/2] Add example

---
 language-snippets.ent                       |  4 +++
 language/predefined/attributes/override.xml | 28 +++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/language-snippets.ent b/language-snippets.ent
index 320c517542c7..a69a8d782e66 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -621,6 +621,10 @@ is highly discouraged.</simpara></warning>
 
 <!ENTITY example.outputs.82.similar '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 8.2 is similar to:</para>'>
 
+<!ENTITY example.outputs.83 '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 8.3:</para>'>
+
+<!ENTITY example.outputs.83.similar '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 8.3 is similar to:</para>'>
+
 <!ENTITY example.outputs.32bit '<para xmlns="http://docbook.org/ns/docbook">Output of the above example on 32 bit machines:</para>'>
 
 <!ENTITY example.outputs.64bit '<para xmlns="http://docbook.org/ns/docbook">Output of the above example on 64 bit machines:</para>'>
diff --git a/language/predefined/attributes/override.xml b/language/predefined/attributes/override.xml
index 9da9e2fdea00..511f51a59be8 100644
--- a/language/predefined/attributes/override.xml
+++ b/language/predefined/attributes/override.xml
@@ -28,6 +28,34 @@
 
   </section>
 
+  <section>
+   &reftitle.examples;
+   <example>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+class Base {
+    protected function foo(): void {}
+}
+
+final class Extended extends Base {
+    #[\Override]
+    protected function boo(): void {}
+}
+
+?>
+]]>
+    </programlisting>
+    &example.outputs.83.similar;
+    <screen>
+<![CDATA[
+Fatal error: Extended::boo() has #[\Override] attribute, but no matching parent method exists
+]]>
+    </screen>
+   </example>
+  </section>
+
   <section xml:id="override.seealso">
    &reftitle.seealso;
    <para>