Fix getDeclaredFields()

Author: thekid

ChangeLog.md

@@ -5,6 +5,7 @@ XP Framework Core ChangeLog
 
 ### Bugfixes
 
+* Fixed `lang.XPClass::getDeclaredFields()` throwing an exception - @thekid
 * Fixed issue #276: PHP 8.1: offset* / getIterator signature. Made codebase
   compatible with PHP 8.1 (*while keeping PHP 7 support!*) by adding the
   `#[ReturnTypeWillChange]` in relevant places.

src/main/php/lang/XPClass.class.php

@@ -295,9 +295,9 @@ public function getFields() {
    */
   public function getDeclaredFields() {
     $list= [];
-    $reflect= $this->reflect()->name;
+    $reflect= $this->reflect();
     foreach ($reflect->getProperties() as $p) {
-      if ('__id' === $p->name || $p->class !== $reflect) continue;
+      if ('__id' === $p->name || $p->class !== $reflect->name) continue;
       $list[]= new Field($this->_class, $p);
     }
     return $list;

src/test/php/net/xp_framework/unittest/reflection/FieldBasicsTest.class.php

@@ -68,4 +68,38 @@ public function string_representation($declaration, $expected) {
   public function trait_field_type() {
     $this->assertEquals('int', $this->type()->getField('NOT_INSTANCE')->getTypeName());
   }
+
+  #[Test]
+  public function all_fields() {
+    $fixture= $this->type('{ public $a= "Test", $b; }', [
+      'use' => []
+    ]);
+    $this->assertEquals(
+      ['a', 'b'],
+      array_map(function($f) { return $f->getName(); }, $fixture->getFields())
+    );
+  }
+
+  #[Test]
+  public function all_fields_include_base_class() {
+    $fixture= $this->type('{ public $declared= "Test"; public function getDate() { return null; }}', [
+      'use'     => [],
+      'extends' => [AbstractTestClass::class]
+    ]);
+    $this->assertEquals(
+      ['declared', 'inherited'],
+      array_map(function($f) { return $f->getName(); }, $fixture->getFields())
+    );
+  }
+
+  #[Test]
+  public function declared_fields() {
+    $fixture= $this->type('{ public $a= "Test", $b; }', [
+      'use' => []
+    ]);
+    $this->assertEquals(
+      ['a', 'b'],
+      array_map(function($f) { return $f->getName(); }, $fixture->getDeclaredFields())
+    );
+  }
 }