Removed type hints to PHP 5 compatibility

pull/515/head
fadrian06 1 year ago
parent 9251a6da90
commit 193cf9bb8b

@ -17,24 +17,24 @@ namespace flight\template;
*/ */
class View class View
{ {
/** Location of view templates. */ /** @var string Location of view templates. */
public string $path; public $path;
/** File extension. */ /** @var string File extension. */
public string $extension = '.php'; public $extension = '.php';
/** @var array<string, mixed> View variables. */ /** @var array<string, mixed> View variables. */
protected array $vars = []; protected $vars = [];
/** Template file. */ /** @var string Template file. */
private string $template; private $template;
/** /**
* Constructor. * Constructor.
* *
* @param string $path Path to templates directory * @param string $path Path to templates directory
*/ */
public function __construct(string $path = '.') public function __construct($path = '.')
{ {
$this->path = $path; $this->path = $path;
} }
@ -42,9 +42,11 @@ class View
/** /**
* Gets a template variable. * Gets a template variable.
* *
* @param string $key
*
* @return mixed Variable value or `null` if doesn't exists * @return mixed Variable value or `null` if doesn't exists
*/ */
public function get(string $key) public function get($key)
{ {
return $this->vars[$key] ?? null; return $this->vars[$key] ?? null;
} }
@ -56,7 +58,7 @@ class View
* @param mixed $value Value * @param mixed $value Value
* @return $this * @return $this
*/ */
public function set($key, $value = null): self public function set($key, $value = null)
{ {
if (\is_iterable($key)) { if (\is_iterable($key)) {
foreach ($key as $k => $v) { foreach ($key as $k => $v) {
@ -72,9 +74,11 @@ class View
/** /**
* Checks if a template variable is set. * Checks if a template variable is set.
* *
* @param string $key
*
* @return bool If key exists * @return bool If key exists
*/ */
public function has(string $key): bool public function has($key)
{ {
return isset($this->vars[$key]); return isset($this->vars[$key]);
} }
@ -82,9 +86,11 @@ class View
/** /**
* Unsets a template variable. If no key is passed in, clear all variables. * Unsets a template variable. If no key is passed in, clear all variables.
* *
* @param ?string $key
*
* @return $this * @return $this
*/ */
public function clear(?string $key = null): self public function clear($key = null)
{ {
if (null === $key) { if (null === $key) {
$this->vars = []; $this->vars = [];
@ -99,17 +105,18 @@ class View
* Renders a template. * Renders a template.
* *
* @param string $file Template file * @param string $file Template file
* @param array<string, mixed> $data Template data * @param ?array<string, mixed> $data Template data
* *
* @return void
* @throws \Exception If template not found * @throws \Exception If template not found
*/ */
public function render(string $file, ?array $data = null): void public function render($file, $data = null)
{ {
$this->template = $this->getTemplate($file); $this->template = $this->getTemplate($file);
if (!\file_exists($this->template)) { if (!\file_exists($this->template)) {
$this->template = self::normalizePath($this->template); $normalized_path = self::normalizePath($this->template);
throw new \Exception("Template file not found: {$this->template}."); throw new \Exception("Template file not found: {$normalized_path}.");
} }
if (\is_array($data)) { if (\is_array($data)) {
@ -129,7 +136,7 @@ class View
* *
* @return string Output of template * @return string Output of template
*/ */
public function fetch(string $file, ?array $data = null): string public function fetch($file, $data = null)
{ {
\ob_start(); \ob_start();
@ -145,7 +152,7 @@ class View
* *
* @return bool Template file exists * @return bool Template file exists
*/ */
public function exists(string $file): bool public function exists($file)
{ {
return \file_exists($this->getTemplate($file)); return \file_exists($this->getTemplate($file));
} }
@ -157,7 +164,7 @@ class View
* *
* @return string Template file location * @return string Template file location
*/ */
public function getTemplate(string $file): string public function getTemplate($file)
{ {
$ext = $this->extension; $ext = $this->extension;
@ -181,14 +188,20 @@ class View
* *
* @return string Escaped string * @return string Escaped string
*/ */
public function e(string $str): string public function e($str)
{ {
$value = \htmlentities($str); $value = \htmlentities($str);
echo $value; echo $value;
return $value; return $value;
} }
protected static function normalizePath(string $path, string $separator = DIRECTORY_SEPARATOR): string /**
* @param string $path An unnormalized path.
* @param string $separator Path separator.
*
* @return string Normalized path.
*/
protected static function normalizePath($path, $separator = DIRECTORY_SEPARATOR)
{ {
return \str_replace(['\\', '/'], $separator, $path); return \str_replace(['\\', '/'], $separator, $path);
} }

@ -124,7 +124,7 @@ class ViewTest extends PHPUnit\Framework\TestCase
public function testNormalizePath(): void public function testNormalizePath(): void
{ {
$viewMock = new class extends View { $viewMock = new class extends View {
public static function normalizePath(string $path, string $separator = DIRECTORY_SEPARATOR): string public static function normalizePath($path, $separator = DIRECTORY_SEPARATOR)
{ {
return parent::normalizePath($path, $separator); return parent::normalizePath($path, $separator);
} }

Loading…
Cancel
Save