20250224#1

README.md

@@ -9,5 +9,5 @@ composer create-project rmphp/skeleton project-name
 ```
 
 ```bash
-composer create-project rmphp/skeleton:"^4.2" project-name
+composer create-project rmphp/skeleton:"^4.5" project-name
 ```

application/base/Application/AbstractDTO.php

@@ -2,26 +2,40 @@
 
 namespace Base\Application;
 
+use Exception;
 use ReflectionClass;
+use Rmphp\Storage\Component\AbstractDataObject;
+
+abstract class AbstractDTO extends AbstractDataObject {
+
+	/**
+	 * @param array|object ...$data
+	 * @return static
+	 * @throws Exception
+	 */
+	public static function fromData(array|object ...$data) : static {
+		$array = array_map(function($item) {
+			return (is_object($item)) ? get_object_vars($item) : $item;
+		}, $data);
+		return self::fromArray(array_merge(...$array));
+	}
+
+	/**
+	 * @param object $data
+	 * @return static
+	 * @throws Exception
+	 */
+	public static function fromObject(object $data) : static {
+		return self::fromArray(get_object_vars($data));
+	}
 
-abstract class AbstractDTO {
 
 	/**
 	 * @param array $data
 	 * @return static
+	 * @throws Exception
 	 */
-	static function fromArray(array $data) : static {
-		$class = new ReflectionClass(static::class);
-		$self = new static();
-		foreach ($class->getProperties() as $property) {
-			$propertyNameSnakeCase = strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()));
-			// data[propertyName] ?? data[property_name] ?? null
-			$value = $data[$property->getName()] ?? $data[$propertyNameSnakeCase] ?? null;
-			// если есть внутренний метод (приоритетная обработка)
-			if($class->hasMethod('set'.ucfirst($property->getName()))) $self->{'set'.ucfirst($property->getName())}($value);
-			// прямое присовение по умолчанию
-			elseif(isset($value)) $self->{$property->getName()} = $value;
-		}
-		return $self;
+	public static function fromArray(array $data) : static {
+		return self::fillObject(new ReflectionClass(static::class), new static(), $data);
 	}
 }

application/config/container/services.php

@@ -1,12 +1,10 @@
 <?php
 
-use Rmphp\Cache\Cache;
-use Rmphp\Cache\CacheInterface;
 use Rmphp\Storage\Mysql\MysqlStorage;
 use Rmphp\Storage\Mysql\MysqlStorageInterface;
 
 return [
 	MysqlStorageInterface::class => DI\create(MysqlStorage::class)->constructor(json_decode(getenv("MYSQL_PARAM"), true)),
-	CacheInterface::class => DI\create(Cache::class)->constructor("../var/cache"),
+	'App\Domain\Repository\*RepositoryInterface' => DI\autowire('App\Infrastructure\Repository\*Repository'),
 	'App\*\Domain\Repository\*RepositoryInterface' => DI\autowire('App\*\Infrastructure\Repository\*Repository'),
 ];

composer.json

@@ -15,9 +15,9 @@
 		"rmphp/content": "^3.1",
 		"rmphp/kernel": "^5.0",
 		"rmphp/router": "^1.2",
-		"rmphp/session": "^1.0",
+		"rmphp/session": "^1.1",
 		"rmphp/redis": "^1.0",
-		"rmphp/storage": "^4.0",
+		"rmphp/storage": "^6.0",
 		"symfony/dotenv": "^6.2"
 	},
     "autoload": {