Use trait to get all raw properties

This might be just temporary until some solutions comes out of
cakephp/cakephp#8059.

Author: jadb

README.md

@@ -53,6 +53,10 @@ class CooksTable extends Table {
                 'assistant_chef' => 'App\Model\Entity\AssistantChef',
             ]
         ]);
+
+        // Optionally, set the default type. If none is defined, the
+        // first one (i.e. `chef`) will be used.
+        $this->entityClass('App\Model\Entity\AssistantChef');
     }
 }
 ```
@@ -63,6 +67,21 @@ Then create a class for every type of entity:
 - Baker
 - AssistantChef
 
+The entity that was previously defined to be the 'default' one will need to use the `StiAwareTrait`:
+
+```
+<?php // src/Model/Entity/AssistantChef.php
+namespace App\Model\Entity;
+
+use Cake\ORM\Entity;
+use Muffin\Model\Entity\StiAwareTrait;
+
+class AssistantChef extends Entity
+{
+    use StiAwareTrait;
+}
+```
+
 Optionally, you can create classes for your tables that extend the parent table to encapsulate business logic:
 
 ```php

src/Model/Behavior/StiBehavior.php

@@ -24,6 +24,16 @@ class StiBehavior extends Behavior
     public function initialize(array $config)
     {
         $this->verifyConfig();
+
+        $defaultEntityClass = $this->_table()->entityClass();
+        if ($defaultEntityClass === '\Cake\ORM\Entity') {
+            $defaultEntityClass = current(Hash::extract($this->_typeMap, '{s}.entityClass'));
+            $this->_table()->entityClass($defaultEntityClass);
+        }
+
+        if (!method_exists($defaultEntityClass, 'forCopy')) {
+            throw new \Exception();
+        }
     }
 
     public function verifyConfig()
@@ -84,37 +94,17 @@ public function beforeFind(Event $event, Query $query, ArrayObject $options, $pr
             return;
         }
 
-        $assocs = $this->_table()->associations()->keys();
-
-        $mapper = function ($row) use ($assocs) {
-            foreach ($assocs as $k => $assoc) {
-                unset($assocs[$k]);
-                if ($row->has($assoc)) {
-                    $assocs[$assoc] = $row->$assoc;
-                    $row->unsetProperty($assoc);
-                }
-            }
-
-            $type = $row[$this->config('typeField')];
-            $entityClass = $this->_typeMap[$type]['entityClass'];
-            $entity = new $entityClass($row->toArray(), [
-                'markNew' => $row->isNew(),
-                'markClean' => true,
-                'guard' => false,
-                'source' => $this->_typeMap[$type]['alias'],
-            ]);
-            $entity->virtualProperties($row->virtualProperties());
-
-            foreach ($assocs as $assoc => $val) {
-                $entity->set($assoc, $val);
-                $entity->dirty($assoc, false);
-            }
-
-            return $entity;
-        };
-
-        $query->formatResults(function ($results) use ($mapper) {
-            return $results->map($mapper);
+        $query->formatResults(function ($results) {
+            return $results->map(function ($row) {
+                $type = $row[$this->config('typeField')];
+                $entityClass = $this->_typeMap[$type]['entityClass'];
+                return new $entityClass($row->forCopy(), [
+                    'markNew' => $row->isNew(),
+                    'markClean' => true,
+                    'guard' => false,
+                    'source' => $this->_typeMap[$type]['alias'],
+                ]);
+            });
         });
     }
 

src/Model/Entity/StiAwareTrait.php

@@ -0,0 +1,10 @@
+<?php
+namespace Muffin\Sti\Model\Entity;
+
+trait StiAwareTrait
+{
+    public function forCopy()
+    {
+        return $this->_properties;
+    }
+}

tests/test_app/Model/Entity/Chef.php

@@ -3,9 +3,11 @@
 
 use Cake\ORM\Entity;
 use Cake\Utility\Inflector;
+use Muffin\Sti\Model\Entity\StiAwareTrait;
 
 class Chef extends Entity
 {
+    use StiAwareTrait;
     protected $_hidden = [
         'age',
     ];

tests/test_app/Model/Entity/Spoon.php

@@ -2,8 +2,9 @@
 namespace Muffin\Sti\TestApp\Model\Entity;
 
 use Cake\ORM\Entity;
+use Muffin\Sti\Model\Entity\StiAwareTrait;
 
 class Spoon extends Entity
 {
-
+    use StiAwareTrait;
 }

tests/test_app/Model/Table/UtensilsTable.php

@@ -15,5 +15,6 @@ public function initialize(array $config)
                 'electronic' => 'Muffin\Sti\TestApp\Model\Entity\Electronic',
             ]
         ]);
+        $this->entityClass('Muffin\Sti\TestApp\Model\Entity\Spoon');
     }
 }