From 035783e2641290d7600ddf30cb6bbba798a19589 Mon Sep 17 00:00:00 2001 From: User Date: Wed, 11 Oct 2023 00:22:06 +0300 Subject: [PATCH] 20231011#1 --- README.md | 2 +- composer.json | 2 +- src/Common/Controllers/AbstractController.php | 38 +++++++++++++++++++ src/Main/Controllers/IndexController.php | 2 + templates/main/index.tpl | 2 +- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e363b9e..a30cab4 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,5 @@ composer create-project rmphp/skeleton ``` ```bash -composer create-project rmphp/skeleton:"^2.0" +composer create-project rmphp/skeleton:"^3.0" ``` \ No newline at end of file diff --git a/composer.json b/composer.json index b9dd13c..6a0545f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "monolog/monolog": "^2.3", "php-di/php-di": "^6.3", "symfony/dotenv": "^6.2", - "rmphp/kernel": "^2.0", + "rmphp/kernel": "^3.0", "rmphp/router": "^1.0", "rmphp/content": "^2.0", "rmphp/storage": "^2.0", diff --git a/src/Common/Controllers/AbstractController.php b/src/Common/Controllers/AbstractController.php index 1e7c829..ca6d9f1 100644 --- a/src/Common/Controllers/AbstractController.php +++ b/src/Common/Controllers/AbstractController.php @@ -7,6 +7,7 @@ use Laminas\Diactoros\Response\JsonResponse; use Laminas\Diactoros\Response\RedirectResponse; use Laminas\Diactoros\Response\TextResponse; use Psr\Http\Message\ResponseInterface; +use Rmphp\Foundation\Exceptions\AppException; use Rmphp\Kernel\Main; use Throwable; @@ -88,6 +89,43 @@ abstract class AbstractController extends Main { return new HtmlResponse($this->template()->getResponse(), $status, array_merge($this->globals()->response()->getHeaders(), $headers)); } + /** + * @param string $point + * @param string $string + * @return void + */ + public function setTemplateValue(string $point, string $string) : void { + $this->template()->setValue($point, $string); + } + + /** + * @param string $point + * @param string $string + * @return void + */ + public function addTemplateValue(string $point, string $string) : void { + $this->template()->addValue($point, $string); + } + + /** + * @param string $point + * @param string $subTempl + * @param array $resource + * @return void + */ + public function setSubtemplate(string $point, string $subTempl, array $resource = []) : void { + $this->template()->setSubtemple($point, $subTempl, $resource); + } + + /** + * @param string $point + * @param string $subTempl + * @param array $resource + * @return void + */ + public function addSubtemplate(string $point, string $subTempl, array $resource = []) : void { + $this->template()->addSubtemple($point, $subTempl, $resource); + } /** * @param string $point diff --git a/src/Main/Controllers/IndexController.php b/src/Main/Controllers/IndexController.php index 99d6f39..4d4b2cc 100644 --- a/src/Main/Controllers/IndexController.php +++ b/src/Main/Controllers/IndexController.php @@ -16,7 +16,9 @@ class IndexController extends AbstractController { $this->addHeader("App-Mode", "Dev"); $this->template()->setValue("title", "Главная"); $this->template()->setSubtemple("main", "main/index.tpl", [ + "date" => (new \DateTime())->format('Y-m-d H:i:s') ]); + return $this->renderResponse(); } catch(ServiceException $exception){} return true; diff --git a/templates/main/index.tpl b/templates/main/index.tpl index df4dd5e..db397b7 100644 --- a/templates/main/index.tpl +++ b/templates/main/index.tpl @@ -1,5 +1,5 @@
-

Hellow

+

Hello. Now is date?>

\ No newline at end of file