Fixed #119

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.2.53] - 6 May 2018
+### Fixed
+- `->inRandomOrder()` to not cache the query.
+
 ## [0.2.52] - 21 Mar 2018
 ### Changed
 - `flush` console command to be called `clear`, to match other laravel commands.

composer.json

@@ -19,17 +19,17 @@
     },
     "require-dev": {
         "codedungeon/phpunit-result-printer": "*",
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "0.9.*",
-        "orchestra/database": "3.6.x-dev@dev",
+        "fzaninotto/faker": "*",
+        "mockery/mockery": "*",
+        "orchestra/database": "^3.6",
         "orchestra/testbench": "^3.6",
         "orchestra/testbench-browser-kit": "^3.6",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",
         "phpunit/phpunit": "*",
         "sebastian/phpcpd": "*",
-        "symfony/thanks": "^1.0",
-        "predis/predis": "^1.1"
+        "symfony/thanks": "*",
+        "predis/predis": "*"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -9,7 +9,7 @@
     convertWarningsToExceptions="true"
     printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
     syntaxCheck="false"
 >
 <testsuites>

src/CachedBuilder.php

@@ -3,6 +3,7 @@
 use GeneaLabs\LaravelModelCaching\Traits\BuilderCaching;
 use GeneaLabs\LaravelModelCaching\Traits\Caching;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Support\Collection;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -78,6 +79,13 @@ public function get($columns = ["*"])
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
 
+    public function inRandomOrder($seed = '')
+    {
+        $this->isCachable = false;
+
+        return parent::inRandomOrder($seed);
+    }
+
     public function insert(array $values)
     {
         $this->checkCooldownAndFlushAfterPersiting($this->model);

tests/Integration/CachedBuilderRelationshipsTest.php

@@ -0,0 +1,41 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
+
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedBook;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Collection;
+
+class CachedBuilderRelationshipsTest extends IntegrationTestCase
+{
+    use RefreshDatabase;
+
+    public function testHasRelationshipResults()
+    {
+        $booksWithStores = (new Book)
+            ->with("stores")
+            ->has("stores")
+            ->get();
+        $key = "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook_exists_and_books.id_=_book_store.book_id-stores";
+        $tags = [
+            "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook",
+            "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesstore",
+        ];
+        $cachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get(sha1($key))["value"];
+
+        $this->assertNotEmpty($booksWithStores);
+        $this->assertEquals($booksWithStores, $cachedResults);
+    }
+}

tests/Integration/InRandomOrderQueryTest.php

@@ -0,0 +1,40 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
+
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedBook;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Collection;
+
+class InRandomOrderQueryTest extends IntegrationTestCase
+{
+    use RefreshDatabase;
+
+    public function testInRandomOrderCachesResults()
+    {
+        $cachedBook1 = (new Book)
+            ->inRandomOrder()
+            ->first();
+        $cachedBook2 = (new Book)
+            ->inRandomOrder()
+            ->first();
+        $book1 = (new UncachedBook)
+            ->inRandomOrder()
+            ->first();
+        $book2 = (new UncachedBook)
+            ->inRandomOrder()
+            ->first();
+
+        $this->assertNotEquals($book1, $book2);
+        $this->assertNotEquals($cachedBook1, $cachedBook2);
+    }
+}