Merge branch 'master' of github.com:jeremyharris/cakephp-lazyload

Author: jeremyharris

src/ORM/LazyLoadEntityTrait.php

@@ -2,6 +2,7 @@
 namespace JeremyHarris\LazyLoad\ORM;
 
 use Cake\Datasource\RepositoryInterface;
+use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
@@ -48,7 +49,7 @@ public function &get($property)
      */
     protected function &_parentGet($property)
     {
-        return parent::get($property);
+        return Entity::get($property);
     }
 
     /**
@@ -81,7 +82,7 @@ public function has($property)
      */
     protected function _parentHas($property)
     {
-        return parent::has($property);
+        return Entity::has($property);
     }
 
     /**
@@ -96,7 +97,8 @@ public function unsetProperty($property)
         foreach ($property as $prop) {
             $this->_unsetProperties[] = $prop;
         }
-        return parent::unsetProperty($property);
+
+        return Entity::unsetProperty($property);
     }
 
     /**

tests/TestCase/ORM/LazyLoadEntityTraitTest.php

@@ -7,6 +7,7 @@
 use JeremyHarris\LazyLoad\TestApp\Model\Entity\Comment;
 use JeremyHarris\LazyLoad\TestApp\Model\Entity\LazyLoadableEntity;
 use JeremyHarris\LazyLoad\TestApp\Model\Entity\TablelessEntity;
+use JeremyHarris\LazyLoad\TestApp\Model\Entity\User;
 
 /**
  * LazyLoadEntityTrait test
@@ -362,4 +363,25 @@ public function testDontInterfereWithContain()
 
         $this->assertEquals('mariano', $article->author->name);
     }
+
+    /**
+     * test that checks that we don't get an infinite loop when including the trait twice
+     *
+     * User extends LazyLoadableEntity, uses Trait
+     * LazyLoadableEntity uses Trait
+     *
+     * @return void
+     */
+    public function testDuplicateTrait()
+    {
+        // php 5.6 complains when classes are composed as such
+        $this->skipIf(version_compare(PHP_VERSION, '7.0.0', '<'));
+
+        $this->Users = TableRegistry::get('Users');
+        $this->Users->setEntityClass(User::class);
+        $this->Users->hasMany('Comments');
+
+        $user = $this->Users->get(1);
+        $this->assertTrue($user->has('comments'));
+    }
 }

tests/test_app/Model/Entity/User.php

@@ -0,0 +1,15 @@
+<?php
+namespace JeremyHarris\LazyLoad\TestApp\Model\Entity;
+
+use JeremyHarris\LazyLoad\ORM\LazyLoadEntityTrait;
+
+class User extends LazyLoadableEntity
+{
+    // to test including the trait twice
+    use LazyLoadEntityTrait;
+
+    protected function _getAccessor()
+    {
+        return 'accessor';
+    }
+}