Coding standards

Author: Torann

src/RepositoryServiceProvider.php

@@ -17,9 +17,6 @@ public function boot()
         $this->mergeConfigFrom(
             __DIR__ . '/../config/repositories.php', 'repositories'
         );
-
-        // Get caching
-        AbstractRepository::setCacheInstance($this->app['cache']);
     }
 
     /**
@@ -31,7 +28,7 @@ public function register()
     {
         if ($this->isLumen() === false) {
             $this->publishes([
-                __DIR__ . '/../config/repositories.php' => config_path('repositories.php')
+                __DIR__ . '/../config/repositories.php' => config_path('repositories.php'),
             ], 'config');
         }
     }
@@ -45,4 +42,4 @@ protected function isLumen()
     {
         return str_contains($this->app->version(), 'Lumen') === true;
     }
-}
+}

src/Traits/Cacheable.php

@@ -9,31 +9,24 @@
 
 trait Cacheable
 {
-    /**
-     * Cache instance
-     *
-     * @var CacheManager
-     */
-    protected static $cache = null;
+    protected static CacheManager|null $cache = null;
 
     /**
      * Flush the cache after create/update/delete events.
-     *
-     * @var bool
      */
-    protected $eventFlushCache = false;
+    protected bool $eventFlushCache = false;
 
     /**
      * Global lifetime of the cache.
-     *
-     * @var int
      */
-    protected $cacheMinutes = 60;
+    protected int $cacheMinutes = 60;
 
     /**
      * Set cache manager.
      *
      * @param CacheManager $cache
+     *
+     * @return void
      */
     public static function setCacheInstance(CacheManager $cache)
     {
@@ -68,13 +61,13 @@ public function skippedCache()
     /**
      * Get Cache key for the method
      *
-     * @param string $method
-     * @param mixed  $args
-     * @param string $tag
+     * @param string     $method
+     * @param array|null $args
+     * @param string     $tag
      *
      * @return string
      */
-    public function getCacheKey($method, $args = null, $tag = '')
+    public function getCacheKey(string $method, array $args = null, string $tag = ''): string
     {
         // Sort through arguments
         foreach ($args as &$a) {
@@ -100,12 +93,12 @@ public function getCacheKey($method, $args = null, $tag = '')
      *
      * @param string   $method
      * @param array    $args
-     * @param \Closure $callback
-     * @param int      $time
+     * @param Closure  $callback
+     * @param int|null $time
      *
      * @return mixed
      */
-    public function cacheCallback($method, $args, Closure $callback, $time = null)
+    public function cacheCallback(string $method, array $args, Closure $callback, int $time = null)
     {
         // Cache disabled, just execute query & return result
         if ($this->skippedCache() === true) {
@@ -127,7 +120,7 @@ public function cacheCallback($method, $args, Closure $callback, $time = null)
      *
      * @return bool
      */
-    public function flushCache()
+    public function flushCache(): bool
     {
         // Cache disabled, just ignore this
         if ($this->eventFlushCache === false || config('repositories.cache_enabled', false) === false) {
@@ -143,11 +136,11 @@ public function flushCache()
     /**
      * Return the time until expires in minutes.
      *
-     * @param int $time
+     * @param mixed $time
      *
      * @return int
      */
-    protected function getCacheExpiresTime($time = null)
+    protected function getCacheExpiresTime(mixed $time = null): int
     {
         if ($time === self::EXPIRES_END_OF_DAY) {
             return class_exists(Carbon::class)
@@ -157,4 +150,4 @@ protected function getCacheExpiresTime($time = null)
 
         return $time ?: $this->cacheMinutes;
     }
-}
+}