Brought tests back to green.

Author: mikebronner

src/Traits/BuilderCaching.php

@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Traits;
+<?php
+
+namespace GeneaLabs\LaravelModelCaching\Traits;
 
 use Illuminate\Database\Eloquent\Collection;
 
@@ -31,15 +33,20 @@ public function withoutGlobalScope($scope)
 
     public function withoutGlobalScopes(array $scopes = null)
     {
-        if ($scopes != null) {
+        if ($scopes !== null) {
             $this->withoutGlobalScopes = $scopes;
         }
 
-        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
+        if (
+            $scopes == null
+            || (
+                $scopes !== null
+                && count($scopes) === 0
+            )
+        ) {
             $this->withoutAllGlobalScopes = true;
         }
 
         return parent::withoutGlobalScopes($scopes);
     }
-
 }

src/Traits/Caching.php

@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Traits;
+<?php
+
+namespace GeneaLabs\LaravelModelCaching\Traits;
 
 use Closure;
 use GeneaLabs\LaravelModelCaching\CachedBuilder;
@@ -45,15 +47,19 @@ public function applyScopes()
 
     protected function applyScopesToInstance()
     {
-        if (! property_exists($this, "scopes")
+        if (
+            ! property_exists($this, "scopes")
             || $this->scopesAreApplied
             || $this->withoutAllGlobalScopes
         ) {
             return;
         }
 
         foreach ($this->scopes as $identifier => $scope) {
-            if (! isset($this->scopes[$identifier]) || isset($this->withoutGlobalScopes[$identifier])) {
+            if (
+                ! isset($this->scopes[$identifier])
+                || isset($this->withoutGlobalScopes[$identifier])
+            ) {
                 continue;
             }
 
@@ -62,7 +68,8 @@ protected function applyScopesToInstance()
                     $scope($this);
                 }
 
-                if ($scope instanceof Scope
+                if (
+                    $scope instanceof Scope
                     && $this instanceof CachedBuilder
                 ) {
                     $scope->apply($this, $this->getModel());
@@ -127,7 +134,8 @@ protected function getCachePrefix() : string
             ->make("config")
             ->get("laravel-model-caching.cache-prefix", "");
 
-        if ($this->model
+        if (
+            $this->model
             && property_exists($this->model, "cachePrefix")
         ) {
             $cachePrefix = $this->model->cachePrefix;
@@ -163,7 +171,8 @@ protected function makeCacheKey(
                 ->make("db")
                 ->query();
 
-        if ($this->query
+        if (
+            $this->query
             && method_exists($this->query, "getQuery")
         ) {
             $query = $this->query->getQuery();
@@ -230,7 +239,8 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
     {
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown
+        if (
+            ! $cacheCooldown
             || (new Carbon)->now()->diffInSeconds($invalidatedAt) < $cacheCooldown
         ) {
             return;
@@ -287,22 +297,25 @@ public function isCachable() : bool
             ->get("laravel-model-caching.enabled");
         $allRelationshipsAreCachable = true;
 
-        if (property_exists($this, "eagerLoad")
+        if (
+            property_exists($this, "eagerLoad")
             && $this->eagerLoad
         ) {
             $allRelationshipsAreCachable = collect($this
                 ->eagerLoad)
                 ->keys()
                 ->reduce(function ($carry, $related) {
-                    if (! method_exists($this->model, $related)
+                    if (
+                        ! method_exists($this->model, $related)
                         || $carry === false
                     ) {
                         return $carry;
                     }
 
                     $relatedModel = $this->model->$related()->getRelated();
 
-                    if (! method_exists($relatedModel, "isCachable")
+                    if (
+                        ! method_exists($relatedModel, "isCachable")
                         || ! $relatedModel->isCachable()
                     ) {
                         return false;

tests/Integration/CachedBuilder/UpdateRelationTest.php

@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
+<?php
+
+namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;