WIP- Add test for eagerload closures.

Author: mikebronner

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/home/vagrant/Sites/ens": "/Users/mike/Developer/Sites/ens"
+            }
+        }
+    ]
+}

composer.json

@@ -9,23 +9,23 @@
         }
     ],
     "require": {
-        "genealabs/laravel-pivot-events": "*",
-        "illuminate/cache": "5.8 - 6.0",
-        "illuminate/config": "5.8 - 6.0",
-        "illuminate/console": "5.8 - 6.0",
-        "illuminate/container": "5.8 - 6.0",
-        "illuminate/database": "5.8 - 6.0",
-        "illuminate/support": "5.8 - 6.0",
-        "illuminate/http": "5.8 - 6.0"
+        "genealabs/laravel-pivot-events": "^0.2.1",
+        "illuminate/cache": "^6.0",
+        "illuminate/config": "^6.0",
+        "illuminate/console": "^6.0",
+        "illuminate/container": "^6.0",
+        "illuminate/database": "^6.0",
+        "illuminate/http": "^6.0",
+        "illuminate/support": "^6.0"
     },
     "require-dev": {
-        "fzaninotto/faker": "*",
+        "fzaninotto/faker": "^1.4",
         "mockery/mockery": "*",
-        "orchestra/testbench-browser-kit": "3.9.x-dev@dev",
-        "orchestra/testbench": "3.9.x-dev@dev",
+        "orchestra/testbench-browser-kit": "^4.0",
+        "orchestra/testbench": "^4.0",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "^8.0",
         "predis/predis": "*",
         "sebastian/phpcpd": "*",
         "symfony/thanks": "*"
@@ -50,7 +50,5 @@
                 "GeneaLabs\\LaravelModelCaching\\Providers\\Service"
             ]
         }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }

phpunit.xml

@@ -35,5 +35,6 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
+        <env name="REDIS_HOST" value="192.168.10.10"/>
     </php>
 </phpunit>

tests/Fixtures/Author.php

@@ -48,4 +48,9 @@ public function scopeNameStartsWith(Builder $query, string $startOfName) : Build
     {
         return $query->where("name", "LIKE", "{$startOfName}%");
     }
+
+    public function scopeBooksStartWith(Builder $query, string $startOfName) : Builder
+    {
+        return $query->where("name", "LIKE", "{$startOfName}%");
+    }
 }

tests/Fixtures/Book.php

@@ -1,6 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
 use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -53,4 +54,9 @@ public function uncachedStores() : BelongsToMany
     {
         return $this->belongsToMany(UncachedStore::class, "book_store", "book_id", "store_id");
     }
+
+    public function scopeStartsWith(Builder $query, string $startOfName) : Builder
+    {
+        return $query->where("name", "LIKE", "{$startOfName}%");
+    }
 }

tests/Integration/CachedBuilder/ScopeTest.php

@@ -6,6 +6,7 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\AuthorBeginsWithA;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\AuthorWithInlineGlobalScope;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthorWithInlineGlobalScope;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class ScopeTest extends IntegrationTestCase
 {
@@ -97,4 +98,24 @@ public function testInlineGlobalScopesAreCached()
         $this->assertTrue($cachedResults->contains($author));
         $this->assertTrue($liveResults->contains($author));
     }
+
+    public function testLocalScopesInRelationship()
+    {
+        $first = "A";
+        $second = "B";
+        $authors1 = (new Author)
+            ->with(['books' => static function (HasMany $model) use ($first) {
+                $model->startsWith($first);
+            }])
+            ->get();
+        $authors2 = (new Author)
+            ->disableModelCaching()
+            ->with(['books' => static function (HasMany $model) use ($second) {
+                $model->startsWith($second);
+            }])
+            ->get();
+
+        // $this->assertNotEquals($authors1, $authors2);
+        $this->markTestSkipped();
+    }
 }

tests/Integration/CachedBuilder/WhereJsonContainsTest.php

@@ -14,8 +14,10 @@ protected function getEnvironmentSetUp($app)
         parent::getEnvironmentSetUp($app);
 
         $app['config']->set('database.default', 'pgsql');
+        $app['config']->set('database.connections.pgsql.host', "192.168.10.10");
         $app['config']->set('database.connections.pgsql.database', "testing");
-        $app['config']->set('database.connections.pgsql.username', "mike");
+        $app['config']->set('database.connections.pgsql.username', "homestead");
+        $app['config']->set('database.connections.pgsql.password', "secret");
     }
 
     public function setUp() : void