typehints

Author: rennokki

README.md

@@ -336,7 +336,7 @@ CustomModel::cacheFor(30)->customGetMethod();
 This is how the default key generation function looks like:
 
 ```php
-public function generatePlainCacheKey(string $method = 'get', $id = null, $appends = null): string
+public function generatePlainCacheKey(string $method = 'get', string $id = null, string $appends = null): string
 {
     $name = $this->connection->getName();
 
@@ -359,7 +359,7 @@ class MyCustomBuilder implements QueryCacheModuleInterface
 {
     use QueryCacheModule;
 
-    public function generatePlainCacheKey(string $method = 'get', $id = null, $appends = null): string
+    public function generatePlainCacheKey(string $method = 'get', string $id = null, string $appends = null): string
     {
         $name = $this->connection->getName();
 
@@ -415,7 +415,7 @@ However, if your builder replaces functions  like `find()`, `$id` is needed and
 ```php
 class MyCustomBuilder
 {
-    public function getQueryCacheCallback(string $method = 'get', $columns = ['*'], $id = null)
+    public function getQueryCacheCallback(string $method = 'get', $columns = ['*'], string $id = null)
     {
         return function () use ($method, $columns, $id) {
             $this->avoidCache = true;

src/Contracts/QueryCacheModuleInterface.php

@@ -12,15 +12,15 @@ interface QueryCacheModuleInterface
      * @param  string|null  $appends
      * @return string
      */
-    public function generatePlainCacheKey(string $method = 'get', $id = null, $appends = null): string;
+    public function generatePlainCacheKey(string $method = 'get', string $id = null, string $appends = null): string;
 
     /**
      * Get the query cache callback.
      *
      * @param  string  $method
-     * @param  array  $columns
+     * @param  array|string  $columns
      * @param  string|null  $id
      * @return \Closure
      */
-    public function getQueryCacheCallback(string $method = 'get', $columns = ['*'], $id = null);
+    public function getQueryCacheCallback(string $method = 'get', $columns = ['*'], string $id = null);
 }

src/Traits/QueryCacheModule.php

@@ -64,11 +64,12 @@ trait QueryCacheModule
     /**
      * Get the cache from the current query.
      *
+     * @param  string  $method
      * @param  array  $columns
      * @param  string|null  $id
      * @return array
      */
-    public function getFromQueryCache(string $method = 'get', $columns = ['*'], $id = null)
+    public function getFromQueryCache(string $method = 'get', array $columns = ['*'], string $id = null)
     {
         if (is_null($this->columns)) {
             $this->columns = $columns;
@@ -90,11 +91,11 @@ public function getFromQueryCache(string $method = 'get', $columns = ['*'], $id
      * Get the query cache callback.
      *
      * @param  string  $method
-     * @param  array  $columns
+     * @param  array|string  $columns
      * @param  string|null  $id
      * @return \Closure
      */
-    public function getQueryCacheCallback(string $method = 'get', $columns = ['*'], $id = null)
+    public function getQueryCacheCallback(string $method = 'get', $columns = ['*'], string $id = null)
     {
         return function () use ($method, $columns) {
             $this->avoidCache = true;
@@ -111,7 +112,7 @@ public function getQueryCacheCallback(string $method = 'get', $columns = ['*'],
      * @param  string|null  $appends
      * @return string
      */
-    public function getCacheKey(string $method = 'get', $id = null, $appends = null): string
+    public function getCacheKey(string $method = 'get', string $id = null, string $appends = null): string
     {
         $key = $this->generateCacheKey($method, $id, $appends);
         $prefix = $this->getCachePrefix();
@@ -127,7 +128,7 @@ public function getCacheKey(string $method = 'get', $id = null, $appends = null)
      * @param  string|null  $appends
      * @return string
      */
-    public function generateCacheKey(string $method = 'get', $id = null, $appends = null): string
+    public function generateCacheKey(string $method = 'get', string $id = null, string $appends = null): string
     {
         $key = $this->generatePlainCacheKey($method, $id, $appends);
 
@@ -146,7 +147,7 @@ public function generateCacheKey(string $method = 'get', $id = null, $appends =
      * @param  string|null  $appends
      * @return string
      */
-    public function generatePlainCacheKey(string $method = 'get', $id = null, $appends = null): string
+    public function generatePlainCacheKey(string $method = 'get', string $id = null, string $appends = null): string
     {
         $name = $this->connection->getName();