From 9109661d021d388d498bb9d75b49420e8f8578db Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Fri, 11 Nov 2022 14:58:58 +0000
Subject: [PATCH 1/2] Update trait docs for PHP-8.2

The docs for traits probably need a good overhaul
---
 language/oop5/traits.xml | 62 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/language/oop5/traits.xml b/language/oop5/traits.xml
index 20c4bbcfcf04..29584fdff552 100644
--- a/language/oop5/traits.xml
+++ b/language/oop5/traits.xml
@@ -466,8 +466,8 @@ $example->x;
    </example>
    <para>
     If a trait defines a property then a class can not define a property with
-    the same name unless it is compatible (same visibility and initial value),
-    otherwise a fatal error is issued.
+    the same name unless it is compatible (same visibility and type,
+    readonly marker, and initial value), otherwise a fatal error is issued.
    </para>
    <example xml:id="language.oop5.traits.properties.conflicts">
     <title>Conflict Resolution</title>
@@ -476,13 +476,17 @@ $example->x;
 <?php
 trait PropertiesTrait {
     public $same = true;
-    public $different = false;
+    public $different1 = false;
+    public bool $different2;
+    readonly public bool $different3;
 }
 
 class PropertiesExample {
     use PropertiesTrait;
     public $same = true;
-    public $different = true; // Fatal error
+    public $different1 = true; // Fatal error
+    public string $different2; // Fatal error
+    readonly public bool $different3; // Fatal error
 }
 ?>
 ]]>
@@ -490,6 +494,56 @@ class PropertiesExample {
    </example>
   </sect2>
 
+ <sect2 xml:id="language.oop5.traits.constants">
+  <title>Constants</title>
+  <para>
+   Traits can, as of PHP 8.2.0, also define constants.
+  </para>
+  <example xml:id="language.oop5.traits.constants.example">
+   <title>Defining Constants</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+trait ConstantsTrait {
+    public const FLAG_MUTABLE = 1;
+    final public const FLAG_IMMUTABLE = 5;
+}
+
+class ConstantsExample {
+    use ConstantTrait;
+}
+
+$example = new ConstantExample;
+$example::FLAG;
+?>
+]]>
+   </programlisting>
+  </example>
+  <para>
+   If a trait defines a constants then a class can not define a constants with
+   the same name unless it is compatible (same visibility, initial value, and
+   finality), otherwise a fatal error is issued.
+  </para>
+  <example xml:id="language.oop5.traits.constants.conflicts">
+   <title>Conflict Resolution</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+trait ConstantsTrait {
+    public const FLAG_MUTABLE = 1;
+    final public const FLAG_IMMUTABLE = 5;
+}
+
+class ConstantsExample {
+    use ConstantTrait;
+    public const FLAG_IMMUTABLE = 5; // Fatal error
+}
+?>
+]]>
+   </programlisting>
+  </example>
+ </sect2>
+
  </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:

From 42718def9cbd4efe000b304f8a2c64930e68d293 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Wed, 30 Nov 2022 15:10:39 +0000
Subject: [PATCH 2/2] Tiny nits

---
 language/oop5/traits.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language/oop5/traits.xml b/language/oop5/traits.xml
index 29584fdff552..def5f124b25a 100644
--- a/language/oop5/traits.xml
+++ b/language/oop5/traits.xml
@@ -467,7 +467,7 @@ $example->x;
    <para>
     If a trait defines a property then a class can not define a property with
     the same name unless it is compatible (same visibility and type,
-    readonly marker, and initial value), otherwise a fatal error is issued.
+    readonly modifier, and initial value), otherwise a fatal error is issued.
    </para>
    <example xml:id="language.oop5.traits.properties.conflicts">
     <title>Conflict Resolution</title>
@@ -495,7 +495,7 @@ class PropertiesExample {
   </sect2>
 
  <sect2 xml:id="language.oop5.traits.constants">
-  <title>Constants</title>
+  <title>&Constants;</title>
   <para>
    Traits can, as of PHP 8.2.0, also define constants.
   </para>