From 6efda0e96bf482f804e722deab52672aeaf3da3e Mon Sep 17 00:00:00 2001 From: aaronneondigital Date: Fri, 19 Apr 2024 10:54:40 +0100 Subject: [PATCH] Laravel 10 --- composer.json | 4 ++-- src/Forma/Helpers.php | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 2948046..d7fdcc6 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ } ], "require": { - "php": ">=5.4.0", - "illuminate/support": ">=4.0.0" + "php": "^8.1", + "illuminate/support": ">=10.0.0" }, "autoload": { "psr-0": { diff --git a/src/Forma/Helpers.php b/src/Forma/Helpers.php index 8674d74..6b1b4f9 100644 --- a/src/Forma/Helpers.php +++ b/src/Forma/Helpers.php @@ -1,5 +1,9 @@ to($string); } return $string; } - public static function hasLang($string) + public static function hasLang($string): bool { if (static::isLaravel()) { - return \Lang::has($string); + return (new Lang)->has($string); } return false; @@ -27,7 +31,7 @@ public static function lang($string) { if (static::isLaravel()) { - return \Lang::get($string); + return (new Lang)->get($string); } return $string; @@ -37,23 +41,23 @@ public static function input($string) { if (static::isLaravel()) { - return \Request::get($string); + return (new Request)->get($string); } - return isset($_REQUEST[$string]) ? $_REQUEST[$string] : false; + return $_REQUEST[$string] ?? false; } public static function inputOld($string) { if (static::isLaravel()) { - return \Request::old($string); + return (new Request)->old($string); } return false; } - public static function isLaravel() + public static function isLaravel(): bool { return class_exists('Illuminate\Foundation\Application'); }