Reverted the reversion after CI composer issues have been fixed

artkonekt · Nov 4, 2020 · bc10ce4 · bc10ce4
1 parent 6fd2394
commit bc10ce4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/CastsEnums.php b/src/CastsEnums.php
@@ -95,9 +95,9 @@ protected function addEnumAttributesToArray(array $attributes): array
     {
         foreach ($this->enums as $key => $value) {
             // Don't set if the field is not present (pluck or not selecting them in the SQL can cause it)
-            //if (isset($this->attributes[$key])) {
+            if (isset($this->attributes[$key])) {
                 $attributes[$key] = $this->getAttributeValue($key)->value();
-            //}
+            }
         }
 
         return $attributes;

diff --git a/tests/EnumToArrayTest.php b/tests/EnumToArrayTest.php
@@ -83,7 +83,7 @@ public function returns_enum_default_string_value_when_attribute_is_null()
 
         $order = new Order([
             'number' => 'abc123',
-            //'status' => null
+            'status' => null
         ]);
 
         $array = $order->attributesToArray();
@@ -93,16 +93,16 @@ public function returns_enum_default_string_value_when_attribute_is_null()
         $this->assertEquals($array['status'], OrderStatus::__DEFAULT);
     }
 
-//    /** @test */
-//    public function it_does_not_set_the_attribute_key_if_the_attribute_is_absent_in_the_model()
-//    {
-//        $order = new Order([
-//            'number' => 'abc123'
-//        ]);
-//
-//        $array = $order->attributesToArray();
-//        $this->assertArrayNotHasKey('status', $array);
-//    }
+    /** @test */
+    public function it_does_not_set_the_attribute_key_if_the_attribute_is_absent_in_the_model()
+    {
+        $order = new Order([
+            'number' => 'abc123'
+        ]);
+
+        $array = $order->attributesToArray();
+        $this->assertArrayNotHasKey('status', $array);
+    }
 
     /**
      * @test
@@ -118,7 +118,7 @@ public function returns_enum_v2_default_string_value_when_attribute_is_null()
 
         $order = new OrderV2([
             'number' => 'abc123',
-            //'status' => null
+            'status' => null
         ]);
 
         $array = $order->attributesToArray();