Added check for scopes to avoid them being applied twice. Thanks @saernz!

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.8.7] - 2020-07-02
+### Added
+- check for scopes to avoid them being applied twice. Thanks @saernz!
+
 ## [0.8.6] - 2020-05-12
 ### Changed
 - implementation of `debug_backtrace()` to reduce memory consumption. Thanks @saernz!

src/Traits/Buildable.php

@@ -292,19 +292,4 @@ function () use ($arguments, $cacheKey, $method) {
                 }
             );
     }
-
-    /**
-     * Apply the scopes if they haven't already been applied, if they have
-     * just return the builder. This prevents scopes from being applied twice.
-     *
-     * @return static
-     */
-    public function applyScopes()
-    {
-        if ($this->scopesAreApplied) {
-            return $this;
-        }
-        
-        return parent::applyScopes();
-    }
 }

src/Traits/Caching.php

@@ -32,6 +32,15 @@ public function __call($method, $parameters)
         return $result;
     }
 
+    public function applyScopes() : self
+    {
+        if ($this->scopesAreApplied) {
+            return $this;
+        }
+        
+        return parent::applyScopes();
+    }
+
     protected function applyScopesToInstance()
     {
         if (! property_exists($this, "scopes")

tests/Integration/CachedBuilder/ScopeTest.php

@@ -178,14 +178,20 @@ public function testLocalScopesInRelationship()
 
     public function testScopeNotAppliedTwice()
     {
-        factory(Author::class, 10)->create();
-        $user = factory(User::class)->create(["name" => "Anton Junior"]);
+        $user = factory(User::class)
+            ->create(["name" => "Anton Junior"]);
         $this->actingAs($user);
         DB::enableQueryLog();
-        $authorsA = (new AuthorBeginsWithScoped)
+        
+        (new AuthorBeginsWithScoped)
             ->get();
         $queryLog = DB::getQueryLog();
+
         $this->assertCount(1, $queryLog);
-        $this->assertCount(1, $queryLog[0]['bindings'], "There should only be 1 binding, scope is being applied more than once.");
+        $this->assertCount(
+            1,
+            $queryLog[0]['bindings'],
+            "There should only be 1 binding, scope is being applied more than once."
+        );
     }
 }