Merge e3dc20c into 089a67b

composer.json

@@ -19,7 +19,8 @@
         "psr/log": "^1.1 || ^2.0 || ^3.0",
         "psr/simple-cache": " ^1.0 || ^2.0 || ^3.0",
         "symfony/cache": "^4.4 || ^5.0 || ^6.0",
-        "symfony/polyfill-php73": "^1.18"
+        "symfony/polyfill-php73": "^1.18",
+        "symfony/polyfill-php81": "^1.29"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^6.5 || ^7.0",

src/JsonMapper.php

@@ -89,12 +89,19 @@ static function (NamedMiddleware $namedMiddleware) use ($remove) {
         return $this;
     }
 
-    public function mapToClass(\stdClass $json, string $class)
+    public function mapToClass($json, string $class)
     {
+        if (!$json instanceof \stdClass && (\is_array($json) && array_is_list($json))) {
+            throw TypeError::forArgument(__METHOD__, '\stdClass|array<string, mixed>', $json, 1, '$json');
+        }
+
         if (! \class_exists($class)) {
             throw TypeError::forArgument(__METHOD__, 'class-string', $class, 2, '$class');
         }
 
+        if (is_array($json)) {
+            $json = (object) $json;
+        }
         $propertyMap = new PropertyMap();
 
         $handler = $this->resolve();

src/JsonMapperInterface.php

@@ -29,10 +29,11 @@ public function mapObject(\stdClass $json, $object);
 
     /**
      * @template T of object
+     * @param \stdClass|array<string, mixed> $json
      * @psalm-param class-string<T> $class
      * @return T
      */
-    public function mapToClass(\stdClass $json, string $class);
+    public function mapToClass($json, string $class);
 
     /**
      * @template T of object

tests/Implementation/JsonMapper.php

@@ -85,8 +85,11 @@ static function (NamedMiddleware $namedMiddleware) use ($remove) {
         return $this;
     }
 
-    public function mapToClass(\stdClass $json, string $class)
+    public function mapToClass($json, string $class)
     {
+        if (!$json instanceof \stdClass && (\is_array($json) && array_is_list($json))) {
+            throw TypeError::forArgument(__METHOD__, '\stdClass|array<string, mixed>', $json, 1, '$json');
+        }
         if (! \class_exists($class)) {
             throw new \Exception(); // @todo proper exception message
         }

tests/Integration/FeatureSupportsMapToClassWithAssociativeArray.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JsonMapper\Tests\Integration;
+
+use JsonMapper\JsonMapperFactory;
+use JsonMapper\Tests\Implementation\Popo;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @coversNothing
+ */
+class FeatureSupportsMapToClassWithAssociativeArray extends TestCase
+{
+    public function testItCanMapToClass(): void
+    {
+        // Arrange
+        $mapper = (new JsonMapperFactory())->bestFit();
+        $json =  json_decode('{"name": "one"}', true);
+
+        // Act
+        $object = $mapper->mapToClass($json, Popo::class);
+
+        // Assert
+        self::assertSame('one', $object->name);
+    }
+}