update

Author: Blazik

composer.json

@@ -15,6 +15,10 @@
         "barryvdh/reflection-docblock": "^2.1",
         "composer/class-map-generator": "^1.1"
     },
+    "require-dev": {
+        "orchestra/testbench": "^8.13",
+        "nunomaduro/collision": "^7.8"
+    },
     "autoload": {
         "psr-4": {
             "BoredProgrammers\\LaravelEloquentMappable\\": "src/"
@@ -26,5 +30,26 @@
                 "BoredProgrammers\\LaravelEloquentMappable\\Providers\\LaravelEloquentMappableServiceProvider"
             ]
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "BoredProgrammers\\LaravelEloquentMappable\\Tests\\": "tests",
+            "Workbench\\App\\": "workbench/app/",
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
+            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
+        }
+    },
+    "scripts": {
+        "post-autoload-dump": [
+            "@clear",
+            "@prepare"
+        ],
+        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
+        "prepare": "@php vendor/bin/testbench package:discover --ansi",
+        "build": "@php vendor/bin/testbench workbench:build --ansi",
+        "serve": [
+            "@build",
+            "@php vendor/bin/testbench serve"
+        ]
     }
 }

src/Models/Traits/HasMappableColumns.php

@@ -35,7 +35,7 @@ protected static function bootHasMappableColumns(): void
     public function newInstance($attributes = [], $exists = false): Model
     {
         /** @var Model $instance */
-        $instance = parent::newInstance($attributes, $exists);
+        $instance = parent::newInstance(exists: $exists);
 
         foreach ($instance->mapAttributeToColumn ?? [] as $attribute => $column) {
             $instance->hidden[] = $column;
@@ -50,6 +50,8 @@ public function newInstance($attributes = [], $exists = false): Model
             }
         }
 
+        $instance->fill((array)$attributes);
+
         return $instance;
     }
 

testbench.yaml

@@ -0,0 +1,19 @@
+providers: []
+
+migrations:
+  - workbench/database/migrations
+
+seeders:
+  - Workbench\Database\Seeders\DatabaseSeeder
+
+workbench:
+  start: '/'
+  install: true
+  welcome: true
+  discovers:
+    web: false
+    api: false
+    commands: false
+  build: []
+  assets: []
+  sync: []

tests/TestCase.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace BoredProgrammers\LaravelEloquentMappable\Tests;
+
+use Closure;
+use Orchestra\Testbench\TestCase as OrchestraTestCase;
+
+class TestCase extends OrchestraTestCase
+{
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->loadMigrationsFrom(__DIR__ . '/../workbench/database/migrations');
+        $this->artisan('migrate', ['--database' => 'laravel_eloquent_mappable'])->run();
+    }
+
+    protected function setUpDatabaseRequirements(Closure $callback): void
+    {
+    }
+
+
+    protected function getEnvironmentSetUp($app): void
+    {
+        $app['config']->set('database.default', 'laravel_eloquent_mappable');
+        $app['config']->set('database.connections.laravel_eloquent_mappable', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ]);
+    }
+
+}

tests/Unit/EloquentTest.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+namespace BoredProgrammers\LaravelEloquentMappable\Tests\Unit;
+
+use BoredProgrammers\LaravelEloquentMappable\Tests\TestCase;
+use Workbench\App\Models\Post;
+
+class EloquentTest extends TestCase
+{
+
+    public function test_create()
+    {
+        $post = Post::create([
+            'mapped_title' => 'testing title',
+            'content' => 'testing content',
+        ]);
+
+        $this->assertEquals('testing title', $post->mapped_title);
+        $this->assertEquals('testing title', $post->title);
+    }
+
+    public function test_delete()
+    {
+        Post::create([
+            'mapped_title' => 'testing title2',
+            'content' => 'testing content2',
+        ]);
+        Post::create([
+            'mapped_title' => 'testing title3',
+            'content' => 'testing content3',
+        ]);
+
+        $this->assertEquals(2, Post::count());
+
+        Post::whereMappedTitle('testing title2')->delete();
+
+        $this->assertEquals(1, Post::count());
+    }
+
+}

tests/Unit/QueryBuilderTest.php

@@ -0,0 +1,74 @@
+<?php declare(strict_types=1);
+
+namespace BoredProgrammers\LaravelEloquentMappable\Tests\Unit;
+
+use BoredProgrammers\LaravelEloquentMappable\Tests\TestCase;
+use Illuminate\Database\Query\JoinClause;
+use Workbench\App\Models\Post;
+
+class QueryBuilderTest extends TestCase
+{
+
+    public function test_where()
+    {
+        $this->assertEquals(
+            "select * from \"posts\" where \"title\" = 'asd'",
+            Post::whereMappedTitle('asd')->toRawSql()
+        );
+
+        $this->assertEquals(
+            "select * from \"posts\" where \"title\" = 'asd'",
+            Post::where('mapped_title', 'asd')
+                ->toRawSql()
+        );
+
+        $this->assertEquals(
+            "select * from \"posts\" where \"title\" != 'asd'",
+            Post::where('mapped_title', '!=', 'asd')
+                ->toRawSql()
+        );
+    }
+
+    public function test_or_where()
+    {
+        $this->assertEquals(
+            "select * from \"posts\" where \"title\" = 'asd' or \"title\" like '%testing%'",
+            Post::where('mapped_title', 'asd')
+                ->orWhere('mapped_title', 'like', '%testing%')
+                ->toRawSql()
+        );
+    }
+
+    public function test_where_not_null()
+    {
+        $this->assertEquals(
+            "select * from \"posts\" where \"title\" is not null",
+            Post::whereNotNull('mapped_title')
+                ->toRawSql()
+        );
+    }
+
+    public function test_join()
+    {
+        $this->assertEquals(
+            "select * from \"posts\""
+            . " inner join \"user_accounts\" on \"user_accounts\".\"id\" = \"posts\".\"title\""
+            . " where \"title\" is not null",
+            Post::whereNotNull('mapped_title')
+                ->join('user_accounts', 'user_accounts.id', '=', 'posts.mapped_title')
+                ->toRawSql()
+        );
+
+        $this->assertEquals(
+            "select * from \"posts\" inner join (\"user_accounts\" as \"ua1\""
+            . " inner join \"user_accounts\" as \"ua2\" on \"ua2\".\"id\" = \"posts\".\"title\")"
+            . " where \"title\" is not null",
+            Post::whereNotNull('mapped_title')
+                ->join('user_accounts as ua1', function (JoinClause $join) {
+                    $join->join('user_accounts as ua2', 'ua2.id', '=', 'posts.mapped_title');
+                })
+                ->toRawSql()
+        );
+    }
+
+}

workbench/.gitignore

@@ -0,0 +1,2 @@
+.env
+.env.dusk

workbench/app/Models/Post.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+namespace Workbench\App\Models;
+
+use BoredProgrammers\LaravelEloquentMappable\Models\Traits\HasMappableColumns;
+use Illuminate\Database\Eloquent\Model;
+
+class Post extends Model
+{
+
+    use HasMappableColumns;
+
+    protected $fillable = [
+        'mapped_title',
+        'content',
+    ];
+
+    public $mapAttributeToColumn = [
+        'mapped_title' => 'title'
+    ];
+}

workbench/database/factories/.gitkeep

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+
+    public function up(): void
+    {
+        Schema::create('posts', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->string('title');
+            $table->text('content');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('posts');
+    }
+
+};