fix compile property from trait and constructor parameter property

peachpiecompiler · Feb 23, 2025 · b4abb22 · b4abb22
1 parent ad88b1b
commit b4abb22
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Peachpie.CodeAnalysis/Symbols/Source/SourceTypeSymbol.cs b/src/Peachpie.CodeAnalysis/Symbols/Source/SourceTypeSymbol.cs
@@ -13,7 +13,6 @@
 using System.Globalization;
 using System.Threading;
 using Microsoft.CodeAnalysis.Text;
-using static Pchp.CodeAnalysis.AstUtils;
 using Pchp.CodeAnalysis.Utilities;
 using Pchp.CodeAnalysis.Errors;
 using System.IO;
@@ -1453,17 +1452,20 @@ public IEnumerable<Symbol> TraitMembers
                         {
                             if (s is SynthesizedFieldSymbol fld)
                             {
-                                if (fieldsset == null) fieldsset = new HashSet<string>();
+                                if (fieldsset == null)
+                                {
+                                    fieldsset = new HashSet<string>();
+                                }
 
                                 if (fieldsset.Add(fld.Name) == false)
                                 {
                                     // field already declared
                                     return false;
                                 }
 
-                                if (this.Syntax.Members.OfType<FieldDeclList>().SelectMany(list => list.Fields).Select(fdecl => fdecl.Name.Value).Contains(fld.Name))
+                                var members = EnsureMembers(); // get symbols declared in this type, without traits
+                                if (members.Any(m => m is IFieldSymbol f && f.Name == fld.Name))
                                 {
-                                    // field already declared by containing class
                                     return false;
                                 }
                             }