From 0e201b77f2164cd8ad8d987fa665be8b557910c1 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Wed, 5 Feb 2020 16:20:31 -0500 Subject: [PATCH] - Added some new request method (get, post, cookie & server). - Fixed the Title extension --- src/Extension/TitleExtension.php | 5 ++++- src/Method/Request.php | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Extension/TitleExtension.php b/src/Extension/TitleExtension.php index 885761f..30560a0 100644 --- a/src/Extension/TitleExtension.php +++ b/src/Extension/TitleExtension.php @@ -29,7 +29,10 @@ class TitleExtension implements Extension { return $this->title; } else { - $this->title = $set; + # Fixed a bug where template inheritance was rewriting title + if ( empty($this->title) ) { + $this->title = $set; + } } return null; diff --git a/src/Method/Request.php b/src/Method/Request.php index 2a620fe..f42df6e 100644 --- a/src/Method/Request.php +++ b/src/Method/Request.php @@ -33,24 +33,24 @@ class Request implements Extension { $context->pushFunction("post", [ $this, 'post' ]); } - public function cookie(string $variableName) + public function cookie(? string $variableName = null) { - return static::arrayGet($this->request->getCookieParams(), $variableName); + return $variableName === null ? $this->request->getCookieParams() : static::arrayGet($this->request->getCookieParams(), $variableName); } - public function get(string $variableName) + public function get(? string $variableName = null) { - return static::arrayGet($this->request->getQueryParams(), $variableName); + return $variableName === null ? $this->request->getQueryParams() : static::arrayGet($this->request->getQueryParams(), $variableName); } - public function post(string $variableName) + public function post(? string $variableName = null) { - return static::arrayGet($this->request->getParsedBody(), $variableName); + return $variableName === null ? $this->request->getParsedBody() : static::arrayGet($this->request->getParsedBody(), $variableName); } - public function server(string $variableName) + public function server(? string $variableName = null) { - return static::arrayGet($this->request->getServerParams(), $variableName); + return $variableName === null ? $this->request->getServerParams() : static::arrayGet($this->request->getServerParams(), $variableName); } public static function arrayGet(array $array, string $path, string $delimiter = '.')