Laravel 10

neondigital · Apr 19, 2024 · 6efda0e · 6efda0e
1 parent 8f63e23
commit 6efda0e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git 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
@@ -1,23 +1,27 @@
 <?php namespace Forma;
 
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\URL;
+
 class Helpers
 {
 
     public static function url($string)
     {
         if (static::isLaravel())
         {
-            return \URL::to($string);
+            return (new URL())->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');
     }