merged from develop

Author: sjbronner

README.md

@@ -3,7 +3,6 @@
 # Model Caching for Laravel
 [![Gitter](https://badges.gitter.im/GeneaLabs/laravel-model-caching.svg)](https://gitter.im/GeneaLabs/laravel-model-caching?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
 [![Travis](https://img.shields.io/travis/GeneaLabs/laravel-model-caching.svg)](https://travis-ci.org/GeneaLabs/laravel-model-caching)
-[![SensioLabs Insight](https://img.shields.io/sensiolabs/i/fde269ac-c382-4d17-a647-c69ad6b9dd85.svg)](https://insight.sensiolabs.com/projects/fde269ac-c382-4d17-a647-c69ad6b9dd85)
 [![Scrutinizer](https://img.shields.io/scrutinizer/g/GeneaLabs/laravel-model-caching.svg)](https://scrutinizer-ci.com/g/GeneaLabs/laravel-model-caching)
 [![Coveralls](https://img.shields.io/coveralls/GeneaLabs/laravel-model-caching.svg)](https://coveralls.io/github/GeneaLabs/laravel-model-caching)
 [![GitHub (pre-)release](https://img.shields.io/github/release/GeneaLabs/laravel-model-caching/all.svg)](https://github.com/GeneaLabs/laravel-model-caching)
@@ -124,7 +123,7 @@ information included to be actionable.
 Please review the Contribution Guidelines <https://github.com/GeneaLabs/laravel-model-caching/blob/master/CONTRIBUTING.md>.
 Only PRs that meet all criterium will be accepted.
 
-## Support Open-Source Software - Give Thanks!
+## ❤️ Open-Source Software - Give ⭐️
 We have included the awesome `symfony/thanks` composer package as a dev
 dependency. Let your OS package maintainers know you appreciate them by starring
 the packages you use. Simply run composer thanks after installing this package.

composer.json

@@ -16,11 +16,14 @@
     "require-dev": {
         "codedungeon/phpunit-result-printer": "^0.4.4",
         "fzaninotto/faker": "~1.4",
-        "laravel/laravel": "5.5.*",
         "mockery/mockery": "0.9.*",
-        "phpmd/phpmd": "^2.6",
-        "phpunit/phpunit": "5.7.*",
+        "orchestra/database": "^3.5",
+        "orchestra/testbench-browser-kit": "^3.5",
+        "orchestra/testbench-dusk": "3.5.x-dev@dev",
+        "orchestra/testbench": "^3.5",
         "php-coveralls/php-coveralls" : "*",
+        "phpmd/phpmd": "*",
+        "phpunit/phpunit": "*",
         "sebastian/phpcpd": "*",
         "symfony/thanks": "^1.0"
     },

phpunit.xml

@@ -13,6 +13,10 @@
     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>
@@ -29,10 +33,10 @@
     <php>
         <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
         <env name="APP_ENV" value="testing"/>
+        <env name="APP_URL" value="http://127.0.0.1:8000"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="DB_CONNECTION" value="testing"/>
     </php>
 </phpunit>

src/CachedBuilder.php

@@ -146,4 +146,16 @@ public function sum($column)
                 return parent::sum($column);
             });
     }
+
+    public function value($column)
+    {
+        if (! $this->isCachable) {
+            return parent::value($column);
+        }
+
+        return $this->cache($this->makeCacheTags())
+            ->rememberForever($this->makeCacheKey() . "-value_{$column}", function () use ($column) {
+                return parent::value($column);
+            });
+    }
 }

tests/BrowserTestCase.php

@@ -0,0 +1,18 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\Dusk\TestCase as BaseTestCase;
+
+abstract class BrowserTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+
+    public static function setUpBeforeClass()
+    {
+        static::serve();
+    }
+
+    public static function tearDownAfterClass()
+    {
+         static::stopServing();
+    }
+}

tests/CreatesApplication.php

@@ -1,21 +1,26 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests;
 
 use GeneaLabs\LaravelModelCaching\Providers\Service as LaravelModelCachingService;
-use Illuminate\Contracts\Console\Kernel;
-use Illuminate\Database\Eloquent\Factory;
+use Orchestra\Database\ConsoleServiceProvider;
 
 trait CreatesApplication
 {
-    public function createApplication()
+    public function setUp()
     {
-        $app = require __DIR__ . '/../vendor/laravel/laravel/bootstrap/app.php';
-        $app->make(Kernel::class)->bootstrap();
-        $app->make(Factory::class)->load(__DIR__ . '/database/factories');
-        $app->afterResolving('migrator', function ($migrator) {
-            $migrator->path(__DIR__ . '/database/migrations');
-        });
-        $app->register(LaravelModelCachingService::class);
+        parent::setUp();
 
-        return $app;
+        $this->withFactories(__DIR__ . '/database/factories');
+        $this->loadMigrationsFrom(realpath(__DIR__ . '/database/migrations'));
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            LaravelModelCachingService::class,
+            ConsoleServiceProvider::class,
+        ];
     }
 }

tests/FeatureTestCase.php

@@ -0,0 +1,8 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\BrowserKit\TestCase as BaseTestCase;
+
+abstract class FeatureTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+}

tests/TestCase.php

@@ -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\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
 * @SuppressWarnings(PHPMD.TooManyPublicMethods)
 * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class CachedBuilderTest extends TestCase
+class CachedBuilderTest extends UnitTestCase
 {
     use RefreshDatabase;
 
@@ -83,10 +83,10 @@ public function testCreatingModelClearsCache()
                 'genealabslaravelmodelcachingtestsfixturesauthor',
                 'genealabslaravelmodelcachingtestsfixturesbook'
             ])
-            ->get(
+            ->get(sha1(
                 'genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_' .
                 '7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks'
-            );
+            ));
 
         $this->assertNull($results);
     }
@@ -101,10 +101,10 @@ public function testUpdatingModelClearsCache()
                 'genealabslaravelmodelcachingtestsfixturesauthor',
                 'genealabslaravelmodelcachingtestsfixturesbook'
             ])
-            ->get(
+            ->get(sha1(
                 'genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_' .
                 '7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks'
-            );
+            ));
 
         $this->assertNull($results);
     }
