20250330#1

.env.dist

@@ -10,9 +10,10 @@
 
 # PROD / DEV
 APP_MODE=DEV
-APP_NODES_FILE=application/config/app.php
+APP_NODES_FILE=config/app.php
-APP_COMPONENTS_FILE=application/config/components.php
+CLI_NODES_FILE=config/app-cli.php
-CONTAINER_INI=application/config/container.php
+APP_COMPONENTS_FILE=config/components.php
+CONTAINER_INI=config/container.php
 CONTAINER_CACHE=var/cache/container
 
 # Default page

README.md

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

application/base/Application/AbstractDTO.php

@@ -2,48 +2,40 @@
 
 namespace Base\Application;
 
+use Exception;
 use ReflectionClass;
+use Rmphp\Storage\Component\AbstractDataObject;
 
-abstract class AbstractDTO {
+abstract class AbstractDTO extends AbstractDataObject {
-
-	/**
-	 * @param object $data
-	 * @return static
-	 */
-	static function fromObject(object $data) : static {
-		return static::fromArray(get_object_vars($data));
-	}
-
 
 	/**
 	 * @param array|object ...$data
 	 * @return static
+	 * @throws Exception
 	 */
-	static function fromData(array|object ...$data) : static {
+	public static function fromData(array|object ...$data) : static {
 		$array = array_map(function($item) {
 			return (is_object($item)) ? get_object_vars($item) : $item;
 		}, $data);
-		return static::fromArray(array_merge(...$array));
+		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));
 	}
 
 
 	/**
 	 * @param array $data
 	 * @return static
+	 * @throws Exception
 	 */
-	static function fromArray(array $data) : static {
+	public static function fromArray(array $data) : static {
-		$class = new ReflectionClass(static::class);
+		return self::fillObject(new ReflectionClass(static::class), new static(), $data);
-		$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;
-	}
-
 }

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/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",
-];

composer.json

@@ -12,12 +12,12 @@
 		"monolog/monolog": "^2.3",
 		"php-di/php-di": "^6.3",
 		"ramsey/uuid": "^4.7",
-		"rmphp/content": "^3.1",
+		"rmphp/content": "^4.0",
-		"rmphp/kernel": "^5.0",
+		"rmphp/kernel": "^6.0",
-		"rmphp/router": "^1.2",
+		"rmphp/router": "^2.0",
 		"rmphp/session": "^1.1",
 		"rmphp/redis": "^1.0",
-		"rmphp/storage": "^6.0",
+		"rmphp/storage": "^9.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/container.php

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

config/container/services.php

@@ -4,7 +4,7 @@ use Rmphp\Storage\Mysql\MysqlStorage;
 use Rmphp\Storage\Mysql\MysqlStorageInterface;
 
 return [
-	MysqlStorageInterface::class => DI\create(MysqlStorage::class)->constructor(json_decode(getenv("MYSQL_PARAM"), true)),
+	MysqlStorageInterface::class => DI\create(MysqlStorage::class)->constructor(json_decode(getenv("MYSQL_PARAM"))),
 	'App\Domain\Repository\*RepositoryInterface' => DI\autowire('App\Infrastructure\Repository\*Repository'),
 	'App\*\Domain\Repository\*RepositoryInterface' => DI\autowire('App\*\Infrastructure\Repository\*Repository'),
 ];

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));

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'));
+
+	}
+
+}