Merge pull request #1 from Shureban/v0.1.0

prepare to array of types

Author: Shureban

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "minimum-stability": "dev",
-    "version": "0.0.6",
+    "version": "0.1.0",
     "autoload": {
         "psr-4": {
             "Shureban\\LaravelObjectMapper\\": "src/"

src/ClassExtraInformation.php

@@ -25,6 +25,10 @@ public function __construct(ReflectionClass $class)
      */
     public function getFullObjectUseNamespace(string $objectName): ?string
     {
+        if (class_exists($objectName)) {
+            return $objectName;
+        }
+
         if (preg_match_all(self::UseRegex, $this->getClassFileContent(), $useRegexResult)) {
             foreach (current($useRegexResult) as $useLine) {
                 if (preg_match(self::UseNamespaceRegex, $useLine, $lineRegexResult) === 0) {

src/PhpDoc.php

@@ -5,7 +5,8 @@
 class PhpDoc
 {
     private const PropertyNameRegex = '/var(.*)?\$(?<name>\w+)/';
-    private const TypeNameRegex     = '/var\s(?<type>[\\a-zA-Z0-9]+)\s\$?/U';
+    private const TypeNameRegex     = '/var\s(?<type>[\\a-zA-Z0-9]+)([\[\]]+)?\s\$?/U';
+    private const ArrayOfRegex      = '/var .*\[\] \$?/';
 
     private string $phpDoc;
 
@@ -40,4 +41,12 @@ public function getPropertyType(): mixed
 
         return null;
     }
+
+    /**
+     * @return bool
+     */
+    public function isArrayOf(): bool
+    {
+        return (bool)preg_match(self::ArrayOfRegex, $this->phpDoc);
+    }
 }

src/Property.php

@@ -2,6 +2,7 @@
 
 namespace Shureban\LaravelObjectMapper;
 
+use ReflectionException;
 use ReflectionProperty;
 use Shureban\LaravelObjectMapper\Types\Factory;
 use Shureban\LaravelObjectMapper\Types\Type;
@@ -14,6 +15,8 @@ class Property
 
     /**
      * @param ReflectionProperty $property
+     *
+     * @throws ReflectionException
      */
     public function __construct(ReflectionProperty $property)
     {

src/Types/Custom/ArrayOfType.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Shureban\LaravelObjectMapper\Types\Custom;
+
+use Shureban\LaravelObjectMapper\ObjectMapper;
+use Shureban\LaravelObjectMapper\Types\SimpleTypes\ObjectType;
+
+class ArrayOfType extends ObjectType
+{
+    private object $type;
+
+    public function __construct(object $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return object
+     */
+    public function convert(mixed $value): object
+    {
+        return (new ObjectMapper($this->type))->mapFromArray($value);
+    }
+}

src/Types/CustomType.php renamed to src/Types/Custom/CustomType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Shureban\LaravelObjectMapper\Types;
+namespace Shureban\LaravelObjectMapper\Types\Custom;
 
 use Shureban\LaravelObjectMapper\ObjectMapper;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\ObjectType;

src/Types/Factory.php

@@ -14,6 +14,7 @@
 use Shureban\LaravelObjectMapper\Types\BoxTypes\CarbonType;
 use Shureban\LaravelObjectMapper\Types\BoxTypes\CollectionType;
 use Shureban\LaravelObjectMapper\Types\BoxTypes\DateTimeType;
+use Shureban\LaravelObjectMapper\Types\Custom\CustomType;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\ArrayType;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\BoolType;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\FloatType;
@@ -52,6 +53,10 @@ public static function make(ReflectionProperty $property): Type
             return $simpleType;
         }
 
+        if ($phpDoc->isArrayOf()) {
+            dd(12);
+        }
+
         $boxType = match ($type) {
             DateTime::class                               => new DateTimeType(),
             CarbonSupport::class, Carbon::class, 'Carbon' => new CarbonType(),

tests/Unit/ClassExtraInformationTest.php

@@ -37,7 +37,8 @@ public function test_getFullObjectUseNamespace()
             'Tests\TestCase',
             (new ClassExtraInformation($class))->getFullObjectUseNamespace('TestCase')
         );
-        $this->assertNull(
+        $this->assertEquals(
+            'ReflectionClass',
             (new ClassExtraInformation($class))->getFullObjectUseNamespace('ReflectionClass')
         );
     }

tests/Unit/PhpDocTest.php

@@ -23,6 +23,9 @@ public function test_getPropertyName()
 
     public function test_getPropertyType()
     {
+        $this->assertEquals('string', (new PhpDoc('/** @var string[] */'))->getPropertyType());
+        $this->assertEquals('string', (new PhpDoc('/** @var string[][] */'))->getPropertyType());
+        $this->assertEquals('string', (new PhpDoc('/** @var string[][][] */'))->getPropertyType());
         $this->assertEquals('string', (new PhpDoc('/** @var string */'))->getPropertyType());
         $this->assertEquals('string', (new PhpDoc('/** @var string $variable */'))->getPropertyType());
         $this->assertEquals('SomeClass', (new PhpDoc('/** @var SomeClass $variable */'))->getPropertyType());
@@ -34,5 +37,17 @@ public function test_getPropertyType()
 */
 DOC
         ))->getPropertyType());
+
+
+        //        $this->assertEquals('string', (new PhpDoc('/** @var string[] */'))->getPropertyType());
+    }
+
+    public function test_isArrayOf()
+    {
+        $this->assertFalse((new PhpDoc('/** @var string */'))->isArrayOf());
+        $this->assertTrue((new PhpDoc('/** @var string[] */'))->isArrayOf());
+        $this->assertTrue((new PhpDoc('/** @var string[][] */'))->isArrayOf());
+        $this->assertTrue((new PhpDoc('/** @var string[][] */'))->isArrayOf());
+        $this->assertTrue((new PhpDoc('/** @var string[] $variable */'))->isArrayOf());
     }
 }