FIx typehint compatibility & enforce consistency

Author: Omranic

src/Contracts/CacheableContract.php

@@ -9,7 +9,7 @@ interface CacheableContract
     /**
      * Set the repository cache lifetime.
      *
-     * @param float|int $cacheLifetime
+     * @param int $cacheLifetime
      *
      * @return $this
      */
@@ -18,9 +18,9 @@ public function setCacheLifetime($cacheLifetime);
     /**
      * Get the repository cache lifetime.
      *
-     * @return float|int
+     * @return int
      */
-    public function getCacheLifetime();
+    public function getCacheLifetime(): int;
 
     /**
      * Set the repository cache driver.

src/Repositories/EloquentRepository.php

@@ -315,31 +315,31 @@ public function restore($id)
     /**
      * {@inheritdoc}
      */
-    public function beginTransaction()
+    public function beginTransaction(): void
     {
         $this->getContainer('db')->beginTransaction();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function commit()
+    public function commit(): void
     {
         $this->getContainer('db')->commit();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function rollBack()
+    public function rollBack(): void
     {
         $this->getContainer('db')->rollBack();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function count($columns = '*')
+    public function count($columns = '*'): int
     {
         return $this->executeCallback(get_called_class(), __FUNCTION__, func_get_args(), function () use ($columns) {
             return $this->prepareQuery($this->createModel())->count($columns);

src/Traits/Cacheable.php

@@ -11,7 +11,7 @@ trait Cacheable
     /**
      * The repository cache lifetime.
      *
-     * @var float|int
+     * @var int
      */
     protected $cacheLifetime;
 
@@ -114,11 +114,7 @@ protected function flushCacheKeys(): array
     }
 
     /**
-     * Set the repository cache lifetime.
-     *
-     * @param float|int $cacheLifetime
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function setCacheLifetime($cacheLifetime)
     {
@@ -128,24 +124,16 @@ public function setCacheLifetime($cacheLifetime)
     }
 
     /**
-     * Get the repository cache lifetime.
-     *
-     * @return float|int
+     * {@inheritdoc}
      */
-    public function getCacheLifetime()
+    public function getCacheLifetime(): int
     {
-        $lifetime = $this->getContainer('config')->get('rinvex.repository.cache.lifetime');
-
         // Return value even if it's zero "0" (which means cache is disabled)
-        return ! is_null($this->cacheLifetime) ? $this->cacheLifetime : $lifetime;
+        return $this->cacheLifetime ?? $this->getContainer('config')->get('rinvex.repository.cache.lifetime');
     }
 
     /**
-     * Set the repository cache driver.
-     *
-     * @param string $cacheDriver
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function setCacheDriver($cacheDriver)
     {
@@ -155,21 +143,15 @@ public function setCacheDriver($cacheDriver)
     }
 
     /**
-     * Get the repository cache driver.
-     *
-     * @return string
+     * {@inheritdoc}
      */
     public function getCacheDriver(): string
     {
         return $this->cacheDriver;
     }
 
     /**
-     * Enable repository cache clear.
-     *
-     * @param bool $status
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function enableCacheClear($status = true)
     {
@@ -179,19 +161,15 @@ public function enableCacheClear($status = true)
     }
 
     /**
-     * Determine if repository cache clear is enabled.
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function isCacheClearEnabled(): bool
     {
         return $this->cacheClearEnabled;
     }
 
     /**
-     * Forget the repository cache.
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function forgetCache()
     {