Add publish command, fix flushing of pivot releationships, fix detection if cache is disabled

Author: mikebronner

Diff for: CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.6.2] - 2019-07-26
+### Added
+- 'modelCache:publish' artisan command.
+- Spatie's QueryBuilder package to list of incompatible packages.
+
+### Fixed
+- registration of config file in service provider.
+- detection if cache is disabled.
+- flushing of cache for pivot events.
+
 ## [0.6.1] - 2019-07-20
 ### Added
 - config and environment variable to allow removal of database information from cache-key.

Diff for: src/Console/Commands/Publish.php

@@ -0,0 +1,41 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Console\Commands;
+
+use GeneaLabs\LaravelModelCaching\Providers\Service;
+use Illuminate\Console\Command;
+
+class Publish extends Command
+{
+    protected $signature = 'modelCache:publish {--assets} {--config} {--views} {--migrations}';
+    protected $description = "Publish various assets of the 'Model Caching for Laravel' package.";
+
+    public function handle()
+    {
+        if ($this->option('assets')) {
+            $this->call('casts:publish', ['--assets' => true]);
+        }
+
+        if ($this->option('config')) {
+            $this->call('vendor:publish', [
+                '--provider' => Service::class,
+                '--tag' => ['config'],
+                '--force' => true,
+            ]);
+        }
+
+        if ($this->option('views')) {
+            $this->call('vendor:publish', [
+                '--provider' => Service::class,
+                '--tag' => ['views'],
+                '--force' => true,
+            ]);
+        }
+
+        if ($this->option('migrations')) {
+            $this->call('vendor:publish', [
+                '--provider' => Service::class,
+                '--tag' => ['migrations'],
+                '--force' => true,
+            ]);
+        }
+    }
+}

Diff for: src/Providers/Service.php

@@ -1,6 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Providers;
 
 use GeneaLabs\LaravelModelCaching\Console\Commands\Clear;
+use GeneaLabs\LaravelModelCaching\Console\Commands\Publish;
 use GeneaLabs\LaravelModelCaching\Helper;
 use Illuminate\Support\ServiceProvider;
 
@@ -12,7 +13,13 @@ public function boot()
     {
         $configPath = __DIR__ . '/../../config/laravel-model-caching.php';
         $this->mergeConfigFrom($configPath, 'laravel-model-caching');
-        $this->commands(Clear::class);
+        $this->commands([
+            Clear::class,
+            Publish::class,
+        ]);
+        $this->publishes([
+            $configPath => config_path('laravel-model-caching.php'),
+        ], "config");
     }
 
     public function register()

Diff for: src/Traits/Caching.php

@@ -249,7 +249,7 @@ protected function checkCooldownAndFlushAfterPersisting(Model $instance, string
             if ($relationship) {
                 $relationshipInstance = $instance->$relationship()->getModel();
 
-                if (method_exists($instance, "flushCache")) {
+                if (method_exists($relationshipInstance, "flushCache")) {
                     $relationshipInstance->flushCache();
                 }
             }

Diff for: src/Traits/ModelCaching.php

@@ -40,11 +40,11 @@ public function __set($key, $value)
 
     public static function all($columns = ['*'])
     {
-        $isCacheDisabled = Container::getInstance()
+        $cacheIsEnabled = Container::getInstance()
             ->make("config")
-            ->get("laravel-model-caching.disabled");
+            ->get("laravel-model-caching.enabled");
 
-        if ($isCacheDisabled) {
+        if (! $cacheIsEnabled) {
             return parent::all($columns);
         }