Introduce Types and refactor

Author: hakobyansen

src/Services/DtoBuilder.php

@@ -4,6 +4,7 @@
 
 use PhpDto\DtoSerialize;
 use PhpDto\Enum\Types;
+use PhpDto\Types\Prop;
 
 class DtoBuilder
 {
@@ -97,16 +98,19 @@ public function getConstructorParam( array $configs ): string
 	 */
     public function getConstructorProps( array $configs ): array
     {
-        $keys = [];
+        $props = [];
 
         foreach ( $configs['props'] as $key => $value )
         {
-        		$key = $this->convertPropToSnakeCase($key);
+        		$prop = new Prop();
 
-            $keys[] = $key;
+        		$prop->setIsNullable(str_contains(haystack: $key, needle: $value))
+					->setName($this->convertPropToSnakeCase($key));
+
+            $props[] = $prop;
         }
 
-        return $keys;
+        return $props;
     }
 
     /**

src/Services/Sticker.php

@@ -2,6 +2,8 @@
 
 namespace PhpDto\Services;
 
+use PhpDto\Types\Prop;
+
 class Sticker
 {
 	/**
@@ -111,7 +113,7 @@ public function props( array $props ): Sticker
 
 	/**
 	 * @param string $param
-	 * @param array $props
+	 * @param Prop[] $props
 	 * @return Sticker
 	 */
 	public function constructor( string $param, array $props ): Sticker
@@ -121,10 +123,11 @@ public function constructor( string $param, array $props ): Sticker
 
 		foreach ($props as $prop)
 		{
-			$nullHandler = str_contains(haystack: $prop, needle: '?') ? ' ?? null' : '';
+			$propName = $prop->getName();
+			$nullHandler = $prop->isIsNullable() ? ' ?? null' : '';
 
-			$str .= "\t\t" . '$this->_' . $prop . ' = $' .
-				$param . "['" . strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $prop)) . "']" .
+			$str .= "\t\t" . '$this->_' . $propName . ' = $' .
+				$param . "['" . strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $propName)) . "']" .
 				$nullHandler . ";\n";
 		}
 

src/Types/Prop.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace PhpDto\Types;
+
+class Prop
+{
+	/**
+	 * @var string
+	 */
+	private string $_name;
+
+	/**
+	 * @var bool
+	 */
+	private bool $_nullable;
+
+	/**
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * @param string $name
+	 * @return Prop
+	 */
+	public function setName(string $name): Prop
+	{
+		$this->_name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isIsNullable(): bool
+	{
+		return $this->_nullable;
+	}
+
+	/**
+	 * @param bool $isNullable
+	 * @return Prop
+	 */
+	public function setIsNullable(bool $isNullable): Prop
+	{
+		$this->_nullable = $isNullable;
+		return $this;
+	}
+}

tests/Unit/Services/DtoBuilderTest.php

@@ -4,6 +4,7 @@
 
 use PhpDto\Enum\Types;
 use PhpDto\Services\DtoBuilder;
+use PhpDto\Types\Prop;
 use PHPUnit\Framework\TestCase;
 
 class DtoBuilderTest extends TestCase
@@ -135,7 +136,9 @@ public function testGetConstructorParam()
 
 	public function testGetConstructorProps()
 	{
-		$expected = [
+		$props = $this->_builder->getConstructorProps( $this->_configs );
+
+		$propNames = [
 			'id',
 			'count',
 			'name',
@@ -147,8 +150,13 @@ public function testGetConstructorProps()
 		];
 
 		$this->assertEquals(
-			$expected,
-			$this->_builder->getConstructorProps( $this->_configs )
+			expected: $propNames,
+			actual: array_map(
+				callback: function(Prop $prop) {
+					return $prop->getName();
+				},
+				array: $props
+			)
 		);
 	}