diff --git a/src/Illuminate/Queue/Console/stubs/jobs.stub b/src/Illuminate/Queue/Console/stubs/jobs.stub index 347ac2ec5fc8..8d9265d5f8f3 100644 --- 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 index 13aece661043..30ad3abf2064 100755 --- 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 index 3a67a31bfdaf..fcc4e43af430 100755 --- 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 index 0d6d046ea11f..c7494655d12e 100644 --- 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()