20250419#3

.env.dist

@@ -8,11 +8,12 @@
 #
 # Real environment variables win over .env files.
 
-# PROD / DEV
+# DEBUG / DEV / PROD
 APP_MODE=DEV
-APP_NODES_FILE=application/config/app.php
-APP_COMPONENTS_FILE=application/config/components.php
-CONTAINER_INI=application/config/container.php
+APP_NODES_FILE=config/app.php
+CLI_NODES_FILE=config/app-cli.php
+APP_COMPONENTS_FILE=config/components.php
+CONTAINER_INI=config/container.php
 CONTAINER_CACHE=var/cache/container
 
 # Default page
@@ -20,4 +21,5 @@ PAGE404="/templates/error/404.tpl"
 PAGE501="/templates/error/501.tpl"
 
 # Users environment
-MYSQL_PARAM='{"host":"host.docker.internal", "user":"***user***", "pass":"***password***","base":"***basename***", "logsEnable":true}'
+MYSQL_PARAM='{"host":"host.docker.internal", "user":"***user***", "pass":"***password***","base":"***basename***", "charset":"utf8mb4", "logsEnable":true}'
+REDIS_PARAM='{"host":"127.0.0.1","port":6379,"connectTimeout":2.5,"backoff":{"algorithm":1,"base":500,"cap":750}, "database":0, "defaultExpire":300}'

README.md

@@ -9,5 +9,5 @@ composer create-project rmphp/skeleton project-name
 ```
 
 ```bash
-composer create-project rmphp/skeleton:"^4.1" project-name
+composer create-project rmphp/skeleton:"^4.12" 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/base/Domain/AbstractObject.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zuev Yuri
- */
-
-namespace Base\Domain;
-
-abstract class AbstractObject implements EntityInterface {
-
-	/**
-	 * @return int|null
-	 */
-	public function getId(): mixed {
-		return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->get() : $this->id) : null;
-	}
-}

application/base/Domain/EntityInterface.php

@@ -1,18 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zuev Yuri
- * Date: 23.04.2024
- * Time: 3:58
- */
-
-namespace Base\Domain;
-
-interface EntityInterface {
-
-	/**
-	 * @return int|null
-	 */
-	public function getId(): mixed;
-
-}

application/base/Domain/ValueObjectInterface.php

@@ -1,16 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zuev Yuri
- * Date: 23.04.2024
- * Time: 3:58
- */
-
-namespace Base\Domain;
-
-interface ValueObjectInterface {
-
-	public function get();
-	public function __toString(): string;
-
-}

application/base/Handlers/AbstractHandler.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Base\Handlers;
+
+use Laminas\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\TextResponse;
+use Psr\Http\Message\ResponseInterface;
+use Rmphp\Kernel\Main;
+use Throwable;
+
+abstract class AbstractHandler extends Main {
+
+	/**
+	 * @param Throwable $throwable
+	 * @param array $data
+	 * @return void
+	 */
+	public function logException(Throwable $throwable, array $data = []) : void {
+		$this->logger()->warning($throwable->getMessage()." on ".$throwable->getFile().":".$throwable->getLine(), $data);
+	}
+
+	/**
+	 * @param Throwable $throwable
+	 * @param array $data
+	 * @return void
+	 */
+	public function logError(Throwable $throwable, array $data = []) : void {
+		$this->logger()->error($throwable->getMessage()." on ".$throwable->getFile().":".$throwable->getLine(), $data);
+	}
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 * @return void
+	 */
+	public function addHeader(string $name, string $value) : void {
+		$this->globals()->addHeader($name, $value);
+	}
+
+	/**
+	 * @param $html
+	 * @param int $status
+	 * @param array $headers
+	 * @return ResponseInterface
+	 */
+	public function htmlResponse($html, int $status = 200, array $headers = []) : ResponseInterface {
+		return new HtmlResponse($html, $status, array_merge($this->globals()->response()->getHeaders(), $headers));
+	}
+
+	/**
+	 * @param $text
+	 * @param int $status
+	 * @param array $headers
+	 * @return ResponseInterface
+	 */
+	public function textResponse($text, int $status = 200, array $headers = []) : ResponseInterface {
+		return new TextResponse($text, $status, array_merge($this->globals()->response()->getHeaders(), $headers));
+	}
+
+	/**
+	 * @param array $array
+	 * @param int $status
+	 * @param array $headers
+	 * @return ResponseInterface
+	 */
+	public function jsonResponse(array $array, int $status = 200, array $headers = []) : ResponseInterface {
+		return new JsonResponse($array, $status, array_merge($this->globals()->response()->getHeaders(), $headers), JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT);
+	}
+
+}

