From e4add76743c894a4e7fc51b19eb36078308b8591 Mon Sep 17 00:00:00 2001
From: Maciek Sokolewicz <tularis@php.net>
Date: Mon, 13 Mar 2017 18:35:13 +0000
Subject: [PATCH] Documents the issue described in bug 62537.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--
Provided by Pedro Magalhães (mail@pmmaga.net)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342111 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language/oop5/traits.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/language/oop5/traits.xml b/language/oop5/traits.xml
index bd0d70dea0..677b8267e3 100644
--- a/language/oop5/traits.xml
+++ b/language/oop5/traits.xml
@@ -436,9 +436,8 @@ $example->x;
    </example>
    <para>
     If a trait defines a property then a class can not define a property with
-    the same name, otherwise an error is issued. It is an
-    <constant>E_STRICT</constant> if the class definition is compatible (same
-    visibility and initial value) or fatal error otherwise.
+    the same name unless it is compatible (same visibility and initial value),
+    otherwise a fatal error is issued.
    </para>
    <example xml:id="language.oop5.traits.properties.conflicts">
     <title>Conflict Resolution</title>
@@ -452,7 +451,7 @@ trait PropertiesTrait {
 
 class PropertiesExample {
     use PropertiesTrait;
-    public $same = true; // Strict Standards
+    public $same = true; // Allowed
     public $different = true; // Fatal error
 }
 ?>