Merge branch 'master' into develop

Author: mikebronner

.scrutinizer.yml

@@ -5,5 +5,3 @@ build:
     environment:
         variables:
             REDIS_HOST: '127.0.0.1'
-    nodes:
-        tests: false

composer.json

@@ -10,16 +10,17 @@
     ],
     "require": {
         "illuminate/cache": "5.5 - 5.6",
+        "illuminate/config": "5.5 - 5.6",
+        "illuminate/console": "5.5 - 5.6",
         "illuminate/database": "5.5 - 5.6",
+        "illuminate/support": "5.5 - 5.6",
         "php": ">=7.1.3"
     },
     "require-dev": {
         "codedungeon/phpunit-result-printer": "*",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "orchestra/database": "3.6.x-dev@dev",
-        "orchestra/testbench-browser-kit": "^3.6",
-        "orchestra/testbench-dusk": "3.6.x-dev@dev",
         "orchestra/testbench": "^3.6",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",

phpunit.xml

@@ -13,16 +13,8 @@
     syntaxCheck="false"
 >
 <testsuites>
-    <testsuite name="Browser">
-        <directory suffix="Test.php">./tests/Browser</directory>
-    </testsuite>
-
-    <testsuite name="Feature">
-        <directory suffix="Test.php">./tests/Feature</directory>
-    </testsuite>
-
-    <testsuite name="Unit">
-        <directory suffix="Test.php">./tests/Unit</directory>
+    <testsuite name="Integration">
+        <directory suffix="Test.php">./tests/Integration</directory>
     </testsuite>
 </testsuites>
 <filter>

src/Traits/Cachable.php

@@ -1,12 +1,12 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
+use GeneaLabs\LaravelModelCaching\CachedBuilder;
+use GeneaLabs\LaravelModelCaching\CachedModel;
 use GeneaLabs\LaravelModelCaching\CacheKey;
 use GeneaLabs\LaravelModelCaching\CacheTags;
-use GeneaLabs\LaravelModelCaching\CachedModel;
 use Illuminate\Cache\TaggableStore;
-use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use GeneaLabs\LaravelModelCaching\CachedBuilder;
+use Illuminate\Database\Query\Builder;
 
 trait Cachable
 {

tests/BrowserTestCase.php

@@ -1,4 +1,4 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Unit;
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
@@ -11,14 +11,14 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
-use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
 * @SuppressWarnings(PHPMD.TooManyPublicMethods)
 * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class CachedBuilderTest extends UnitTestCase
+class CachedBuilderTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 

tests/FeatureTestCase.php

@@ -1,4 +1,4 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Unit;
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
@@ -10,10 +10,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
-use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class CachedModelTest extends UnitTestCase
+class CachedModelTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 
@@ -55,7 +55,7 @@ public function testScopeDisablesCaching()
 
     public function testAllMethodCachingCanBeDisabledViaConfig()
     {
-       config(['laravel-model-caching.disabled' => true]);
+        config(['laravel-model-caching.disabled' => true]);
         $authors = (new Author)
             ->all();
         $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor');
@@ -73,4 +73,28 @@ public function testAllMethodCachingCanBeDisabledViaConfig()
         $this->assertNotEmpty($authors);
         $this->assertCount(10, $authors);
     }
+
+    public function testWhereHasIsBeingCached()
+    {
+        $books = (new Book)
+            ->with('author')
+            ->whereHas('author', function ($query) {
+                $query->whereId('1');
+            })
+            ->get();
+
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook_exists_and_books.author_id_=_authors.id-id_=_1-author');
+        $tags = [
+            'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook',
+            'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor',
+        ];
+
+        $cachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertEquals(1, $books->first()->author->id);
+        $this->assertEquals(1, $cachedResults->first()->author->id);
+    }
 }

tests/Unit/CachedBuilderTest.php renamed to tests/Integration/CachedBuilderTest.php

@@ -1,15 +1,15 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Unit\Console\Commands;
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\Console\Commands;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
-use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class FlushTest extends UnitTestCase
+class FlushTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 

tests/Unit/CachedModelTest.php renamed to tests/Integration/CachedModelTest.php

@@ -1,4 +1,4 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Unit;
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
@@ -11,14 +11,14 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
-use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
 * @SuppressWarnings(PHPMD.TooManyPublicMethods)
 * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class DisabledCachedBuilderTest extends UnitTestCase
+class DisabledCachedBuilderTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 

tests/Unit/Console/Commands/FlushTest.php renamed to tests/Integration/Console/Commands/FlushTest.php

@@ -1,4 +1,4 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Unit;
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
@@ -10,10 +10,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
-use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class DisabledCachedModelTest extends UnitTestCase
+class DisabledCachedModelTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 

tests/Unit/DisabledCachedBuilderTest.php renamed to tests/Integration/DisabledCachedBuilderTest.php

@@ -1,4 +1,4 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Unit;
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\Traits;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
@@ -11,11 +11,11 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
-use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Database\Eloquent\Collection;
 
-class CachableTest extends UnitTestCase
+class CachableTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 

tests/Unit/DisabledCachedModelTest.php renamed to tests/Integration/DisabledCachedModelTest.php

@@ -2,7 +2,7 @@
 
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
-abstract class UnitTestCase extends BaseTestCase
+abstract class IntegrationTestCase extends BaseTestCase
 {
     use CreatesApplication;