application/base/Repository/AbstractMysqlRepository.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace Base\Repository;
-
-use Base\Domain\EntityInterface;
-use Rmphp\Storage\Mysql\MysqlStorageInterface;
-
-abstract class AbstractMysqlRepository extends AbstractRepository {
-
-	public const DEBUG = false;
-
-	public function __construct(
-		public readonly MysqlStorageInterface $mysql
-	) {}
-
-	/**
-	 * @param EntityInterface $object
-	 * @param string $table
-	 * @return mixed
-	 * @throws RepositoryException
-	 */
-	public function saveEntity(EntityInterface $object, string $table) : mixed {
-		$in = $this->getProperties($object, function ($value){
-			return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
-		});
-		if(static::DEBUG) dd($object, $in, $table);
-		try {
-			if (!empty($object->getId()) && !empty($this->mysql->findById($table, $object->getId()))) {
-				$this->mysql->updateById($table, $in, $object->getId());
-				return $object->getId();
-			} else {
-				$this->mysql->insert($table, $in);
-				return (is_string($object->getId())) ? $object->getId() : $this->mysql->mysql()->insert_id;
-			}
-		} catch (\Throwable $throwable) {throw new RepositoryException($throwable->getMessage());}
-	}
-}

application/base/Repository/AbstractRepository.md

@@ -1,12 +0,0 @@
-### Создание объекта из массива
-
-```php 
-setProperties(array $data) : void
-```
-
-
-### Получение массива из объекта
-
-```php 
-getProperties(callable $method = null) : array
-```

application/base/Repository/AbstractRepository.php

@@ -1,93 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zuev Yuri
- * Date: 25.04.2024
- * Time: 13:06
- */
-
-namespace Base\Repository;
-
-use Base\Domain\ValueObjectInterface;
-use ReflectionClass;
-use ReflectionException;
-
-class AbstractRepository {
-
-	static array $classes = [];
-
-	/**
-	 * @param string $class
-	 * @param $data
-	 * @return mixed
-	 * @throws RepositoryException
-	 */
-	public function create(string $class, $data) : mixed {
-		try {
-			if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class);
-			$object = new $class;
-			foreach (static::$classes[$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(static::$classes[$class]->hasMethod('set'.ucfirst($property->getName()))) $object->{'set'.ucfirst($property->getName())}($value);
-				// Если тип свойства класс (valueObject)
-				elseif($property->hasType() && class_exists($property->getType()->getName())) $object->{$property->getName()} = new ($property->getType()->getName())($value);
-				// если значения не пустое
-				elseif(isset($value)) $object->{$property->getName()} = $value;
-			}
-			return $object;
-		}
-		catch (ReflectionException $exception) {
-			throw new RepositoryException($exception->getMessage());
-		}
-	}
-
-	/**
-	 * @param object $class
-	 * @param callable|null $method
-	 * @return array
-	 */
-	public function getProperties(object $class, callable $method = null) : array {
-
-		$objectData = get_object_vars($class);
-		foreach ($objectData as $fieldName => $value)
-		{
-			// to option_id
-			$fieldNameSnakeCase = strtolower(preg_replace("'([A-Z])'", "_$1", $fieldName));
-
-			// если есть внутренний метод (приоритетная обработка)
-			if(method_exists($this, 'get'.ucfirst($fieldName))) {
-				$out[$fieldNameSnakeCase] = $this->{'get'.ucfirst($fieldName)}($value);
-			}
-			// если тип свойства класс (valueObject)
-			elseif($value instanceof ValueObjectInterface && null !== $value->get()) {
-				$out[$fieldNameSnakeCase] = $value->get();
-			}
-			// если передана callable функция через которую нужно пропустить все элементы
-			elseif(isset($method) && !is_array($value) && !is_object($value)) {
-				$out[$fieldNameSnakeCase] = $method($value);
-			}
-			// если это логическое значение
-			elseif(is_bool($value)){
-				$out[$fieldNameSnakeCase] = (int) $value;
-			}
-			// если это дробное число
-			elseif(is_float($value)) {
-				$out[$fieldNameSnakeCase] = $value;
-			}
-			// если это целое число
-			elseif(is_int($value)) {
-				$out[$fieldNameSnakeCase] = $value;
-			}
-			// если это строка
-			elseif(is_string($value)) {
-				$out[$fieldNameSnakeCase] = $value;
-			}
-
-		}
-		return $out ?? [];
-	}
-}

