update PSR + new test for loadLimit

Author: Alexmg86

tests/LaravelSubQueryWithAvgTest.php

@@ -126,11 +126,9 @@ public function testSortingScopes()
 
         $result = Invoice::withAvg('items:price')->toSql();
 
-        $this->assertSame(
-            'select "invoices".*, (select avg(price) from "items"
-            where "invoices"."id" = "items"."invoice_id") as "items_price_avg"
-            from "invoices"',
-            $result
-        );
+        $query = 'select "invoices".*, (select avg(price) from "items"';
+        $query .= ' where "invoices"."id" = "items"."invoice_id") as "items_price_avg"';
+        $query .= ' from "invoices"';
+        $this->assertSame($query, $result);
     }
 }

tests/LaravelSubQueryWithLimitTest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Alexmg86\LaravelSubQuery\Tests;
+
+use Alexmg86\LaravelSubQuery\Facades\LaravelSubQuery;
+use Alexmg86\LaravelSubQuery\ServiceProvider;
+use Alexmg86\LaravelSubQuery\Tests\Models\Good;
+use Alexmg86\LaravelSubQuery\Tests\Models\Invoice;
+use Alexmg86\LaravelSubQuery\Tests\Models\Item;
+
+class LaravelSubQueryWithLimitTest extends DatabaseTestCase
+{
+    protected function getPackageProviders($app)
+    {
+        return [ServiceProvider::class];
+    }
+
+    protected function getPackageAliases($app)
+    {
+        return [
+            'laravel-sub-query' => LaravelSubQuery::class,
+        ];
+    }
+
+    private function createBasic()
+    {
+        for ($id = 1; $id < 5; $id++) {
+            $invoice = Invoice::create(['id' => $id, 'name' => 'text_name']);
+
+            for ($i = 1; $i < 11; $i++) {
+                Item::create(['invoice_id' => $id, 'price' => $i, 'price2' => $i + 1]);
+                Good::create(['invoice_id' => $id, 'price' => $i, 'price2' => $i + 1]);
+            }
+        }
+    }
+
+    public function testBasic()
+    {
+        $this->createBasic();
+
+        $results = Invoice::all();
+        $results->loadLimit('items:1', 'goods:2');
+
+        foreach ($results as $result) {
+            $this->assertEquals(count($result->items), 1);
+            $this->assertEquals(count($result->goods), 2);
+        }
+    }
+
+    public function testWithConditions()
+    {
+        $this->createBasic();
+
+        $results = Invoice::all();
+        $results->loadLimit(['items:1', 'goods:2' => function ($query) {
+            $query->orderBy('id', 'desc')->where('price', '<', 6);
+        }]);
+
+        foreach ($results as $result) {
+            $this->assertEquals(count($result->items), 1);
+            $this->assertEquals(count($result->goods), 2);
+
+            foreach ($result->goods as $good) {
+                $this->assertLessThan(6, $good->price);
+            }
+        }
+    }
+}

tests/LaravelSubQueryWithMaxTest.php

@@ -126,11 +126,9 @@ public function testSortingScopes()
 
         $result = Invoice::withMax('items:price')->toSql();
 
-        $this->assertSame(
-            'select "invoices".*, (select max(price) from "items"
-            where "invoices"."id" = "items"."invoice_id") as "items_price_max"
-            from "invoices"',
-            $result
-        );
+        $query = 'select "invoices".*, (select max(price) from "items"';
+        $query .= ' where "invoices"."id" = "items"."invoice_id") as "items_price_max"';
+        $query .= ' from "invoices"';
+        $this->assertSame($query, $result);
     }
 }

tests/LaravelSubQueryWithMinTest.php

@@ -120,11 +120,9 @@ public function testSortingScopes()
 
         $result = Invoice::withMin('items:price')->toSql();
 
-        $this->assertSame(
-            'select "invoices".*, (select min(price) from "items"
-            where "invoices"."id" = "items"."invoice_id") as "items_price_min"
-            from "invoices"',
-            $result
-        );
+        $query = 'select "invoices".*, (select min(price) from "items"';
+        $query .= ' where "invoices"."id" = "items"."invoice_id") as "items_price_min"';
+        $query .= ' from "invoices"';
+        $this->assertSame($query, $result);
     }
 }

tests/LaravelSubQueryWithSumTest.php

@@ -126,11 +126,9 @@ public function testSortingScopes()
 
         $result = Invoice::withSum('items:price')->toSql();
 
-        $this->assertSame(
-            'select "invoices".*, (select sum(price) from "items"
-            where "invoices"."id" = "items"."invoice_id") as "items_price_sum"
-            from "invoices"',
-            $result
-        );
+        $query = 'select "invoices".*, (select sum(price) from "items"';
+        $query .= ' where "invoices"."id" = "items"."invoice_id") as "items_price_sum"';
+        $query .= ' from "invoices"';
+        $this->assertSame($query, $result);
     }
 }