Minor cleanup

- Update NS
- Add arrow function to justify PHP8.1+
- Remove redundant test
- Rename TestCase.php to LaravelTestCase.php

Author: hareland

README.md

@@ -16,13 +16,14 @@ composer require hareland/laravel-immutable-attributes
 ## Define Immutable Attributes
 
 Define the attributes to be immutable on your model:
+
 ```php
 <?php
 
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Hareland\Immutable\Traits\HasImmutableAttributes;
+use Hareland\LaravelImmutableAttributes\Traits\HasImmutableAttributes;
 
 class Product extends Model
 {

composer.json

@@ -5,8 +5,9 @@
   "license": "MIT",
   "authors": [
     {
-      "name": "Kristian Hareland",
-      "email": "[email protected]"
+      "name": "Hareland",
+      "email": "[email protected]",
+      "homepage": "https://github.com/hareland"
     }
   ],
   "require": {
@@ -23,18 +24,18 @@
   },
   "autoload": {
     "psr-4": {
-      "Hareland\\Immutable\\": "src/"
+      "Hareland\\LaravelImmutableAttributes\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Hareland\\Immutable\\Tests\\": "tests/"
+      "Hareland\\LaravelImmutableAttributes\\Tests\\": "tests/"
     }
   },
   "extra": {
     "laravel": {
       "providers": [
-        "Hareland\\Immutable\\ImmutableServiceProvider"
+        "Hareland\\LaravelImmutableAttributes\\LaravelImmutableAttributesServiceProvider"
       ]
     }
   },

src/LaravelImmutableAttributesServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Hareland\Immutable;
+namespace Hareland\LaravelImmutableAttributes;
 
 
 use Illuminate\Support\ServiceProvider;

src/Traits/HasImmutableAttributes.php

@@ -1,31 +1,26 @@
 <?php
 
-namespace Hareland\Immutable\Traits;
+namespace Hareland\LaravelImmutableAttributes\Traits;
 
 use Illuminate\Database\Eloquent\Model;
 
 trait HasImmutableAttributes
 {
-    public static function bootImmutableAttributes(): void
+    public static function bootHasImmutableAttributes(): void
     {
         static::updating(
-            function (Model $model) {
-                $this->resetImmutableAttributes($model);
-            }
+            fn(Model $model) => $model->resetImmutableAttributes($model),
         );
     }
 
     private function resetImmutableAttributes(Model $model): void
     {
-        collect($this->getImmutableAttributes())
-            ->each(
-                function (string $attribute) use ($model) {
-                    if (!is_null($model->getOriginal($attribute))
-                        && $model->getOriginal($attribute) !== $model->{$attribute}) {
-                        $model->{$attribute} = $model->getOriginal($attribute);
-                    }
-                }
-            );
+        foreach ($this->getImmutableAttributes() as $attribute) {
+            if (!is_null($model->getOriginal($attribute))
+                && $model->getOriginal($attribute) !== $model->{$attribute}) {
+                $model->{$attribute} = $model->getOriginal($attribute);
+            }
+        }
     }
 
     public function setAttribute($key, $value)

tests/ExampleImmutableModel.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Hareland\Immutable\Tests;
+namespace Hareland\LaravelImmutableAttributes\Tests;
 
 
-use Hareland\Immutable\Traits\HasImmutableAttributes;
+use Hareland\LaravelImmutableAttributes\Traits\HasImmutableAttributes;
 use Illuminate\Database\Eloquent\Model;
 
 /**

tests/TestCase.php renamed to tests/LaravelTestCase.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Hareland\Immutable\Tests;
+namespace Hareland\LaravelImmutableAttributes\Tests;
 
-use Hareland\Immutable\LaravelImmutableAttributesServiceProvider;
+use Hareland\LaravelImmutableAttributes\LaravelImmutableAttributesServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
-class TestCase extends Orchestra
+class LaravelTestCase extends Orchestra
 {
     protected function setUp(): void
     {

tests/Pest.php

@@ -1,5 +1,5 @@
 <?php
 
-use Hareland\Immutable\Tests\TestCase;
+use Hareland\LaravelImmutableAttributes\Tests\LaravelTestCase;
 
-uses(TestCase::class)->in(__DIR__);
+uses(LaravelTestCase::class)->in(__DIR__);

tests/Unit/HasImmutableAttributesTest.php

@@ -1,25 +1,13 @@
 <?php
 
-use Hareland\Immutable\Tests\ExampleImmutableModel;
+use Hareland\LaravelImmutableAttributes\Tests\ExampleImmutableModel;
 
 const TEST_LABEL = 'Test';
 const TEST_PRICE = 123.45;
+const TEST_OTHER_LABEL = 'other-Test';
 const TEST_INVALID_PRICE = 456.78;
 
-
-test('can fill a new model', function () {
-    $model = new ExampleImmutableModel([
-        'label' => TEST_LABEL,
-        'price' => TEST_PRICE,
-    ]);
-
-    $model->save();
-
-    expect($model->exists)->toBe(true);
-
-});
-
-test('cannot fill immutable on update', function () {
+it('cannot fill immutable attributes on update', function () {
     $model = new ExampleImmutableModel([
         'label' => TEST_LABEL,
         'price' => TEST_PRICE,
@@ -30,9 +18,11 @@
     expect($model->label)->toBe(TEST_LABEL);
     expect($model->price)->toBe(TEST_PRICE);
 
+    $model->label = TEST_OTHER_LABEL;
     $model->price = TEST_INVALID_PRICE;
     $model->save();
-    $model = $model->refresh();
 
+    //We expect the label to not be immutable, only the price.
+    expect($model->label)->toBe(TEST_OTHER_LABEL);
     expect($model->price)->not()->toBe(TEST_INVALID_PRICE);
 });

tests/example_immutable_model_migration.php

@@ -23,6 +23,6 @@ public function up()
 
     public function down()
     {
-        //..
+        Schema::drop('example_immutable_model');
     }
 };