- Added AdapterProxy autoload in ORM
This commit is contained in:
1 parent
69382f912b
commit
42f33d9f13
11 files changed
+76
-42
No files matched your search
@@ -22,6 +22,8 @@ class Application
|
||||
|
||||
public array $entities;
|
||||
|
||||
public array $connectionAdapters;
|
||||
|
||||
public array $events;
|
||||
|
||||
public array $tellJson;
|
||||
@@ -68,6 +70,7 @@ class Application
|
||||
if (is_array($ulmus = $this->data['ulmus'] ?? false)) {
|
||||
if ($ulmus['entities'] ?? false) {
|
||||
$this->entities = $ulmus['entities'];
|
||||
$this->connectionAdapters = $ulmus['adapters'] ?? [];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ namespace Lean;
|
||||
use League\Route\Strategy;
|
||||
|
||||
use League\Route\Http\Exception\NotFoundException;
|
||||
use Lean\Factory\HttpFactoryInterface;
|
||||
use Picea\Asset\Asset;
|
||||
use Psr\Container\ContainerInterface;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
@@ -25,15 +26,17 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
|
||||
public function __construct(
|
||||
protected Picea $picea,
|
||||
protected ContainerInterface $di,
|
||||
protected HttpFactoryInterface $httpFactory,
|
||||
) {}
|
||||
|
||||
public function getNotFoundDecorator(NotFoundException $exception): MiddlewareInterface
|
||||
{
|
||||
return new class($this->picea, $this->di) implements MiddlewareInterface {
|
||||
return new class($this->picea, $this->di, $this->httpFactory) implements MiddlewareInterface {
|
||||
|
||||
public function __construct(
|
||||
protected Picea $picea,
|
||||
protected ContainerInterface $di,
|
||||
protected HttpFactoryInterface $httpFactory,
|
||||
) { }
|
||||
|
||||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
||||
@@ -58,7 +61,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
|
||||
}
|
||||
}
|
||||
|
||||
return new \Laminas\Diactoros\Response\HtmlResponse($this->picea->renderHtml("lean/error/404", [], $this), 404);
|
||||
return $this->httpFactory->createHtmlResponse($this->picea->renderHtml("lean/error/404", [], $this), 404);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -147,13 +147,15 @@ trait ControllerTrait {
|
||||
#[Ignore]
|
||||
public function renderCLI(ServerRequestInterface $request, mixed $data) : ResponseInterface
|
||||
{
|
||||
if ($data instanceof \JsonSerializable ) {
|
||||
return $this->renderJson(
|
||||
$data
|
||||
);
|
||||
}
|
||||
elseif ( is_array($data) ) {
|
||||
var_export($data);
|
||||
if (! $data instanceof \Stringable) {
|
||||
if ($data instanceof \JsonSerializable) {
|
||||
return $this->renderJson(
|
||||
$data
|
||||
);
|
||||
}
|
||||
elseif (is_iterable($data) || is_object($data)) {
|
||||
return $this->renderText(var_export($data, true));
|
||||
}
|
||||
}
|
||||
|
||||
return $this->renderText(
|
||||
|
||||
@@ -7,7 +7,7 @@ use Lean\Response\{ DownloadResponse, ImageResponse, FileDownloadResponse, PdfRe
|
||||
use Laminas\Diactoros\Response;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
||||
class HttpFactory
|
||||
class HttpFactory implements HttpFactoryInterface
|
||||
{
|
||||
public static function createResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface
|
||||
{
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace Lean\Factory;
|
||||
|
||||
use Laminas\Diactoros\Response\{EmptyResponse, HtmlResponse, JsonResponse, RedirectResponse, TextResponse};
|
||||
use Lean\Response\{ DownloadResponse, ImageResponse, FileDownloadResponse, PdfResponse };
|
||||
use Laminas\Diactoros\Response;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
||||
interface HttpFactoryInterface
|
||||
{
|
||||
public static function createResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface;
|
||||
public static function createRedirectResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface;
|
||||
public static function createHtmlResponse(string $html, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
public static function createTextResponse(string $text, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
public static function createJsonResponse(mixed $data, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
public static function createEmptyResponse(int $code = 204, array $headers = []) : ResponseInterface;
|
||||
public static function createPdfResponse(\Stringable|string $binary, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
public static function createDownloadableResponse(string $data, string $filename, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
public static function createImageResponse(string $data, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
public static function createFileDownloadResponse(string $path, int $code = 200, array $headers = []) : ResponseInterface;
|
||||
}
|
||||
+4
-1
@@ -73,7 +73,9 @@ class Kernel {
|
||||
$path = getenv("PROJECT_PATH") . DIRECTORY_SEPARATOR . getenv($envkey);
|
||||
|
||||
if (getenv('DEBUG') && ! file_exists($path)) {
|
||||
mkdir($path, 0755, true);
|
||||
if (false === mkdir($path, 0755, true)) {
|
||||
throw new \Exception(sprintf("Folder '%s' could not be created", $path));
|
||||
}
|
||||
}
|
||||
|
||||
static::putenv($name, realpath($path));
|
||||
@@ -155,6 +157,7 @@ class Kernel {
|
||||
|
||||
# Must be removed from KERNEL !
|
||||
$this->container->has('ulmus.caching') and ( Ulmus::$cache = $this->container->get('ulmus.caching') );
|
||||
# $this->container->has(AdapterProxy::class) and ( $ )
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
+15
-10
@@ -77,37 +77,42 @@ class Lean
|
||||
|
||||
public function getRoutable() : array
|
||||
{
|
||||
return array_merge(...array_map(fn($app) => $app->routes ?? [], $this->applications));
|
||||
return array_merge(...array_map(fn(Application $app) => $app->routes ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getCronard() : array
|
||||
{
|
||||
return array_merge(...array_map(fn($app) => $app->cronard ?? [], $this->applications));
|
||||
return array_merge(...array_map(fn(Application $app) => $app->cronard ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getCLI() : array
|
||||
{
|
||||
return array_merge(...array_map(fn($app) => $app->cli ?? [], $this->applications));
|
||||
return array_merge(...array_map(fn(Application $app) => $app->cli ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getEvents() : array
|
||||
{
|
||||
return array_merge(...array_map(fn($app) => $app->events ?? [], $this->applications));
|
||||
return array_merge(...array_map(fn(Application $app) => $app->events ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getTaxusPrivileges() : array
|
||||
{
|
||||
return array_merge(...array_map(fn($app) => $app->taxus ?? [], $this->applications));
|
||||
return array_merge(...array_map(fn(Application $app) => $app->taxus ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getEntities() : array
|
||||
{
|
||||
return array_merge(...array_map(fn($app) => $app->entities ?? [], $this->applications));
|
||||
return array_merge(...array_map(fn(Application $app) => $app->entities ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getConnectionAdapters() : array
|
||||
{
|
||||
return array_merge(...array_map(fn(Application $app) => $app->connectionAdapters ?? [], $this->applications));
|
||||
}
|
||||
|
||||
public function getViewPaths() : array
|
||||
{
|
||||
$list = array_merge(...array_map(fn($app) => $app->views ?? [], $this->applications));
|
||||
$list = array_merge(...array_map(fn(Application $app) => $app->views ?? [], $this->applications));
|
||||
|
||||
$this->verifyPathList($list);
|
||||
|
||||
@@ -118,7 +123,7 @@ class Lean
|
||||
|
||||
public function getAssetPaths() : array
|
||||
{
|
||||
$list = array_merge(...array_map(fn($app) => $app->piceaAssets ?? [], $this->applications));
|
||||
$list = array_merge(...array_map(fn(Application $app) => $app->piceaAssets ?? [], $this->applications));
|
||||
|
||||
$this->verifyPathList($list);
|
||||
|
||||
@@ -140,11 +145,11 @@ class Lean
|
||||
{
|
||||
switch($reader) {
|
||||
case "php":
|
||||
$list = array_merge(...array_map(fn($app) => $app->tellPhp ?? [], $this->applications));
|
||||
$list = array_merge(...array_map(fn(Application $app) => $app->tellPhp ?? [], $this->applications));
|
||||
break;
|
||||
|
||||
case "json":
|
||||
$list = array_merge(...array_map(fn($app) => $app->tellJson ?? [], $this->applications));
|
||||
$list = array_merge(...array_map(fn(Application $app) => $app->tellJson ?? [], $this->applications));
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user