improvement order

Author: Fady Michel

src/Route.php

@@ -13,11 +13,6 @@ class Route
      */
     protected $name;
 
-    /**
-     * @var array<string>
-     */
-    protected $controller = [];
-
     /**
      * @var string
      */
@@ -26,13 +21,18 @@ class Route
     /**
      * @var array<string>
      */
-    protected $vars = [];
+    protected $controller = [];
 
     /**
      * @var array<string>
      */
     protected $methods = [];
 
+    /**
+     * @var array<string>
+     */
+    protected $vars = [];
+
     public function __construct(string $name, string $path, array $controller, array $methods = ['GET', 'POST'])
     {
         $this->name = $name;
@@ -41,16 +41,11 @@ public function __construct(string $name, string $path, array $controller, array
         $this->methods = $methods;
     }
 
-    public function hasVars(): bool
-    {
-        return $this->getVarsNames() !== [];
-    }
-
     public function match(string $path, string $method): bool
     {
         if (
             in_array($method, $this->getMethods()) &&
-            preg_match('#^' . $this->generateRegex() . '$#sD', $this->trimPath($path), $matches)
+            preg_match('#^' . $this->generateRegex() . '$#sD', self::trimPath($path), $matches)
         ) {
 
             $values = array_filter($matches, function ($key) {
@@ -77,12 +72,6 @@ public function getPath(): string
         return $this->path;
     }
 
-    public function addVar(string $key, string $value): self
-    {
-        $this->vars[$key] = $value;
-        return $this;
-    }
-
     public function getController(): array
     {
         return $this->controller;
@@ -104,11 +93,6 @@ public function getMethods(): array
         return $this->methods;
     }
 
-    private function trimPath(string $path): string
-    {
-        return '/' . rtrim(ltrim(trim($path), '/'), '/');
-    }
-
     private function generateRegex(): string
     {
         $regex = $this->path;
@@ -118,4 +102,20 @@ private function generateRegex(): string
         }
         return $regex;
     }
+
+    public function hasVars(): bool
+    {
+        return $this->getVarsNames() !== [];
+    }
+
+    public function addVar(string $key, string $value): self
+    {
+        $this->vars[$key] = $value;
+        return $this;
+    }
+
+    private static function trimPath(string $path): string
+    {
+        return '/' . rtrim(ltrim(trim($path), '/'), '/');
+    }
 }