Merge branch '5.4' of github.com:laravel/framework into 5.4

laravel · Aug 2, 2017 · 4fbf774 · 4fbf774
2 parents f7c6b89 + fdb7ef6
commit 4fbf774
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Illuminate/Queue/Console/stubs/jobs.stub b/src/Illuminate/Queue/Console/stubs/jobs.stub
@@ -17,7 +17,7 @@ class Create{{tableClassName}}Table extends Migration
             $table->bigIncrements('id');
             $table->string('queue');
             $table->longText('payload');
-            $table->tinyInteger('attempts')->unsigned();
+            $table->unsignedTinyInteger('attempts');
             $table->unsignedInteger('reserved_at')->nullable();
             $table->unsignedInteger('available_at');
             $table->unsignedInteger('created_at');

diff --git a/tests/Database/DatabaseEloquentBelongsToManyTest.php b/tests/Database/DatabaseEloquentBelongsToManyTest.php
@@ -116,7 +116,7 @@ public function testModelsAreProperlyMatchedToParents()
         $this->assertEquals(2, $models[1]->foo[0]->pivot->user_id);
         $this->assertEquals(2, $models[1]->foo[1]->pivot->user_id);
         $this->assertEquals(2, count($models[1]->foo));
-        $this->assertEquals(0, count((array) $models[2]->foo));
+        $this->assertNull($models[2]->foo);
     }
 
     public function testRelationIsProperlyInitialized()

diff --git a/tests/Database/DatabaseEloquentHasManyTest.php b/tests/Database/DatabaseEloquentHasManyTest.php
@@ -181,7 +181,7 @@ public function testModelsAreProperlyMatchedToParents()
         $this->assertEquals(2, $models[1]->foo[0]->foreign_key);
         $this->assertEquals(2, $models[1]->foo[1]->foreign_key);
         $this->assertEquals(2, count($models[1]->foo));
-        $this->assertEquals(0, count((array) $models[2]->foo));
+        $this->assertNull($models[2]->foo);
     }
 
     public function testCreateManyCreatesARelatedModelForEachRecord()

diff --git a/tests/Database/DatabaseEloquentHasManyThroughTest.php b/tests/Database/DatabaseEloquentHasManyThroughTest.php
@@ -98,7 +98,7 @@ public function testModelsAreProperlyMatchedToParents()
         $this->assertEquals(2, $models[1]->foo[0]->country_id);
         $this->assertEquals(2, $models[1]->foo[1]->country_id);
         $this->assertEquals(2, count($models[1]->foo));
-        $this->assertEquals(0, count((array) $models[2]->foo));
+        $this->assertNull($models[2]->foo);
     }
 
     public function testModelsAreProperlyMatchedToParentsWithNonPrimaryKey()
@@ -129,7 +129,7 @@ public function testModelsAreProperlyMatchedToParentsWithNonPrimaryKey()
         $this->assertEquals(2, $models[1]->foo[0]->country_id);
         $this->assertEquals(2, $models[1]->foo[1]->country_id);
         $this->assertEquals(2, count($models[1]->foo));
-        $this->assertEquals(0, count((array) $models[2]->foo));
+        $this->assertNull($models[2]->foo);
     }
 
     public function testAllColumnsAreSelectedByDefault()