prepare more

Author: fico7489

.gitignore

@@ -1,2 +1,6 @@
 /vendor
-composer.lock
+composer.lock
+/.idea
+/.php_cs.cache
+/.phpstorm.meta.php
+_ide_helper_models.php

composer.json

@@ -26,9 +26,9 @@
         "illuminate/database": "5.2.*"
     },
     "require-dev": {
-        "orchestra/testbench": "3.*",
-		"orchestra/database": "3.*",
-		"phpunit/phpunit": ">5.0"
+        "orchestra/testbench": ">=3.0",
+		"orchestra/database": ">=3.0",
+		"phpunit/phpunit": "~5.0"
     },
     "autoload": {
         "psr-4": {

tests/Models/Location.php

@@ -6,9 +6,9 @@
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class User extends BaseModel implements AuthenticatableContract
+class Location extends BaseModel
 {
     protected $table = 'locations';
 
-    protected $fillable = ['address'];
+    protected $fillable = ['address', 'seller_id'];
 }

tests/Models/Order.php

@@ -2,11 +2,11 @@
 
 namespace Fico7489\Laravel\SortJoin\Tests\Models;
 
-class Role extends BaseModel
+class Order extends BaseModel
 {
     protected $table = 'orders';
 
-    protected $fillable = ['number'];
+    protected $fillable = ['number', 'seller_id'];
 
 	public function seller()
     {

tests/Models/OrderItem.php

@@ -6,7 +6,7 @@ class OrderItem extends BaseModel
 {
     protected $table = 'order_items';
 
-    protected $fillable = ['name'];
+    protected $fillable = ['name', 'order_id'];
 
 	public function order()
     {

tests/Models/Seller.php

@@ -2,7 +2,7 @@
 
 namespace Fico7489\Laravel\SortJoin\Tests\Models;
 
-class User extends BaseModel
+class Seller extends BaseModel
 {
     protected $table = 'sellers';
 

tests/SortJoinTraitTest.php

@@ -2,20 +2,38 @@
 
 namespace Fico7489\Laravel\SortJoin\Tests;
 
-use Illuminate\Database\Eloquent\Model;
+use Fico7489\Laravel\SortJoin\Tests\Models\Seller;
+use Fico7489\Laravel\SortJoin\Tests\Models\Order;
+use Fico7489\Laravel\SortJoin\Tests\Models\OrderItem;
+use Fico7489\Laravel\SortJoin\Tests\Models\Location;
 
 class SortJoinTraitTest extends TestCase
 {
-    static $events = [];
-
     public function setUp()
     {
         parent::setUp();
 
-		//
+        $seller = Seller::create(['title' => 'title']);
+        $seller2 = Seller::create(['title' => 'title2']);
+        $seller3 = Seller::create(['title' => 'title3']);
+        $seller4 = Seller::create(['title' => 'title4']);
+
+        $location = Location::create(['address' => 'address', 'seller_id' => $seller->id]);
+        $location2 = Location::create(['address' => 'address2', 'seller_id' => $seller2->id]);
+        $location3 = Location::create(['address' => 'address3', 'seller_id' => $seller3->id]);
+        $location4 = Location::create(['address' => 'address4', 'seller_id' => $seller3->id]);
+
+        $order = Order::create(['number' => '1', 'seller_id' => $seller->id]);
+        $order2 = Order::create(['number' => '2', 'seller_id' => $seller2->id]);
+        $order3 = Order::create(['number' => '3', 'seller_id' => $seller3->id]);
+
+        $orderItem = OrderItem::create(['name' => '1', 'seller_id' => $seller->id]);
+        $orderItem2 = OrderItem::create(['name' => '2', 'seller_id' => $seller2->id]);
+        $orderItem3 = OrderItem::create(['name' => '3', 'seller_id' => $seller3->id]);
+        $orderItem4 = OrderItem::create(['name' => '4', 'seller_id' => $seller->id]);
     }
 
-    public function test_First()
+    public function test_OrderByJoin()
     {
         $this->assertTrue(true);
     }

tests/TestCase.php

@@ -2,8 +2,6 @@
 
 namespace Fico7489\Laravel\SortJoin\Tests;
 
-use Fico7489\Laravel\RevisionableUpgrade\Providers\RevisionableUpgradeServiceProvider;
-
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
     public function setUp()
@@ -14,7 +12,6 @@ public function setUp()
     protected function getEnvironmentSetUp($app)
     {
         // Setup default database to use sqlite :memory:
-        $app['config']->set('auth.model', \Fico7489\Laravel\RevisionableUpgrade\Tests\Models\User::class);
         $app['config']->set('database.default', 'testbench');
         $app['config']->set('database.connections.testbench', [
             'driver'   => 'sqlite',

tests/database/migrations/2017_11_04_163552_create_database.php

@@ -16,10 +16,10 @@ class CreateDatabase extends Migration
      */
     public function up()
     {
-        Schema::create('order_item', function (Blueprint $table) {
+        Schema::create('order_items', function (Blueprint $table) {
 			$table->increments('id');
 			$table->string('name');
-			$table->integer('order_id')->unsigned()->index();
+			$table->integer('order_id')->unsigned()->index()->nullable();
 
 			$table->foreign('order_id')->references('id')->on('orders')
 				->onUpdate('cascade')->onDelete('cascade');
@@ -31,7 +31,7 @@ public function up()
         Schema::create('orders', function (Blueprint $table) {
 			$table->increments('id');
 			$table->string('number')->nullable();
-			$table->integer('seller_id')->unsigned()->index();
+			$table->integer('seller_id')->unsigned()->index()->nullable();
 
 			$table->foreign('seller_id')->references('id')->on('sellers')
 				->onUpdate('cascade')->onDelete('cascade');
@@ -51,7 +51,7 @@ public function up()
 		Schema::create('locations', function (Blueprint $table) {
 			$table->increments('id');
 			$table->string('address')->nullable();
-			$table->integer('seller_id')->unsigned()->index();
+			$table->integer('seller_id')->unsigned()->index()->nullable();
 
 			$table->foreign('seller_id')->references('id')->on('sellers')
 				->onUpdate('cascade')->onDelete('cascade');