20231010#1

README.md

@@ -7,6 +7,7 @@ Stable version
 ```bash
 composer create-project rmphp/skeleton
 ```
+
 ```bash
-composer create-project rmphp/skeleton:"^1.0"
+composer create-project rmphp/skeleton:"^2.0"
 ```

composer.json

@@ -12,10 +12,12 @@
 		"monolog/monolog": "^2.3",
 		"php-di/php-di": "^6.3",
 		"symfony/dotenv": "^6.2",
-		"rmphp/kernel": "^1.0",
+		"rmphp/kernel": "^2.0",
 		"rmphp/router": "^1.0",
-		"rmphp/content": "^1.0",
+		"rmphp/content": "^2.0",
-		"rmphp/storage": "^1.0"
+		"rmphp/storage": "^2.0",
+		"rmphp/session": "^1.0",
+		"rmphp/cache-file": "^1.0"
 	},
     "autoload": {
         "psr-4": {
@@ -30,6 +32,7 @@
 		"process-timeout":0
 	},
 	"require-dev": {
+		"symfony/var-dumper": "^5.3",
 		"rmphp/var-damper": "^1.0"
 	}
 }

config/container/services.php

@@ -1,11 +1,15 @@
 <?php
 
-use Rmphp\Storage\MysqlStorage;
+use Rmphp\Cache\Cache;
-use Rmphp\Storage\MysqlStorageInterface;
+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\*\Repository\Mysql\*Repository'),
-	'App\*\Services\*\*Service' => DI\autowire('App\*\Services\*\*Service'),
-	'App\*\Services\*Service' => DI\autowire('App\*\Services\*Service'),
 ];

public/index.php

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

src/Common/Controllers/AbstractController.php

@@ -6,38 +6,29 @@ use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\Response\RedirectResponse;
 use Laminas\Diactoros\Response\TextResponse;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 use Rmphp\Kernel\Main;
+use Throwable;
 
 abstract class AbstractController extends Main {
 
 	/**
-	 * @param string $name
+	 * @param Throwable $throwable
-	 * @return mixed|void
-	 */
-	public function containerGet(string $name) {
-		try {
-			return $this->container()->get($name);
-		}
-		catch (NotFoundExceptionInterface $notFoundException){
-			$this->syslogger()->error($notFoundException->getMessage());
-		}
-		catch (ContainerExceptionInterface $containerException){
-			$this->syslogger()->error($containerException->getMessage());
-		}
-	}
-
-	/**
-	 * @param \Throwable $throwable
 	 * @param array $data
 	 * @return void
 	 */
-	public function logException(\Throwable $throwable, array $data = []) : 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
@@ -65,7 +56,6 @@ abstract class AbstractController extends Main {
 	 * @return ResponseInterface
 	 */
 	public function textResponse($text, int $status = 200, array $headers = []) : ResponseInterface {
-		$this->container()->set("showDebugLogs", false);
 		return new TextResponse($text, $status, array_merge($this->globals()->response()->getHeaders(), $headers));
 	}
 
@@ -76,7 +66,6 @@ abstract class AbstractController extends Main {
 	 * @return ResponseInterface
 	 */
 	public function jsonResponse(array $array, int $status = 200, array $headers = []) : ResponseInterface {
-		$this->container()->set("showDebugLogs", false);
 		return new JsonResponse($array, $status, array_merge($this->globals()->response()->getHeaders(), $headers), JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT);
 	}
 
@@ -87,8 +76,30 @@ abstract class AbstractController extends Main {
 	 * @return ResponseInterface
 	 */
 	public function redirectResponse(string $url, int $status = 302, array $headers = []) : ResponseInterface {
-		$this->container()->set("showDebugLogs", false);
 		return new RedirectResponse($url, $status, array_merge($this->globals()->response()->getHeaders(), $headers));
 	}
 
+	/**
+	 * @param int $status
+	 * @param array $headers
+	 * @return ResponseInterface
+	 */
+	public function renderResponse(int $status = 200, array $headers = []) : ResponseInterface {
+		return new HtmlResponse($this->template()->getResponse(), $status, array_merge($this->globals()->response()->getHeaders(), $headers));
+	}
+
+
+	/**
+	 * @param string $point
+	 * @param string $subtemplate
+	 * @param array $data
+	 * @param int $status
+	 * @param array $headers
+	 * @return ResponseInterface
+	 */
+	public function render(string $point, string $subtemplate, array $data = [], int $status = 200, array $headers = []) : ResponseInterface {
+		$this->template()->setSubtemple($point, $subtemplate, $data);
+		return new HtmlResponse($this->template()->getResponse(), $status, array_merge($this->globals()->response()->getHeaders(), $headers));
+	}
+
 }

src/Common/Controllers/AbstractPageController.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Common\Controllers;
-
-abstract class AbstractPageController extends AbstractController {
-
-	/**
-	 * @param string $point
-	 * @param string $string
-	 */
-	public function templateAddValue(string $point, string $string) : void {
-		$this->template()->addValue($point, $string);
-	}
-
-	/**
-	 * @param string $point
-	 * @param string $subTempl
-	 * @param array $resource
-	 */
-	public function templateSetSubtemple(string $point, string $subTempl, array $resource = []) : void {
-		$this->template()->setSubtemple($point, $subTempl, $resource);
-	}
-
-	/**
-	 * @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->templateSetSubtemple("main", "/main/errpage.tpl", [
-			"errorText" => "<span style='color:red'>Error: ".$exception->getMessage()." (".$exception->getCode().")"."</span>"
-		]);
-	}
-}

src/Main/Controllers/IndexController.php

@@ -1,12 +1,12 @@
 <?php
 
 namespace App\Main\Controllers;
-use App\Common\Controllers\AbstractPageController;
+use App\Common\Controllers\AbstractController;
 use App\Common\Services\ServiceException;
 use Psr\Http\Message\ResponseInterface;
 
 
-class IndexController extends AbstractPageController {
+class IndexController extends AbstractController {
 
 	/**
 	 * @return bool|ResponseInterface