diff --git a/Dockerfile b/Dockerfile index 33834f0..89c5ecb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.1-fpm RUN apt-get update && apt-get install -y libzip-dev libicu-dev git libpng-dev unzip -RUN docker-php-ext-install pdo pdo_mysql zip intl gd +RUN docker-php-ext-install pdo pdo_mysql zip intl gd bcmath RUN pecl install xdebug-3.1.3 \ && docker-php-ext-enable xdebug diff --git a/aldarien/config/app/Service/Config.php b/aldarien/config/app/Service/Config.php index 5ee4959..072e38f 100644 --- a/aldarien/config/app/Service/Config.php +++ b/aldarien/config/app/Service/Config.php @@ -122,7 +122,11 @@ class Config $ini = strpos($value, '{') + 1; $end = strpos($value, '}', $ini); $rep = substr($value, $ini, $end - $ini); - $value = str_replace('{' . $rep . '}', $this->get($rep), $value); + $new = $this->get($rep); + if ($new === null) { + $new = ''; + } + $value = str_replace('{' . $rep . '}', $new, $value); } } return $value; diff --git a/aldarien/response/app/Service/Response.php b/aldarien/response/app/Service/Response.php index 290f9d5..d0f3e24 100644 --- a/aldarien/response/app/Service/Response.php +++ b/aldarien/response/app/Service/Response.php @@ -59,4 +59,4 @@ class Response return false; } } -?> \ No newline at end of file +?> diff --git a/aldarien/response/composer.json b/aldarien/response/composer.json index 72ebcc0..0187228 100644 --- a/aldarien/response/composer.json +++ b/aldarien/response/composer.json @@ -3,7 +3,7 @@ "description" : "Response handler module for my apps", "type" : "library", "require" : { - "wixel/gump" : "*", + "wixel/gump" : "^2.0", "aldarien/contract" : "*" }, "require-dev" : { diff --git a/aldarien/url/app/Service/URL.php b/aldarien/url/app/Service/URL.php index 4c70ae1..49a601d 100644 --- a/aldarien/url/app/Service/URL.php +++ b/aldarien/url/app/Service/URL.php @@ -1,8 +1,8 @@ getHost()); if ($host->isAbsolute()) { diff --git a/aldarien/url/composer.json b/aldarien/url/composer.json index 78837f1..779ed73 100644 --- a/aldarien/url/composer.json +++ b/aldarien/url/composer.json @@ -6,6 +6,7 @@ "aldarien/contract" : "*", "aldarien/root" : "*", "league/uri": "*", + "league/uri-components": "*", "sabre/uri": "*" }, "require-dev" : { diff --git a/aldarien/view/app/Service/View.php b/aldarien/view/app/Service/View.php index dcdcbb0..7c78bdd 100644 --- a/aldarien/view/app/Service/View.php +++ b/aldarien/view/app/Service/View.php @@ -1,7 +1,7 @@ views = config('locations.views'); $this->cache = config('locations.cache'); - $this->blade = new Blade($this->views, $this->cache); + $this->blade = new BladeOne($this->views, $this->cache); } public function show($template, $vars = null) { if ($vars) { - return $this->blade->view()->make($template, $vars)->render(); + return $this->blade->run($template, $vars); } - return $this->blade->view()->make($template)->render(); + return $this->blade->run($template); } } ?> diff --git a/aldarien/view/composer.json b/aldarien/view/composer.json index b41c138..5d283ab 100644 --- a/aldarien/view/composer.json +++ b/aldarien/view/composer.json @@ -3,7 +3,7 @@ "description": "View module for my apps", "type": "library", "require": { - "philo/laravel-blade": "*", + "eftec/bladeone": "*", "aldarien/contract": "*", "aldarien/config": "*" }, diff --git a/composer.json b/composer.json index 75c6a9f..b7e2166 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "nesbot/carbon": "^2", "phpoffice/phpword": "^0", "slam/php-excel": "^4.4", - "fabpot/goutte": "^3.2", + "guzzlehttp/guzzle": "*", "incoviba/modelos": "*", "slim/slim": "^4", "php-di/slim-bridge": "*", @@ -53,7 +53,7 @@ "type": "path", "url": "./aldarien/**", "options": { - "symlink": false + "symlink": true } }, {