code consistency fixes

Author: rennokki

src/Traits/QueryCacheModule.php

@@ -205,7 +205,7 @@ public function flushQueryCacheWithTag(string $tag): bool
      * Indicate that the query results should be cached.
      *
      * @param  \DateTime|int  $time
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function cacheFor($time)
     {
@@ -253,7 +253,7 @@ public function doNotCache(bool $avoidCache = true)
      * Set the cache prefix.
      *
      * @param  string  $prefix
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function cachePrefix(string $prefix)
     {
@@ -266,7 +266,7 @@ public function cachePrefix(string $prefix)
      * Attach tags to the cache.
      *
      * @param  array  $cacheTags
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function cacheTags(array $cacheTags = [])
     {
@@ -279,7 +279,7 @@ public function cacheTags(array $cacheTags = [])
      * Append tags to the cache.
      *
      * @param  array  $cacheTags
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function appendCacheTags(array $cacheTags = [])
     {
@@ -292,7 +292,7 @@ public function appendCacheTags(array $cacheTags = [])
      * Use a specific cache driver.
      *
      * @param  string  $cacheDriver
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function cacheDriver(string $cacheDriver)
     {
@@ -306,7 +306,7 @@ public function cacheDriver(string $cacheDriver)
      * that will be present on all cached queries.
      *
      * @param  array  $tags
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function cacheBaseTags(array $tags = [])
     {
@@ -318,7 +318,7 @@ public function cacheBaseTags(array $tags = [])
     /**
      * Use a plain key instead of a hashed one in the cache driver.
      *
-     * @return \Rennokki\QueryCache\Query\Builder
+     * @return \Rennokki\QueryCache\Traits\QueryCacheModule
      */
     public function withPlainKey()
     {

src/Traits/QueryCacheable.php

@@ -14,6 +14,28 @@
  */
 trait QueryCacheable
 {
+    /**
+     * Invalidate the cache automatically
+     * upon update in the database.
+     *
+     * @var bool
+     */
+    protected static $flushCacheOnUpdate = false;
+
+    /**
+     * Boot the trait.
+     *
+     * @return void
+     */
+    public static function bootQueryCacheable()
+    {
+        if (isset(static::$flushCacheOnUpdate) && static::$flushCacheOnUpdate) {
+            static::observe(
+                static::getFlushQueryCacheObserver()
+            );
+        }
+    }
+
     /**
      * Get the observer class name that will
      * observe the changes and will invalidate the cache
@@ -37,20 +59,6 @@ public function getCacheTagsToInvalidateOnUpdate(): array
         return $this->getCacheBaseTags();
     }
 
-    /**
-     * Boot the trait.
-     *
-     * @return void
-     */
-    public static function bootQueryCacheable()
-    {
-        if (isset(static::$flushCacheOnUpdate) && static::$flushCacheOnUpdate) {
-            static::observe(
-                static::getFlushQueryCacheObserver()
-            );
-        }
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -64,9 +72,11 @@ protected function newBaseQueryBuilder()
             $connection->getPostProcessor()
         );
 
-        $this->cacheFor
-            ? $builder->cacheFor($this->cacheFor)
-            : $builder->dontCache();
+        $builder->dontCache();
+
+        if ($this->cacheFor) {
+            $builder->cacheFor($this->cacheFor);
+        }
 
         if ($this->cacheTags) {
             $builder->cacheTags($this->cacheTags);

tests/CountTest.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Rennokki\QueryCache\Test\Models\Post;
 
 class CountTest extends TestCase

tests/FirstTest.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Rennokki\QueryCache\Test\Models\Post;
 
 class FirstTest extends TestCase

tests/GetTest.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Rennokki\QueryCache\Test\Models\Post;
 
 class GetTest extends TestCase

tests/MethodsTest.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Rennokki\QueryCache\Test\Models\Book;
 use Rennokki\QueryCache\Test\Models\Kid;
 use Rennokki\QueryCache\Test\Models\Post;

tests/PaginateTest.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Rennokki\QueryCache\Test\Models\Post;
 
 class PaginateTest extends TestCase

tests/SimplePaginateTest.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Rennokki\QueryCache\Test\Models\Post;
 
 class SimplePaginateTest extends TestCase

tests/TestCase.php

@@ -2,7 +2,7 @@
 
 namespace Rennokki\QueryCache\Test;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 abstract class TestCase extends Orchestra