@@ -118,10 +118,10 @@ public function testDeletingModelClearsCache()
                 'genealabslaravelmodelcachingtestsfixturesauthor',
                 'genealabslaravelmodelcachingtestsfixturesbook'
             ])
-            ->get(
+            ->get(sha1(
                 'genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_' .
                 '7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks'
-            );
+            ));
 
         $this->assertNull($results);
     }
@@ -424,24 +424,22 @@ public function testSumModelResultsCreatesCache()
 
     public function testValueModelResultsCreatesCache()
     {
-        $authors = (new Author)->with('books', 'profile')
+        $authorName = (new Author)->with('books', 'profile')
             ->value('name');
-        $key = sha1('genealabslaravelmodelcachingtestsfixturesauthor_name-books-profile-first');
+        $key = sha1('genealabslaravelmodelcachingtestsfixturesauthor-books-profile-value_name');
         $tags = [
             'genealabslaravelmodelcachingtestsfixturesauthor',
             'genealabslaravelmodelcachingtestsfixturesbook',
             'genealabslaravelmodelcachingtestsfixturesprofile',
         ];
 
-        $cachedResults = cache()->tags($tags)
-            ->get($key)
-            ->name;
-
-        $liveResults = (new UncachedAuthor)->with('books', 'profile')
+        $cachedResult = cache()->tags($tags)
+            ->get($key);
+        $liveResult = (new UncachedAuthor)->with('books', 'profile')
             ->value('name');
 
-        $this->assertEquals($authors, $cachedResults);
-        $this->assertEquals($liveResults, $cachedResults);
+        $this->assertEquals($authorName, $cachedResult);
+        $this->assertEquals($authorName, $liveResult);
     }
 
     public function testNestedRelationshipEagerLoading()

tests/Unit/CachedBuilderTest.php

@@ -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\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class CachedModelTest extends TestCase
+class CachedModelTest extends UnitTestCase
 {
     use RefreshDatabase;
 

tests/Unit/CachedModelTest.php

@@ -6,10 +6,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class FlushTest extends TestCase
+class FlushTest extends UnitTestCase
 {
     use RefreshDatabase;
 

tests/Unit/Console/Commands/FlushTest.php

@@ -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\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
 * @SuppressWarnings(PHPMD.TooManyPublicMethods)
 * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class DisabledCachedBuilderTest extends TestCase
+class DisabledCachedBuilderTest extends UnitTestCase
 {
     use RefreshDatabase;
 

tests/Unit/DisabledCachedBuilderTest.php

@@ -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\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class DisabledCachedModelTest extends TestCase
+class DisabledCachedModelTest extends UnitTestCase
 {
     use RefreshDatabase;
 

tests/Unit/DisabledCachedModelTest.php

@@ -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\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class CachableTest extends TestCase
+class CachableTest extends UnitTestCase
 {
     use RefreshDatabase;
 

tests/Unit/Traits/CachableTest.php

@@ -0,0 +1,8 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\TestCase as BaseTestCase;
+
+abstract class UnitTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+}