Merge pull request #52 from Nikita240/trait-search

Do a deep search when checking for traits

Author: maxiloc

src/ModelHelper.php

@@ -19,9 +19,30 @@ private function getIndexName(Model $model)
         return $model->getTable();
     }
 
-    private function hasAlgoliaTrait(Model $model)
+    private function hasAlgoliaTrait(Model $class, $autoload = false)
     {
-        return (isset(class_uses($model)['AlgoliaSearch\Laravel\AlgoliaEloquentTrait']));
+        $traits = [];
+
+        // Get traits of all parent classes
+        do {
+            $traits = array_merge(class_uses($class, $autoload), $traits);
+        } while ($class = get_parent_class($class));
+
+        // Get traits of all parent traits
+        $traitsToSearch = $traits;
+        while (!empty($traitsToSearch)) {
+            $newTraits = class_uses(array_pop($traitsToSearch), $autoload);
+            $traits = array_merge($newTraits, $traits);
+            $traitsToSearch = array_merge($newTraits, $traitsToSearch);
+        };
+
+        foreach ($traits as $trait => $same) {
+            $traits = array_merge(class_uses($trait, $autoload), $traits);
+        }
+
+        $traits = array_unique($traits);
+
+        return (isset($traits['AlgoliaSearch\Laravel\AlgoliaEloquentTrait']));
     }
 
     public function isAutoIndex(Model $model)

tests/ModelHelperTest.php

@@ -7,6 +7,7 @@
 use AlgoliaSearch\Tests\Models\Model3;
 use AlgoliaSearch\Tests\Models\Model4;
 use AlgoliaSearch\Tests\Models\Model5;
+use AlgoliaSearch\Tests\Models\Model7;
 use Orchestra\Testbench\TestCase;
 
 class ModelHelperTest extends TestCase
@@ -27,10 +28,12 @@ public function testAutoIndexAndAutoDelete()
         $this->assertEquals(true, $this->modelHelper->isAutoIndex(new Model1()));
         $this->assertEquals(false, $this->modelHelper->isAutoIndex(new Model2()));
         $this->assertEquals(false, $this->modelHelper->isAutoIndex(new Model3()));
+        $this->assertEquals(true, $this->modelHelper->isAutoIndex(new Model7()));
 
         $this->assertEquals(true, $this->modelHelper->isAutoDelete(new Model1()));
         $this->assertEquals(false, $this->modelHelper->isAutoDelete(new Model2()));
         $this->assertEquals(false, $this->modelHelper->isAutoDelete(new Model3()));
+        $this->assertEquals(true, $this->modelHelper->isAutoDelete(new Model7()));
     }
 
     public function testGetKey()

tests/Models/Model7.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace AlgoliaSearch\Tests\Models;
+
+use AlgoliaSearch\Tests\Traits\Trait1;
+use Illuminate\Database\Eloquent\Model;
+
+class Model7 extends Model
+{
+    use Trait1;
+}

tests/Traits/Trait1.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace AlgoliaSearch\Tests\Traits;
+
+use AlgoliaSearch\Laravel\AlgoliaEloquentTrait;
+
+trait Trait1
+{
+	use AlgoliaEloquentTrait;
+}