1.) added: updates from dev

Author: Faks

composer.json

@@ -20,12 +20,10 @@
     ],
     "homepage": "https://github.com/solumdesignum/scenarios",
     "require": {
-        "php": "^7.0|^7.1|^7.2|^7.3|^7.4|^8.0",
-        "illuminate/support": "~5|~6|~7|~8"
+        "php": "^8.0|^8.1|^8.2",
+        "illuminate/support": "~9|~10"
     },
     "require-dev": {
-        "php": "^7.0|^7.1|^7.2|^7.3|^7.4|^8.0",
-        "illuminate/support": "~5|~6|~7|~8"
     },
     "autoload": {
         "psr-4": {

src/Scenarios.php

@@ -4,25 +4,17 @@
 
 namespace SolumDeSignum\Scenarios;
 
-use function config;
 use Illuminate\Support\Facades\Route;
+use function config;
+use function is_bool;
 
 trait Scenarios
 {
-    /**
-     * @var string
-     */
-    public $scenario;
+    public string $scenario;
 
-    /**
-     * @var string
-     */
-    public $setMethodFromController;
+    public mixed $setMethodFromController;
 
-    /**
-     * @var string
-     */
-    public $setMethodFromUrl;
+    public mixed $setMethodFromUrl;
 
     /**
      * Create a new rule instance.
@@ -58,18 +50,44 @@ public function __construct()
         }
     }
 
+    private function exceptionOneSetMethod(): void
+    {
+        if (
+            !is_bool($this->setMethodFromController) ||
+            !is_bool($this->setMethodFromUrl) ||
+            ($this->setMethodFromController === false && $this->setMethodFromUrl === false)
+        ) {
+            throw new \Exception(
+                'Please enable at least one setMethod function, LIKE RIGHT NOW !!!'
+            );
+        }
+    }
+
+    private function exceptionOnlyOneSetMethod(): void
+    {
+        if (
+            !is_bool($this->setMethodFromController) ||
+            !is_bool($this->setMethodFromUrl) ||
+            ($this->setMethodFromController === true && $this->setMethodFromUrl === true)
+        ) {
+            throw new \Exception(
+                'Please enable only one setMethod function, LIKE RIGHT NOW !!!'
+            );
+        }
+    }
+
     /**
      * @param $method
      *
+     * @return string
      * @throws \Exception
      *
-     * @return string
      */
     public function patternFilter($method): string
     {
-        \preg_match_all(
+        preg_match_all(
             config('scenarios.methods.pattern'),
-            \mb_strtolower($method),
+            strtolower($method),
             $matches
         );
 
@@ -78,6 +96,20 @@ public function patternFilter($method): string
         return $matches[0][0];
     }
 
+    /**
+     * @param mixed $matches
+     *
+     * @throws \Exception
+     */
+    private function exceptionScenarioPattern($matches): void
+    {
+        if (!isset($matches)) {
+            throw new \Exception(
+                'Scenarios patternFilter failed finding match, check $scenarioPattern , LIKE RIGHT NOW !!!'
+            );
+        }
+    }
+
     /**
      * @return string|null
      */
@@ -97,44 +129,4 @@ public function currentRequestUri(): ?string
             Route::getCurrentRequest()->getRequestUri() :
             null;
     }
-
-    /**
-     * @param mixed $matches
-     *
-     * @throws \Exception
-     */
-    private function exceptionScenarioPattern($matches): void
-    {
-        if (isset($matches) === false) {
-            throw new \Exception(
-                'Scenarios patternFilter failed finding match, check $scenarioPattern , LIKE RIGHT NOW !!!'
-            );
-        }
-    }
-
-    private function exceptionOneSetMethod(): void
-    {
-        if (
-            \is_bool($this->setMethodFromController) === false ||
-            \is_bool($this->setMethodFromUrl) === false ||
-            ($this->setMethodFromController === false && $this->setMethodFromUrl === false)
-        ) {
-            throw new \Exception(
-                'Please enable at least one setMethod function, LIKE RIGHT NOW !!!'
-            );
-        }
-    }
-
-    private function exceptionOnlyOneSetMethod(): void
-    {
-        if (
-            \is_bool($this->setMethodFromController) === false ||
-            \is_bool($this->setMethodFromUrl) === false ||
-            ($this->setMethodFromController === true && $this->setMethodFromUrl === true)
-        ) {
-            throw new \Exception(
-                'Please enable only one setMethod function, LIKE RIGHT NOW !!!'
-            );
-        }
-    }
 }

src/ScenariosServiceProvider.php

@@ -4,7 +4,6 @@
 
 namespace SolumDeSignum\Scenarios;
 
-use function config_path;
 use Illuminate\Support\ServiceProvider;
 
 class ScenariosServiceProvider extends ServiceProvider
@@ -19,7 +18,7 @@ public function boot(): void
         if ($this->app->runningInConsole()) {
             $this->publishes(
                 [
-                    __DIR__.'/../config/scenarios.php' => config_path(
+                    __DIR__ . '/../config/scenarios.php' => config_path(
                         'scenarios.php'
                     ),
                 ],
@@ -36,7 +35,7 @@ public function boot(): void
     public function register(): void
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/scenarios.php',
+            __DIR__ . '/../config/scenarios.php',
             'scenarios'
         );
     }