Create ArrayableTrait

src/ActiveRecord.php

@@ -6,7 +6,9 @@
 
 use IteratorAggregate;
 use Throwable;
+use Yiisoft\ActiveRecord\Trait\ArrayableTrait;
 use Yiisoft\ActiveRecord\Trait\ArrayIteratorTrait;
+use Yiisoft\Arrays\ArrayableInterface;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
@@ -85,8 +87,9 @@
  *
  * @template-implements IteratorAggregate<string, mixed>
  */
-class ActiveRecord extends BaseActiveRecord implements IteratorAggregate
+class ActiveRecord extends BaseActiveRecord implements ArrayableInterface, IteratorAggregate
 {
+    use ArrayableTrait;
     use ArrayIteratorTrait;
 
     /**

src/BaseActiveRecord.php

@@ -8,8 +8,6 @@
 use Closure;
 use ReflectionException;
 use Throwable;
-use Yiisoft\Arrays\ArrayableInterface;
-use Yiisoft\Arrays\ArrayableTrait;
 use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
@@ -20,7 +18,6 @@
 use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Helper\DbStringHelper;
 
-use function array_combine;
 use function array_diff_key;
 use function array_diff;
 use function array_fill_keys;
@@ -46,9 +43,8 @@
  *
  * @template-implements ArrayAccess<int, mixed>
  */
-abstract class BaseActiveRecord implements ActiveRecordInterface, ArrayAccess, ArrayableInterface
+abstract class BaseActiveRecord implements ActiveRecordInterface, ArrayAccess
 {
-    use ArrayableTrait;
     use BaseActiveRecordTrait;
 
     private array $attributes = [];
@@ -86,27 +82,6 @@ public function equals(ActiveRecordInterface $record): bool
         return $this->getTableName() === $record->getTableName() && $this->getPrimaryKey() === $record->getPrimaryKey();
     }
 
-    /**
-     * @return array The default implementation returns the names of the relations that have been populated into this
-     * record.
-     */
-    public function extraFields(): array
-    {
-        $fields = array_keys($this->getRelatedRecords());
-
-        return array_combine($fields, $fields);
-    }
-
-    /**
-     * @psalm-return array<string, string|Closure>
-     */
-    public function fields(): array
-    {
-        $fields = array_keys($this->attributes);
-
-        return array_combine($fields, $fields);
-    }
-
     public function getAttribute(string $name): mixed
     {
         return $this->attributes[$name] ?? null;

src/Trait/ArrayableTrait.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\ActiveRecord\Trait;
+
+use Closure;
+use Yiisoft\ActiveRecord\BaseActiveRecord;
+
+use function array_combine;
+use function array_keys;
+
+/**
+ * Trait to implement {@see \Yiisoft\Arrays\ArrayableTrait} interface for ActiveRecord.
+ *
+ * @method string[] attributes()
+ * @see BaseActiveRecord::attributes() for more info.
+ *
+ * @method array getRelatedRecords()
+ * @see BaseActiveRecord::getRelatedRecords() for more info.
+ */
+trait ArrayableTrait
+{
+    use \Yiisoft\Arrays\ArrayableTrait;
+
+    /**
+     * @return array The default implementation returns the names of the relations that have been populated into this
+     * record.
+     */
+    public function extraFields(): array
+    {
+        $fields = array_keys($this->getRelatedRecords());
+
+        return array_combine($fields, $fields);
+    }
+
+    /**
+     * @psalm-return array<string, string|Closure>
+     */
+    public function fields(): array
+    {
+        $fields = $this->attributes();
+
+        return array_combine($fields, $fields);
+    }
+}