Merge pull request #79 from renoki-co/feature/3.x-cleanup

[3.x] Formatting

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         laravel:
           - 7.*
           - 8.*
-        prefer: 
+        prefer:
           - 'prefer-lowest'
           - 'prefer-stable'
         include:

src/Traits/QueryCacheModule.php

@@ -178,7 +178,7 @@ public function flushQueryCache(array $tags = []): bool
         }
 
         foreach ($tags as $tag) {
-            self::flushQueryCacheWithTag($tag);
+            $this->flushQueryCacheWithTag($tag);
         }
 
         return true;

src/Traits/QueryCacheable.php

@@ -46,6 +46,19 @@ protected static function getFlushQueryCacheObserver()
         return FlushQueryCacheObserver::class;
     }
 
+    /**
+     * Set the base cache tags that will be present
+     * on all queries.
+     *
+     * @return array
+     */
+    protected function getCacheBaseTags(): array
+    {
+        return [
+            (string) self::class,
+        ];
+    }
+
     /**
      * When invalidating automatically on update, you can specify
      * which tags to invalidate.
@@ -96,17 +109,4 @@ protected function newBaseQueryBuilder()
 
         return $builder->cacheBaseTags($this->getCacheBaseTags());
     }
-
-    /**
-     * Set the base cache tags that will be present
-     * on all queries.
-     *
-     * @return array
-     */
-    protected function getCacheBaseTags(): array
-    {
-        return [
-            (string) self::class,
-        ];
-    }
 }

tests/MethodsTest.php

@@ -153,6 +153,7 @@ public function test_multiple_append_cache_tags()
     public function test_append_cache_tags_with_sub_query()
     {
         $user = factory(User::class)->create();
+
         factory(Post::class)->createMany([
             ['user_id' => $user->id, 'name' => 'Post 1 on topic 1'],
             ['user_id' => $user->id, 'name' => 'Post 2 on topic 1'],

tests/TestCase.php

@@ -43,7 +43,7 @@ public function getEnvironmentSetUp($app)
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('database.connections.sqlite', [
             'driver'   => 'sqlite',
-            'database' => __DIR__.'/database.sqlite',
+            'database' => __DIR__.'/database/database.sqlite',
             'prefix'   => '',
         ]);
         $app['config']->set(
@@ -64,7 +64,7 @@ public function getEnvironmentSetUp($app)
      */
     protected function resetDatabase()
     {
-        file_put_contents(__DIR__.'/database.sqlite', null);
+        file_put_contents(__DIR__.'/database/database.sqlite', null);
     }
 
     /**