ai-sf / lepton

src/Http/Response/RedirectResponse.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
     public $headers;
     public $body;
 
-    public function __construct($url, $htmx = false, $parse = true, $code = 302, $redirect_after = null )
+    public function __construct($url, $htmx = false, $parse = true, $code = 302, $redirect_after = null)
     {
         if ($this->isLocalUrl($url) && $parse) {
             $parsedUrl = Application::getDir()."/".$url;
@@ -19,9 +19,9 @@ 
         if ($htmx) {
             $headers = ["HX-Redirect" => $parsedUrl];
         } else {
-            $headers = [ "Location" => $parsedUrl ];
+            $headers = ["Location" => $parsedUrl];
         }
-        if(isset($redirect_after)){
+        if (isset($redirect_after)) {
             $_SESSION["redirect_url"] = $redirect_after;
 
         }

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         } else {
             $headers = [ "Location" => $parsedUrl ];
         }
-        if(isset($redirect_after)){
+        if(isset($redirect_after)) {
             $_SESSION["redirect_url"] = $redirect_after;
 
         }

src/Http/Response/HttpResponse.php

Spacing +2 added lines, -2 removed lines

@@ -13,13 +13,13 @@
     }
 
 
-    public function sendHeaders(){
+    public function sendHeaders() {
         foreach ($this->headers as $key => $value) {
             header("$key: $value");
         }
     }
 
-    public function sendBody(){
+    public function sendBody() {
         echo $this->body;
     }
 

src/Http/Response/NotFoundResponse.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace Lepton\Http\Response;
 
- class NotFoundResponse extends HttpResponse
+    class NotFoundResponse extends HttpResponse
 {
 
     public function __construct(

src/Http/Response/InternalErrorResponse.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace Lepton\Http\Response;
 
- class InternalErrorResponse extends HttpResponse
+    class InternalErrorResponse extends HttpResponse
 {
 
     public function __construct(

src/Core/Handler/StaticHandler.php

Braces +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     }
 
     public function handle($match): FileResponse|NotFoundResponse{
-      if($match instanceof Match404){
+      if($match instanceof Match404) {
         return new NotFoundResponse();
       }
       return new FileResponse($match->filePath, $match->contentType);

Indentation +4 added lines, -4 removed lines

@@ -52,14 +52,14 @@
             return new MatchFile(filePath: $filePath, contentType: $contentType);
         } else {
             die($filePath);
-          return new Match404();
+            return new Match404();
         }
     }
 
     public function handle($match): FileResponse|NotFoundResponse{
-      if($match instanceof Match404){
+        if($match instanceof Match404){
         return new NotFoundResponse();
-      }
-      return new FileResponse($match->filePath, $match->contentType);
+        }
+        return new FileResponse($match->filePath, $match->contentType);
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 
         $root = Application::$documentRoot;
         $root .= Application::getAppConfig()->base_url;
-        $filePath = $root."/".Application::getAppConfig()->static_files_dir. "/". $url;
+        $filePath = $root."/".Application::getAppConfig()->static_files_dir."/".$url;
 
         // Check if the file exists
         if (file_exists($filePath)) {
@@ -57,7 +57,7 @@ 
     }
 
     public function handle($match): FileResponse|NotFoundResponse{
-      if($match instanceof Match404){
+      if ($match instanceof Match404) {
         return new NotFoundResponse();
       }
       return new FileResponse($match->filePath, $match->contentType);

src/Core/Handler/BaseHandler.php

Braces +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
               $middlewareInstance->addMatcher($matcher);
               $middlewareInstance->setRequest($this->request);
               $middlewareResult = $middlewareInstance(...$args);
-              if($middlewareResult instanceof HttpResponse){
+              if($middlewareResult instanceof HttpResponse) {
                 return $middlewareResult;
               }
             }

Indentation +6 added lines, -6 removed lines

@@ -58,13 +58,13 @@
         if($matcher instanceof MatchRoute) {
 
             foreach($this->middlewares as $middleware => $args){
-              $middlewareInstance = new $middleware();
-              $middlewareInstance->addMatcher($matcher);
-              $middlewareInstance->setRequest($this->request);
-              $middlewareResult = $middlewareInstance(...$args);
-              if($middlewareResult instanceof HttpResponse){
+                $middlewareInstance = new $middleware();
+                $middlewareInstance->addMatcher($matcher);
+                $middlewareInstance->setRequest($this->request);
+                $middlewareResult = $middlewareInstance(...$args);
+                if($middlewareResult instanceof HttpResponse){
                 return $middlewareResult;
-              }
+                }
             }
 
             Application::$controller = $matcher->controller;

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 
             // Add base_url to $pattern, if needed
 
-            $link =  "%s/%s";
+            $link = "%s/%s";
             $pattern = sprintf($link, Application::getAppConfig()->base_url, $pattern);
             // If it matches, return the match
             $parameters = $resolver->match($pattern);
@@ -34,7 +34,7 @@ 
                 // Check if callback is a controller method
                 $controller = $callback[0];
                 $method = $callback[1];
-                if (! method_exists($controller, $method)) {
+                if (!method_exists($controller, $method)) {
                     throw new Exceptions\ControllerNotFoundException("Invalid Controller and/or method in routes.php");
                 }
                 return new MatchRoute(controller: $controller, method: $method, parameters: $parameters);
@@ -51,25 +51,25 @@ 
      */
     protected function handle(BaseMatch $matcher): HttpResponse
     {
-        if($matcher instanceof Match404) {
+        if ($matcher instanceof Match404) {
             return new NotFoundResponse();
         }
 
-        if($matcher instanceof MatchRoute) {
+        if ($matcher instanceof MatchRoute) {
 
-            foreach($this->middlewares as $middleware => $args){
+            foreach ($this->middlewares as $middleware => $args) {
               $middlewareInstance = new $middleware();
               $middlewareInstance->addMatcher($matcher);
               $middlewareInstance->setRequest($this->request);
               $middlewareResult = $middlewareInstance(...$args);
-              if($middlewareResult instanceof HttpResponse){
+              if ($middlewareResult instanceof HttpResponse) {
                 return $middlewareResult;
               }
             }
 
             Application::$controller = $matcher->controller;
             $controller = new $matcher->controller();
-            $method =  $matcher->method;
+            $method = $matcher->method;
             return $controller->$method(...$matcher->parameters);
         }
         throw new \Exception("Wrong matcher!");

src/Middleware/BaseAccessControlMiddleware.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
 
     protected function checkPermissions(string $modifier, mixed ...$params):bool{
-        if($modifier == LoginRequired::class){
+        if($modifier == LoginRequired::class) {
             $authenticator = new \Lepton\Authenticator\UserAuthenticator();
             return $authenticator->isLoggedIn();
         }

Spacing +6 added lines, -7 removed lines

@@ -14,18 +14,17 @@ 
 
     protected function handle(mixed ...$middlewareParams): HttpResponse|Request
     {
-        if($this->match instanceof MatchRoute) {
+        if ($this->match instanceof MatchRoute) {
             $reflection = new \ReflectionMethod($this->match->controller, $this->match->method);
             $attributes = $reflection->getAttributes();
 
             foreach ($attributes as $attribute) {
-                if(is_subclass_of($attribute->getName(), AbstractAccessControlAttribute::class)) {
+                if (is_subclass_of($attribute->getName(), AbstractAccessControlAttribute::class)) {
                     return
-                        $this->checkPermissions($attribute->getName(),  ...($attribute->getArguments()))?
-                        $this->request :
-                        new RedirectResponse(
+                        $this->checkPermissions($attribute->getName(), ...($attribute->getArguments())) ?
+                        $this->request : new RedirectResponse(
                             Application::getAuthConfig()->login_url,
-                            redirect_after: $this->request->url
+                            redirect_after : $this->request->url
                         );
                 }
 
@@ -36,7 +35,7 @@ 
 
 
     protected function checkPermissions(string $modifier, mixed ...$params):bool{
-        if($modifier == LoginRequired::class){
+        if ($modifier == LoginRequired::class) {
             $authenticator = new \Lepton\Authenticator\UserAuthenticator();
             return $authenticator->isLoggedIn();
         }

src/Boson/QuerySet.php

Indentation +23 added lines, -23 removed lines

@@ -81,49 +81,49 @@ 
     public function __construct(protected string $model)
     {
         $this->lookup_map = array(
-          "equals" => [
+            "equals" => [
             "operator" => "=",
             "rhs" => fn ($x) =>  $x
-          ],
-          "startswith" => [
+            ],
+            "startswith" => [
             "operator" => "LIKE",
             "rhs" => fn ($x) =>  sprintf('%s%%', $x)
-          ],
+            ],
 
-          "endswith" => [
+            "endswith" => [
             "operator" => "LIKE",
             "rhs" => fn ($x) => sprintf('%%%s', $x)
-          ],
+            ],
 
-          "contains" => [
+            "contains" => [
             "operator" => "LIKE",
             "rhs" => fn ($x) => sprintf('%%%s%%', $x)
-          ],
+            ],
 
-          "lte" => [
+            "lte" => [
             "operator" => "<=",
             "rhs" => fn ($x) => $x
-          ],
+            ],
 
-          "gte" => [
+            "gte" => [
             "operator" => ">=",
             "rhs" => fn ($x) => $x
-          ],
+            ],
 
-          "lt" => [
+            "lt" => [
             "operator" => "<",
             "rhs" => fn ($x) => $x
-          ],
+            ],
 
-          "gt" => [
+            "gt" => [
             "operator" => ">",
             "rhs" => fn ($x) => $x
-          ],
+            ],
 
-          "neq" => [
+            "neq" => [
             "operator" => "<>",
             "rhs" => fn ($x) => $x
-          ]
+            ]
         );
 
         $this->filters = array();
@@ -493,7 +493,7 @@ 
             $query .= sprintf(" ORDER BY %s", $modifiers);
         }
 
-       //if(strpos($query, "ORDER BY")) die (print_r($query));
+        //if(strpos($query, "ORDER BY")) die (print_r($query));
         return array($query, $values);
     }
 
@@ -568,7 +568,7 @@ 
                 }
             }, $modifiers, array_keys($modifiers))
         );*/
-      }
+        }
 
 
     private function buildWhereClause($filters)
@@ -674,9 +674,9 @@ 
         }
 
         return array(
-          "column"    => $last->getColumnFromField($column),
-          "condition" => $condition,
-          "join" => $join
+            "column"    => $last->getColumnFromField($column),
+            "condition" => $condition,
+            "join" => $join
         );
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -178,7 +178,7 @@ 
     public function rewind(): void
     {
         $this->index = -1;
-        if (! isset($this->result)) {
+        if (!isset($this->result)) {
             $this->cache = array();
             $this->do();
         }
@@ -219,8 +219,8 @@ 
             $db_columns = $this->current->db_columns();
             // Convert column names to field names
             $fields = array();
-            foreach($items as $column => $value){
-                $fieldName = array_search($column ,$db_columns);
+            foreach ($items as $column => $value) {
+                $fieldName = array_search($column, $db_columns);
                 $fields[$fieldName] = $value;
             }
             $this->current->load(...$fields);
@@ -228,7 +228,7 @@ 
             $this->current->clearEditedFields();
         } else {
             $this->current = null;
-            $this->index =  -1;
+            $this->index = -1;
         }
 
 
@@ -239,7 +239,7 @@ 
 
     public function first()
     {
-        if(!isset($this->cache)) {
+        if (!isset($this->cache)) {
             $this->rewind();
         }
 
@@ -399,7 +399,7 @@ 
 
     public function count(): int
     {
-        if (! isset($this->result)) {
+        if (!isset($this->result)) {
             $this->do();
         }
         return $this->result->num_rows;
@@ -434,7 +434,7 @@ 
 
 
         // Get the result
-        $this->result = $result->fetch_result() ;
+        $this->result = $result->fetch_result();
         return $this;
     }
 
@@ -469,12 +469,12 @@ 
         $modifiers = "";
 
         // it there are any ORDER BY, build the clause
-        if (count($this->modifiers)> 0) {
+        if (count($this->modifiers) > 0) {
             list($modifiers, $join) = $this->buildModifiers();
         }
 
         // if there are any filters build WHERE clause
-        if (count($this->filters)> 0) {
+        if (count($this->filters) > 0) {
             list($whereClause, $values, $join_t) = $this->buildWhereClause($this->filters);
         }
 
@@ -484,12 +484,12 @@ 
         $query .= " ".$this->buildJoin($join);
         $query .= " ".$this->buildJoin($join_t);
 
-        if(count($this->filters)>0){
+        if (count($this->filters) > 0) {
             $query .= sprintf(" WHERE %s ", $whereClause);
         }
 
         // it there are any ORDER BY, build the clause
-        if (count($this->modifiers)> 0) {
+        if (count($this->modifiers) > 0) {
             $query .= sprintf(" ORDER BY %s", $modifiers);
         }
 
@@ -519,10 +519,10 @@ 
 
         $clause = array();
         for ($i = 1; $i < count($join); $i++) {
-            $clause[] =  sprintf(
+            $clause[] = sprintf(
                 " %s ON %s.%s = %s.%s",
                 $join[$i]["table"],
-                $join[$i-1]["table"],
+                $join[$i - 1]["table"],
                 $join[$i]["column"],
                 $join[$i]["table"],
                 $join[$i]["column"]
@@ -539,7 +539,7 @@ 
         $order_by = $this->modifiers["ORDER BY"];
         $conditions = array();
         $join = array();
-        foreach($order_by as $raw) {
+        foreach ($order_by as $raw) {
             $parsed = $this->lookup($raw);
 
             $column = $parsed["column"];
@@ -602,7 +602,7 @@ 
         $values = array();
         $join = array();
 
-        foreach($filters as $key => $value) {
+        foreach ($filters as $key => $value) {
             $lookup = $this->lookup($key);
 
             $column = $lookup["column"];
@@ -651,8 +651,8 @@ 
 
         $join = array();
         foreach ($match as $k) {
-            if($last->isForeignKey($k)) {
-                $new= new ($last->getRelationshipParentModel($k))();
+            if ($last->isForeignKey($k)) {
+                $new = new ($last->getRelationshipParentModel($k))();
 
                 $join[] = array(
                     "column"=> $last->getColumnFromField($k),

Braces +4 added lines, -2 removed lines

@@ -414,11 +414,13 @@ 
      *  @return QuerySet
      */
 
-    public function do(): QuerySet
+    public function do {
+        (): QuerySet
     {
 
         // Build the query
         list($query, $values) = $this->buildQuery();
+    }
 
         // Connect to DB
         $db = Application::getDb();
@@ -484,7 +486,7 @@ 
         $query .= " ".$this->buildJoin($join);
         $query .= " ".$this->buildJoin($join_t);
 
-        if(count($this->filters)>0){
+        if(count($this->filters)>0) {
             $query .= sprintf(" WHERE %s ", $whereClause);
         }
 

src/LeptonServer.php

Spacing +22 added lines, -22 removed lines

@@ -18,7 +18,7 @@ 
 
         echo "Running...".PHP_EOL;
 
-        if(is_dir($this->sass_directory)) {
+        if (is_dir($this->sass_directory)) {
             // Clean output folder
             array_map('unlink', array_filter((array) glob($this->css_directory."*")));
 
@@ -28,13 +28,13 @@ 
             $this->updateMainFiles();
 
             // Compile the files
-            foreach($this->fileHashes as $file => $hash) {
+            foreach ($this->fileHashes as $file => $hash) {
 
                 $file = realpath($file);
                 $fileDependancies = $this->compileFile($file);
                 $this->fileHashes[$file] = filemtime($file);
                 $this->dependancyTree[$file] = $fileDependancies;
-                foreach($fileDependancies as $dep) {
+                foreach ($fileDependancies as $dep) {
                     $this->fileHashes[realpath($dep)] = filemtime($dep);
                 }
             }
@@ -43,7 +43,7 @@ 
             echo "Dependancies tree built.".PHP_EOL.PHP_EOL;
 
             // Compute md5 hash for files
-            foreach($this->dependancyTree as $file => $where) {
+            foreach ($this->dependancyTree as $file => $where) {
                 $fileHashes[$file] = filemtime($file);
             }
 
@@ -68,24 +68,24 @@ 
         //Start the PHP built-in web server
         $command = sprintf('php -S localhost:5555 -t %s %s/webserver.php', $this->application, $this->application);
         $this->webServerProcess = proc_open($command, [STDIN, STDOUT, STDERR], $pipes);
-        while(true) {
-            if($this->compile_sass) {
+        while (true) {
+            if ($this->compile_sass) {
                 $this->cleanDeletedFiles();
                 $this->updateMainFiles();
-                foreach($this->fileHashes as $file => $hash) {
+                foreach ($this->fileHashes as $file => $hash) {
                     $file = realpath($file);
-                    if(file_exists($file)) {
+                    if (file_exists($file)) {
                         $newHash = filemtime($file);
-                        if($newHash != $hash) {
+                        if ($newHash != $hash) {
                             echo "\e[93mFile $file modified!\e[39m".PHP_EOL;
                             $this->fileHashes[$file] = $newHash;
 
                             // if it's a main file
-                            if(key_exists($file, $this->dependancyTree)) {
+                            if (key_exists($file, $this->dependancyTree)) {
                                 $this->dependancyTree[$file] = $this->compileFile($file);
                             } else { // if it's an included file
-                                foreach($this->dependancyTree as $main => $dependancies) {
-                                    if(in_array($file, $dependancies)) {
+                                foreach ($this->dependancyTree as $main => $dependancies) {
+                                    if (in_array($file, $dependancies)) {
                                         $this->dependancyTree[$main] = $this->compileFile($main);
                                     }
                                 }
@@ -113,14 +113,14 @@ 
     public function cleanDeletedFiles()
     {
 
-        foreach($this->fileHashes as $file => $hash) {
-            if(!file_exists($file)) {
+        foreach ($this->fileHashes as $file => $hash) {
+            if (!file_exists($file)) {
                 unset($fileHashes[$file]);
-                foreach($this->dependancyTree as $main => $dependancies) {
-                    if($main == $file) {
+                foreach ($this->dependancyTree as $main => $dependancies) {
+                    if ($main == $file) {
                         unset($this->dependancyTree[$main]);
                     }
-                    if(in_array($file, $dependancies)) {
+                    if (in_array($file, $dependancies)) {
                         $key = array_search($file, $dependancies);
                         unset($this->dependancyTree[$main][$key]);
                     }
@@ -140,7 +140,7 @@ 
         if (is_file($inputFile)) {
             // Set the path to the output CSS file
             $outputFile = preg_replace('/(.*)\.(sass|scss)$/', '$1.css', basename($inputFile));
-            $outputFile =  $this->css_directory.$outputFile;
+            $outputFile = $this->css_directory.$outputFile;
             // Compile the SCSS code into CSS
             try {
                 $result = $compiler->compileString(file_get_contents($inputFile));
@@ -175,14 +175,14 @@ 
 
     public function updateMainFiles()
     {
-        $files = glob($this->sass_directory . '/*');  // Get all files in the directory
+        $files = glob($this->sass_directory.'/*'); // Get all files in the directory
 
 
         foreach ($files as $file) {
             $file = realpath($file);
-            $pattern = '/^\/.+\/[^_]*[.](scss|sass)/';     // Specify the regex pattern for file names
-            if(preg_match($pattern, $file)) {
-                if(! array_key_exists($file, $this->fileHashes)) {
+            $pattern = '/^\/.+\/[^_]*[.](scss|sass)/'; // Specify the regex pattern for file names
+            if (preg_match($pattern, $file)) {
+                if (!array_key_exists($file, $this->fileHashes)) {
                     $this->fileHashes[$file] = 0;
                 }
             }

Braces +2 added lines, -1 removed lines

@@ -83,7 +83,8 @@
                             // if it's a main file
                             if(key_exists($file, $this->dependancyTree)) {
                                 $this->dependancyTree[$file] = $this->compileFile($file);
-                            } else { // if it's an included file
+                            } else {
+// if it's an included file
                                 foreach($this->dependancyTree as $main => $dependancies) {
                                     if(in_array($file, $dependancies)) {
                                         $this->dependancyTree[$main] = $this->compileFile($main);