Fix failing tests

Author: jasonmccreary

src/Tasks/DebugCalls.php

@@ -3,8 +3,8 @@
 namespace Shift\Cli\Tasks;
 
 use Shift\Cli\Sdk\Contracts\Task;
-use Shift\Cli\Sdk\Parsers\NikicParser;
 use Shift\Cli\Sdk\Facades\Comment;
+use Shift\Cli\Sdk\Parsers\NikicParser;
 use Shift\Cli\Sdk\Traits\FindsFiles;
 
 class DebugCalls implements Task

src/Tasks/ExplicitOrderBy.php

@@ -3,9 +3,9 @@
 namespace Shift\Cli\Tasks;
 
 use Shift\Cli\Sdk\Contracts\Task;
+use Shift\Cli\Sdk\Models\File;
 use Shift\Cli\Sdk\Parsers\Finders\QueryOrderByFinder;
 use Shift\Cli\Sdk\Parsers\NikicParser;
-use Shift\Cli\Sdk\Models\File;
 use Shift\Cli\Sdk\Traits\FindsFiles;
 
 class ExplicitOrderBy implements Task

src/Tasks/LatestOldest.php

@@ -3,9 +3,9 @@
 namespace Shift\Cli\Tasks;
 
 use Shift\Cli\Sdk\Contracts\Task;
+use Shift\Cli\Sdk\Models\File;
 use Shift\Cli\Sdk\Parsers\Finders\QueryOrderByFinder;
 use Shift\Cli\Sdk\Parsers\NikicParser;
-use Shift\Cli\Sdk\Models\File;
 use Shift\Cli\Sdk\Traits\FindsFiles;
 
 class LatestOldest implements Task

src/Tasks/ModelTableName.php

@@ -21,8 +21,6 @@ public function perform(): int
                 continue;
             }
 
-            var_dump('here');
-
             $conventional_name = $this->tableNameFromClassName($model->getShortName(), $this->isPivotModel($model));
 
             if ($model->getProperty('table')->getDefaultValue() !== $conventional_name) {
@@ -33,8 +31,8 @@ public function perform(): int
             $class = $this->parseClass($file->contents());
 
             $start = $class['properties']['table']['comment'] ? $class['properties']['table']['comment']['line']['start'] : $class['properties']['table']['line']['start'];
-            $file->removeBlankLinesAfter($class['properties']['table']['line']['end']);
             $file->removeSegment($start, $class['properties']['table']['line']['end']);
+            $file->removeBlankLinesAround($start);
 
             file_put_contents($path, $file->contents());
         }

tests/Feature/Tasks/ModelTableNameTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Feature\Tasks;
 
 use PHPUnit\Framework\Attributes\Test;
+use Shift\Cli\Sdk\Facades\Reflector;
 use Shift\Cli\Sdk\Testing\InteractsWithProject;
 use Shift\Cli\Sdk\Testing\TestCase;
 use Shift\Cli\Tasks\ModelTableName;
@@ -16,6 +17,26 @@ class ModelTableNameTest extends TestCase
 
     private ModelTableName $subject;
 
+    private function mockReflectionClass(string $name, string $table, bool $pivot = false)
+    {
+        $mock = \Mockery::mock(\ReflectionClass::class);
+        $mock->expects('isSubclassOf')
+            ->with('Illuminate\\Database\\Eloquent\\Model')
+            ->andReturn(true);
+        $mock->expects('getDefaultProperties')
+            ->andReturn(['table' => $table]);
+        $mock->expects('isSubclassOf')
+            ->with('Illuminate\\Database\\Eloquent\\Relations\\Pivot')
+            ->andReturn($pivot);
+        $mock->expects('getShortName')
+            ->withNoArgs()
+            ->andReturn($name);
+        $mock->expects('getProperty->getDefaultValue')
+            ->andReturn($table);
+
+        return $mock;
+    }
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -45,6 +66,15 @@ public function it_replaces_arguments_with_explicit_methods()
             'app/Models/RoleUser.php' => 'tests/fixtures/table-name/pivot.php',
         ]);
 
+        $reflector = \Mockery::mock('Reflector');
+        $reflector->expects('classFromPath')
+            ->with($this->currentSnapshotPath() . '/app/Models/User.php')
+            ->andReturn($this->mockReflectionClass('User', 'users'));
+        $reflector->expects('classFromPath')
+            ->with($this->currentSnapshotPath() . '/app/Models/RoleUser.php')
+            ->andReturn($this->mockReflectionClass('RoleUser', 'role_user', true));
+        Reflector::swap($reflector);
+
         $result = $this->subject->perform();
 
         $this->assertSame(0, $result);

tests/fixtures/class-strings/complex.after.php

@@ -12,9 +12,9 @@ class RouteServiceProvider extends ServiceProvider
 
     public function boot(): void
     {
-        Route::bind('user', \Shift\Cli\Models\User::class);
-        Route::bind('comment', \Shift\Cli\Models\Comment::class);
-        Route::bind('post', \Shift\Cli\Models\Post::class);
+        Route::bind('user', \App\Models\User::class);
+        Route::bind('comment', \App\Models\Comment::class);
+        Route::bind('post', \App\Models\Post::class);
 
         Route::bind('foo', \Modules\Foo::class);
         Route::bind('bar', \Modules\Bar::class);

tests/fixtures/class-strings/complex.php

@@ -13,8 +13,8 @@ class RouteServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Route::bind('user', 'App\Models\User');
-        Route::bind('comment', '\\Shift\Cli\\Models\\Comment');
-        Route::bind('post', "\Shift\Cli\Models\Post");
+        Route::bind('comment', '\\App\\Models\\Comment');
+        Route::bind('post', "\App\Models\Post");
 
         Route::bind('foo', "Modules\Foo");
         Route::bind('bar', '\Modules\Bar');

tests/fixtures/class-strings/simple.after.php

@@ -8,11 +8,11 @@ class Post extends Model
 {
     public function user()
     {
-        return $this->belongsTo(\Shift\Cli\Models\User::class);
+        return $this->belongsTo(\App\Models\User::class);
     }
 
     public function comments()
     {
-        return $this->hasMany(\Shift\Cli\Models\Comment::class);
+        return $this->hasMany(\App\Models\Comment::class);
     }
 }