Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1106b4af47 | ||
|
|
a2650ab53f | ||
|
|
0558bb121d | ||
|
|
b5ecb1fc86 |
@@ -9,5 +9,5 @@ composer create-project rmphp/skeleton project-name
|
||||
```
|
||||
|
||||
```bash
|
||||
composer create-project rmphp/skeleton:"^4.12" project-name
|
||||
composer create-project rmphp/skeleton:"^5.1" project-name
|
||||
```
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
<?php
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $data
|
||||
* @return static
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function fromArray(array $data) : static {
|
||||
return self::fillObject(new ReflectionClass(static::class), new static(), $data);
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Base\Application;
|
||||
|
||||
use Throwable;
|
||||
|
||||
class DTOException extends \Exception {
|
||||
|
||||
public array $data;
|
||||
|
||||
public function __construct($message="", $code=0, array $data = [], Throwable $previous=null) {
|
||||
parent::__construct($message, $code, $previous);
|
||||
$this->data = $data;
|
||||
}
|
||||
}
|
||||
@@ -3,33 +3,19 @@
|
||||
namespace Base\Controllers;
|
||||
|
||||
use Base\Application\ApplicationException;
|
||||
use Base\Application\DTOException;
|
||||
use Base\Domain\DomainException;
|
||||
use Exception;
|
||||
use Throwable;
|
||||
|
||||
abstract class AbstractPageController extends AbstractController {
|
||||
|
||||
/**
|
||||
* @param Exception $exception
|
||||
* @param array $data
|
||||
* @return void
|
||||
*/
|
||||
public function exceptionPage(Exception $exception, array $data = []) : void {
|
||||
$this->logException($exception, $data);
|
||||
$this->syslogger()->warning($exception->getMessage()." on ".$exception->getFile().":".$exception->getLine(), $data);
|
||||
$this->template()->setSubtemplate("main", "/error/errpage.tpl", [
|
||||
"errorText" => "<span style='color:red'>Error: ".$exception->getMessage()." (".$exception->getCode().")"."</span>"
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Throwable $e
|
||||
* @return string
|
||||
*/
|
||||
public function checkError(Throwable $e) : string {
|
||||
($e instanceof Exception) ? $this->logException($e) : $this->logError($e);
|
||||
if($e instanceof DTOException || $e instanceof DomainException || $e instanceof ApplicationException) return $e->getMessage();
|
||||
if($e instanceof DomainException || $e instanceof ApplicationException) return $e->getMessage();
|
||||
return "Ошибка. Дата и время: ".date("d-m-Y H:i:s");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
"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/content": "^4.0",
|
||||
"rmphp/kernel": "^6.0",
|
||||
"rmphp/router": "^2.0",
|
||||
"laminas/laminas-diactoros": "^2.26",
|
||||
"monolog/monolog": "^2.10",
|
||||
"php-di/php-di": "^6.4",
|
||||
"ramsey/uuid": "^4.9",
|
||||
"rmphp/content": "^4.1",
|
||||
"rmphp/kernel": "^6.1",
|
||||
"rmphp/router": "^2.1",
|
||||
"rmphp/session": "^1.1",
|
||||
"rmphp/redis": "^1.0",
|
||||
"rmphp/storage": "^10.0",
|
||||
"symfony/dotenv": "^6.2"
|
||||
"rmphp/storage": "^12.0",
|
||||
"symfony/dotenv": "^6.4"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
@@ -34,7 +34,7 @@
|
||||
"process-timeout":0
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/var-dumper": "^5.3",
|
||||
"rmphp/var-damper": "^1.0"
|
||||
"symfony/var-dumper": "^5.4",
|
||||
"rmphp/var-damper": "^1.1"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user