fix matcher array pattern bug and nullable pattern bug

laraXgram · Jun 16, 2024 · dc1d692 · dc1d692
1 parent 2a4cb4a
commit dc1d692
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/index.php b/index.php
diff --git a/src/Container/Container.php b/src/Container/Container.php
@@ -38,12 +38,6 @@ class Container implements ContainerContract, ArrayAccess
     protected array $resolvingCallbacks = [];
     protected array $afterResolvingCallbacks = [];
 
-    public function __construct()
-    {
-        static::setInstance($this);
-        Facade::setFacadeApplication($this);
-    }
-
     public function when($concrete): ContextualBindingBuilder|array
     {
         $aliases = [];

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -7,6 +7,8 @@
 use LaraGram\Container\Container;
 use LaraGram\Contracts\Application as ApplicationContract;
 use Illuminate\Database\Capsule\Manager as Capsule;
+use LaraGram\Request\Request;
+use LaraGram\Support\Facades\Facade;
 
 class Application extends Container implements ApplicationContract
 {
@@ -33,7 +35,8 @@ class Application extends Container implements ApplicationContract
 
     public function __construct(string $basePath = null)
     {
-        parent::__construct();
+        static::setInstance($this);
+        Facade::setFacadeApplication($this);
 
         $this->setBasePath($basePath)
             ->loadEnv();
@@ -534,6 +537,7 @@ private function loadResources(): void
         $files = array_filter(scandir($directory), function ($file) use ($directory) {
             return is_file($directory . DIRECTORY_SEPARATOR . $file);
         });
+
         foreach ($files as $file) {
             require_once $directory . DIRECTORY_SEPARATOR . $file;
         }

diff --git a/src/Listener/Matcher.php b/src/Listener/Matcher.php
@@ -2,8 +2,11 @@
 
 namespace LaraGram\Listener;
 
+use LaraGram\Request\Request;
+
 class Matcher
 {
+    /** @var Request $request */
     private mixed $request;
 
     public function match(string $type, callable $action, string|array|null $pattern)
@@ -26,7 +29,7 @@ private function execute_regex($pattern, $action, $input = null)
             $matches = array_filter($matches, function ($value, $key) {
                 return !is_numeric($key) && $value !== "" && $value !== null;
             }, ARRAY_FILTER_USE_BOTH);
-            return call_user_func_array($action, [$this->request, $matches]);
+            return call_user_func_array($action, [$this->request, ...$matches]);
         }
 
         return false;
@@ -36,8 +39,9 @@ private function match_text(callable $action, string|array $pattern)
     {
         if (is_array($pattern)) {
             foreach ($pattern as $value) {
-                return $this->execute_regex($value, $action);
+                $result = $this->execute_regex($value, $action);
             }
+            return $result;
         } else {
             return $this->execute_regex($pattern, $action);
         }