Merge pull request #11 from Laurgrin/getBoolFix

Resolve booleans from "boolean-y" values

Author: pelanis

CHANGELOG.md

@@ -1,11 +1,19 @@
 # Changelog
 
+## 0.3.1
+
+### Fixed
+
+- Try to extract boolean value from non-boolean type values if expected type is a boolean.
+
 ## 0.3.0
 
 ### Added
+
 - Support for php 8.0
 
 ### Removed
+
 - Removed (temporary) paysera/lib-php-cs-fixer-config
 
 ## 0.2.2
@@ -34,4 +42,4 @@
 ## 0.1.0
 
 ### Fixed
-- Fixes strange test case with PHP 7.0
+- Fixes strange test case with PHP 7.0

src/ObjectWrapper.php

@@ -240,6 +240,15 @@ private function assertValueType($value, string $expectedType, string $key)
             $givenType = 'float';
         }
 
+        if ($expectedType === 'boolean') {
+            $boolean = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+            if ($boolean === null) {
+                throw new InvalidItemTypeException($expectedType, $givenType, $this->buildKey($key));
+            }
+
+            return $boolean;
+        }
+
         if ($givenType !== $expectedType && !(is_int($value) && $expectedType === 'float')) {
             throw new InvalidItemTypeException($expectedType, $givenType, $this->buildKey($key));
         }

tests/ObjectWrapperTest.php

@@ -94,8 +94,11 @@ public function testGetRequiredStringWithNoItem()
 
     public function testGetRequiredBool()
     {
-        $object = new ObjectWrapper((object)['a' => true, 'b' => 'other type']);
+        $object = new ObjectWrapper((object)['a' => true, 'b' => 'other type', 'c' => 'false', 'd' => '1', 'e' => 0]);
         $this->assertTrue($object->getRequiredBool('a'));
+        $this->assertFalse($object->getRequiredBool('c'));
+        $this->assertTrue($object->getRequiredBool('d'));
+        $this->assertFalse($object->getRequiredBool('e'));
         $this->expectException(InvalidItemTypeException::class);
         $object->getRequiredBool('b');
     }
@@ -228,18 +231,12 @@ public function testGetArrayOfBoolWithDifferentType()
 
     public function testGetArrayOfBoolWithDifferentItemType()
     {
-        $array = [false, false, 0, true];
+        $array = [false, 'false', 0, true, 1, 'true'];
         $object = new ObjectWrapper((object)['a' => $array]);
-        $this->expectException(InvalidItemTypeException::class);
-        $object->getArrayOfBool('a');
-    }
-
-    public function testGetArrayOfBoolWithNullItem()
-    {
-        $array = [false, false, null, true];
-        $object = new ObjectWrapper((object)['a' => $array]);
-        $this->expectException(InvalidItemTypeException::class);
-        $object->getArrayOfBool('a');
+        $this->assertSame(
+            [false, false, false, true, true, true],
+            $object->getArrayOfBool('a')
+        );
     }
 
     public function testGetArrayOfFloat()