application/base/Repository/RepositoryException.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace Base\Repository;
-
-use Throwable;
-
-class RepositoryException extends \Exception {
-
-	public array $data;
-
-	public function __construct($message="", $code=0, array $data = [], Throwable $previous=null) {
-		parent::__construct($message, $code, $previous);
-		$this->data = $data;
-	}
-}

application/bin/cli

@@ -0,0 +1,3 @@
+#!/usr/bin/php
+<?php
+require_once dirname(__FILE__).'/cli.php';

application/bin/cli.php

@@ -0,0 +1,13 @@
+<?php
+
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequestFactory;
+use Rmphp\Kernel\AppCli;
+use Rmphp\Kernel\ResponseEmitter;
+
+require_once dirname(__DIR__,2).'/vendor/autoload.php';
+(new Symfony\Component\Dotenv\Dotenv())->usePutenv()->loadEnv(dirname(__DIR__,2).'/.env');
+
+$app = new AppCli();
+$response = $app->handler(ServerRequestFactory::fromGlobals(), new Response());
+(new ResponseEmitter())->emit($response);

application/config/container.php

@@ -1,5 +0,0 @@
-<?php
-return [
-	"application/config/container/services.php",
-	"application/config/container/settings.php",
-];

application/config/container/services.php

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

composer.json

@@ -5,19 +5,19 @@
 	"minimum-stability": "dev",
 	"prefer-stable" : true,
 	"require": {
-		"php": "^8.1",
+		"php": "^8.3",
 		"ext-json": "*",
 		"ext-yaml": "*",
 		"laminas/laminas-diactoros": "^2.5",
 		"monolog/monolog": "^2.3",
 		"php-di/php-di": "^6.3",
 		"ramsey/uuid": "^4.7",
-		"rmphp/cache-file": "^1.0",
-		"rmphp/content": "^3.1",
-		"rmphp/kernel": "^4.1",
-		"rmphp/router": "^1.2",
-		"rmphp/session": "^1.0",
-		"rmphp/storage": "^3.1",
+		"rmphp/content": "^4.0",
+		"rmphp/kernel": "^6.0",
+		"rmphp/router": "^2.0",
+		"rmphp/session": "^1.1",
+		"rmphp/redis": "^1.0",
+		"rmphp/storage": "^10.0",
 		"symfony/dotenv": "^6.2"
 	},
     "autoload": {

config/app-cli.php

@@ -0,0 +1,19 @@
+<?php
+# Example:
+# ['key'=>'/', "action"=>"App\\Main\\Controllers\\IndexController", "method"=>"index"],
+# ['key'=>'', 'router'=>'config/routes-cli/routes.php'],
+# ['key'=>'/', 'router'=>[]],
+
+return [
+	['key'=>'', 'router'=>[
+		[
+			'key'=>'index',
+			'routes' => [
+				[
+					'action' => "App\Infrastructure\Handlers\IndexHandler",
+					'method' => "index"
+				]
+			]
+		]
+	]],
+];

config/app.php

@@ -5,9 +5,9 @@
 
 # Example:
 # ['key'=>'/', "action"=>"App\\Main\\Controllers\\IndexController", "method"=>"index"],
-# ['key'=>'/', 'router'=>'application/config/routes/main/routes.php'],
+# ['key'=>'/', 'router'=>'config/routes/main/routes.php'],
 # ['key'=>'/', 'router'=>[]],
 
 return [
-	['key'=>'/', 'router'=>'application/config/routes/routes.php'],
+	['key'=>'/', 'router'=>'config/routes/routes.php'],
 ];

config/components.php

@@ -4,17 +4,17 @@ return [
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию RouterInterface или сам экземпляр класса
 	 */
-	\Rmphp\Foundation\RouterInterface::class => 'application/config/components/routerFactory.php',
+	\Rmphp\Foundation\RouterInterface::class => 'config/components/routerFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию TemplateInterface или сам экземпляр класса
 	 */
-	\Rmphp\Foundation\TemplateInterface::class => 'application/config/components/templateFactory.php',
+	\Rmphp\Foundation\TemplateInterface::class => 'config/components/templateFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию PSR-3 LoggerInterface или сам экземпляр класса
 	 */
-	\Psr\Log\LoggerInterface::class => 'application/config/components/loggerFactory.php',
+	\Psr\Log\LoggerInterface::class => 'config/components/loggerFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию PSR-11 ContainerInterface или сам экземпляр класса
 	 */
-	\Psr\Container\ContainerInterface::class => 'application/config/components/containerFactory.php',
+	\Psr\Container\ContainerInterface::class => 'config/components/containerFactory.php',
 ];

config/components/containerFactory.php

@@ -2,18 +2,18 @@
 
 use DI\ContainerBuilder;
 
-$containerIni = (getenv("CONTAINER_INI")) ?: "application/config/container.php";
+$containerIni = (getenv("CONTAINER_INI")) ?: "config/container.php";
 $containerCache = (getenv("CONTAINER_CACHE")) ?: "var/cache/container";
 
-$dependencies = require dirname(__DIR__,3).'/'.$containerIni;
+$dependencies = require dirname(__DIR__,2).'/'.$containerIni;
 
 $dependenciesCollection = array_map(function ($dependenciesFile){
-	return require dirname(__DIR__,3)."/".$dependenciesFile;
+	return require dirname(__DIR__,2)."/".$dependenciesFile;
 }, $dependencies);
 
 try {
 	$builder = new ContainerBuilder();
-	if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,3)."/".$containerCache);
+	if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,2)."/".$containerCache);
 	$builder->addDefinitions(array_replace_recursive(...$dependenciesCollection));
 	return $builder->build();
 } catch (Exception $e) {echo $e->getMessage();}

