fix casing issue with guarded

laravel · Aug 5, 2020 · 1b70bef · 1b70bef
1 parent 27283b6
commit 1b70bef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php
@@ -163,7 +163,7 @@ public function isFillable($key)
      */
     public function isGuarded($key)
     {
-        return in_array($key, $this->getGuarded()) || $this->getGuarded() == ['*'];
+        return $this->getGuarded() == ['*'] || ! empty(preg_grep('/^'.preg_quote($key).'$/i', $this->getGuarded()));
     }
 
     /**

diff --git a/tests/Integration/Database/EloquentModelTest.php b/tests/Integration/Database/EloquentModelTest.php
@@ -29,6 +29,15 @@ protected function setUp(): void
         });
     }
 
+    public function testCantUpdateGuardedAttributesUsingDifferentCasing()
+    {
+        $model = new TestModel2;
+
+        $model->fill(['ID' => 123]);
+
+        $this->assertNull($model->ID);
+    }
+
     public function testUserCanUpdateNullableDate()
     {
         $user = TestModel1::create([
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,7 +163,7 @@ public function isFillable($key) @@
          */
         public function isGuarded($key)
         {
-            return in_array($key, $this->getGuarded()) || $this->getGuarded() == ['*'];
+            return $this->getGuarded() == ['*'] || ! empty(preg_grep('/^'.preg_quote($key).'$/i', $this->getGuarded()));
         }
         /**
@@ Expand Down @@