Backfill tests for id migration method

Author: jasonmccreary

src/Generators/MigrationGenerator.php

@@ -5,6 +5,7 @@
 use Blueprint\Contracts\Generator;
 use Blueprint\Models\Model;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Str;
 
 class MigrationGenerator implements Generator
@@ -62,7 +63,7 @@ protected function buildDefinition(Model $model)
                 $dataType = 'uuid';
             }
 
-            if ($this->isLaravel7orNewer() && $dataType === 'bigIncrements') {
+            if ($dataType === 'bigIncrements' && $this->isLaravel7orNewer()) {
                 $definition .= self::INDENT . '$table->id(';
             } else {
                 $definition .= self::INDENT . '$table->' . $dataType . "('{$column->name()}'";
@@ -83,13 +84,7 @@ protected function buildDefinition(Model $model)
             foreach ($column->modifiers() as $modifier) {
                 if (is_array($modifier)) {
                     if (key($modifier) === 'foreign') {
-                        $foreign =
-                            self::INDENT .
-                            '$table->foreign(' .
-                            "'{$column->name()}')->references('id')->on('" .
-                            Str::lower(Str::plural(current($modifier))) .
-                            "')->onDelete('cascade');" .
-                            PHP_EOL;
+                        $foreign = self::INDENT . '$table->foreign(' . "'{$column->name()}')->references('id')->on('" . Str::lower(Str::plural(current($modifier))) . "')->onDelete('cascade');" . PHP_EOL;
                     } else {
                         $definition .= '->' . key($modifier) . '(' . current($modifier) . ')';
                     }
@@ -124,6 +119,6 @@ protected function getPath(Model $model, Carbon $timestamp)
 
     protected function isLaravel7orNewer()
     {
-        return version_compare(app()->version(), '7.0.0', '>=');
+        return version_compare(App::version(), '7.0.0', '>=');
     }
 }

tests/Feature/Generator/MigrationGeneratorTest.php

@@ -5,6 +5,7 @@
 use Blueprint\Blueprint;
 use Blueprint\Generators\MigrationGenerator;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\App;
 use Tests\TestCase;
 
 /**
@@ -95,6 +96,35 @@ public function output_uses_past_timestamp_for_multiple_migrations()
         $this->assertEquals(['created' => [$post_path, $comment_path]], $this->subject->output($tree));
     }
 
+    /**
+     * @test
+     */
+    public function output_uses_big_increments_for_id_column()
+    {
+        $app = \Mockery::mock();
+        $app->expects('version')
+            ->withNoArgs()
+            ->andReturn('6.0.0');
+        App::swap($app);
+
+        $this->files->expects('stub')
+            ->with('migration.stub')
+            ->andReturn(file_get_contents('stubs/migration.stub'));
+
+        $now = Carbon::now();
+        Carbon::setTestNow($now);
+
+        $timestamp_path = str_replace('timestamp', $now->format('Y_m_d_His'), 'database/migrations/timestamp_create_relationships_table.php');
+
+        $this->files->expects('put')
+            ->with($timestamp_path, $this->fixture('migrations/identity-columns-big-increments.php'));
+
+        $tokens = $this->blueprint->parse($this->fixture('definitions/model-identities.bp'));
+        $tree = $this->blueprint->analyze($tokens);
+
+        $this->assertEquals(['created' => [$timestamp_path]], $this->subject->output($tree));
+    }
+
     public function modelTreeDataProvider()
     {
         return [

tests/fixtures/migrations/comments.php

@@ -14,7 +14,7 @@ class CreateCommentsTable extends Migration
     public function up()
     {
         Schema::create('comments', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->text('content');
             $table->timestamps();
         });

tests/fixtures/migrations/identity-columns-big-increments.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRelationshipsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('relationships', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('post_id');
+            $table->unsignedBigInteger('another');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('relationships');
+    }
+}

tests/fixtures/migrations/identity-columns.php

@@ -14,7 +14,7 @@ class CreateRelationshipsTable extends Migration
     public function up()
     {
         Schema::create('relationships', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->unsignedBigInteger('post_id');
             $table->unsignedBigInteger('another');
         });

tests/fixtures/migrations/model-modifiers.php

@@ -14,7 +14,7 @@ class CreateModifiersTable extends Migration
     public function up()
     {
         Schema::create('modifiers', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->string('title')->nullable();
             $table->string('name', 1000)->unique()->charset('utf8');
             $table->string('content')->default('');

tests/fixtures/migrations/posts.php

@@ -14,7 +14,7 @@ class CreatePostsTable extends Migration
     public function up()
     {
         Schema::create('posts', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->string('title');
             $table->timestamps();
         });

tests/fixtures/migrations/readme-example.php

@@ -14,7 +14,7 @@ class CreatePostsTable extends Migration
     public function up()
     {
         Schema::create('posts', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->string('title', 400);
             $table->longText('content');
             $table->timestamp('published_at')->nullable();

tests/fixtures/migrations/relationships.php

@@ -14,7 +14,7 @@ class CreateCommentsTable extends Migration
     public function up()
     {
         Schema::create('comments', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->unsignedBigInteger('post_id');
             $table->unsignedBigInteger('author_id');
             $table->timestamps();

tests/fixtures/migrations/soft-deletes.php

@@ -14,7 +14,7 @@ class CreateCommentsTable extends Migration
     public function up()
     {
         Schema::create('comments', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
             $table->unsignedBigInteger('post_id');
             $table->softDeletes();
             $table->timestamps();