config/components/loggerFactory.php

@@ -1,2 +1,2 @@
 <?php
-return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 3).'/var/logs/log'.date('Ymd').'.log'));
+return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 2).'/var/logs/log'.date('Ymd').'.log'));

config/components/templateFactory.php

@@ -1,4 +1,4 @@
 <?php
 return (new \Rmphp\Content\Content('/templates/base.tpl'))->setSubtemplatePath('/templates/')->setSubtemplatePathAlias([
-	"main" => "/src/Infrastructure/templates",
+	"main" => "/src/Infrastructure/subtemplates",
 ]);

config/container.php

@@ -0,0 +1,6 @@
+<?php
+return [
+	"config/container/params.php",
+	"config/container/services.php",
+	"config/container/settings.php",
+];

config/container/params.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+	'MYSQL_PARAM' => json_decode(getenv("MYSQL_PARAM"), true),
+	'REDIS_PARAM' => json_decode(getenv("REDIS_PARAM"), true),
+];

config/container/services.php

@@ -0,0 +1,10 @@
+<?php
+
+use Rmphp\Storage\Mysql\MysqlStorage;
+use Rmphp\Storage\Mysql\MysqlStorageInterface;
+
+return [
+	MysqlStorageInterface::class => DI\create(MysqlStorage::class)->constructor(DI\get("MYSQL_PARAM")),
+	'App\Domain\Repository\*RepositoryInterface' => DI\autowire('App\Infrastructure\Repository\*Repository'),
+	'App\*\Domain\Repository\*RepositoryInterface' => DI\autowire('App\*\Infrastructure\Repository\*Repository'),
+];

config/routes/99-main.yaml

@@ -8,6 +8,6 @@
 # Empty
 - key: "<@any>"
   routes:
-      - action: "App\\nfrastructure\\Controllers\\IndexController"
+      - action: "App\\Infrastructure\\Controllers\\IndexController"
         method: "emptyAction"
         params: ""

config/routes/routes.php

@@ -1,6 +1,6 @@
 <?php
 
-$cashFile = preg_replace("'.application.*$'",'', __DIR__).'/var/routes/'.md5(__FILE__);
+$cashFile = dirname(__DIR__,2).'/var/routes/'.md5(__FILE__);
 
 if(getenv("APP_MODE") == "PROD" && file_exists($cashFile)){
 	return unserialize(file_get_contents($cashFile));

public/index.php

@@ -23,7 +23,7 @@ $app = new App();
 $response = $app->handler($request, new Response());
 (new ResponseEmitter())->emit($response);
 
-if(($response->getStatusCode() !== 200 && getenv("APP_MODE") == 'DEV') || in_array("Dev", $response->getHeader("App-Mode"))){
+if(($response->getStatusCode() !== 200 && in_array(getenv("APP_MODE"), ['DEBUG', 'DEV'])) || in_array("Dev", $response->getHeader("App-Mode"))){
 	$app->syslogger()->dump("Response", $response);
 	addShutdownInfo($app->syslogger()->getLogs());
 }

src/Infrastructure/Handlers/IndexHandler.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zuev Yuri
+ * Date: 02.03.2025
+ * Time: 22:02
+ */
+
+namespace App\Infrastructure\Handlers;
+
+use Base\Handlers\AbstractHandler;
+use Psr\Http\Message\ResponseInterface;
+
+class IndexHandler extends AbstractHandler {
+
+	public function index() : bool|ResponseInterface {
+
+		return $this->textResponse((new \DateTime())->format('Y-m-d H:i:s'));
+
+	}
+
+}