ai-sf / lepton

src/Boson/DataTypes/CharField.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 
     public function validate($value)
     {
-        if(is_null($value) && (!$this->null)) return false;
-        if(strlen($value) > $this->max_length) return false;
+        if (is_null($value) && (!$this->null)) return false;
+        if (strlen($value) > $this->max_length) return false;
         return true;
     }
 }

Braces +6 added lines, -2 removed lines

@@ -12,8 +12,12 @@
 
     public function validate($value)
     {
-        if(is_null($value) && (!$this->null)) return false;
-        if(strlen($value) > $this->max_length) return false;
+        if(is_null($value) && (!$this->null)) {
+            return false;
+        }
+        if(strlen($value) > $this->max_length) {
+            return false;
+        }
         return true;
     }
 }

src/Boson/DataTypes/DateTimeField.php

Indentation +4 added lines, -4 removed lines

@@ -3,11 +3,11 @@
 
 #[\Attribute]
 class DateTimeField extends Field{
-  public function __construct(...$args){
+    public function __construct(...$args){
     parent::__construct(...$args);
-  }
+    }
 
-  public function validate($value){
+    public function validate($value){
     return true;
-  }
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -2,12 +2,12 @@
 namespace Lepton\Boson\DataTypes;
 
 #[\Attribute]
-class DateTimeField extends Field{
-  public function __construct(...$args){
+class DateTimeField extends Field {
+  public function __construct(...$args) {
     parent::__construct(...$args);
   }
 
-  public function validate($value){
+  public function validate($value) {
     return true;
   }
 }
\ No newline at end of file

src/Boson/QuerySet.php

Indentation +21 added lines, -21 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();
@@ -638,9 +638,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();
         }
 
@@ -398,7 +398,7 @@ 
 
     public function count(): int
     {
-        if (! isset($this->result)) {
+        if (!isset($this->result)) {
             $this->do();
         }
         return $this->result->num_rows;
@@ -433,7 +433,7 @@ 
 
 
         // Get the result
-        $this->result = $result->fetch_result() ;
+        $this->result = $result->fetch_result();
         return $this;
     }
 
@@ -465,7 +465,7 @@ 
         $join = array();
 
         // if there are any filters build WHERE clause
-        if (count($this->filters)> 0) {
+        if (count($this->filters) > 0) {
             list($whereClause, $values, $join) = $this->buildWhereClause($this->filters);
             array_unshift($join, array("table" => $this->model::getTableName()));
 
@@ -475,7 +475,7 @@ 
         }
 
         // it there are any ORDER BY, build the clause
-        if (count($this->modifiers)> 0) {
+        if (count($this->modifiers) > 0) {
             $modifiers = $this->buildModifiers($this->modifiers);
             $query .= sprintf(" %s", $modifiers);
         }
@@ -505,10 +505,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"]
@@ -524,11 +524,11 @@ 
     {
         return implode(
             ", ",
-            array_map(function ($v, $k) {
+            array_map(function($v, $k) {
                 if (is_array($v)) {
-                    return $k. " ".implode(', ', $v);
+                    return $k." ".implode(', ', $v);
                 } else {
-                    return $k. " ".$v;
+                    return $k." ".$v;
                 }
             }, $modifiers, array_keys($modifiers))
         );
@@ -566,7 +566,7 @@ 
         $values = array();
         $join = array();
 
-        foreach($filters as $key => $value) {
+        foreach ($filters as $key => $value) {
             $lookup = $this->lookup($key);
 
             $column = $lookup["column"];
@@ -615,8 +615,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 +3 added lines, -1 removed lines

@@ -413,11 +413,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();

src/Helpers/Functions.php

Indentation +12 added lines, -12 removed lines

@@ -3,21 +3,21 @@
 
 class Functions{
 static function getDeclarationLine(\ReflectionProperty $prop){
-  $declaringClass = $prop->getDeclaringClass();
-  $propname = $prop->getName();
-  $classFile      = new \SplFileObject($declaringClass->getFileName());
-  foreach ($classFile as $line => $content) {
-      if (preg_match(
-          '/
+    $declaringClass = $prop->getDeclaringClass();
+    $propname = $prop->getName();
+    $classFile      = new \SplFileObject($declaringClass->getFileName());
+    foreach ($classFile as $line => $content) {
+        if (preg_match(
+            '/
               (private|protected|public|var|static) # match visibility or var
               \s                             # followed 1 whitespace
               \$'.$propname.'                          # followed by the var name $bar
           /x',
-          $content)
-      ) {
-          return $line + 1;
-      }
-  }
-  return 1;
+            $content)
+        ) {
+            return $line + 1;
+        }
+    }
+    return 1;
 }
 }

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 namespace Lepton\Helpers;
 
-class Functions{
-static function getDeclarationLine(\ReflectionProperty $prop){
+class Functions {
+static function getDeclarationLine(\ReflectionProperty $prop) {
   $declaringClass = $prop->getDeclaringClass();
   $propname = $prop->getName();
   $classFile      = new \SplFileObject($declaringClass->getFileName());

src/Routing/Match/MatchRoute.php

Indentation +1 added lines, -1 removed lines

@@ -5,6 +5,6 @@
 
 class MatchRoute extends BaseMatch
 {
-  public function __construct(public $controller, public $method, public $parameters){}
+    public function __construct(public $controller, public $method, public $parameters){}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -5,6 +5,6 @@
 
 class MatchRoute extends BaseMatch
 {
-  public function __construct(public $controller, public $method, public $parameters){}
+  public function __construct(public $controller, public $method, public $parameters) {}
 
 }

src/Routing/Match/MatchFile.php

Indentation +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@
 
 class MatchFile extends BaseMatch
 {
-  public function __construct(public $filePath, public $contentType)
-  {
+    public function __construct(public $filePath, public $contentType)
+    {
 
-  }
+    }
 
 }

src/Routing/UrlResolver.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 class UrlResolver
 {
 
-    public function __construct(private $pattern){}
+    public function __construct(private $pattern) {}
 
     public function patternPrepare($pattern)
     {
@@ -51,7 +51,7 @@ 
         $is_match = preg_match(sprintf("/^%s$/", $pattern), $_SERVER['REQUEST_URI'], $parameters);
 
         // keep only string keys
-        $parameters = array_filter($parameters, function ($k) {
+        $parameters = array_filter($parameters, function($k) {
             return is_string($k);
         }, ARRAY_FILTER_USE_KEY);
         return $is_match;

src/Controller/BaseController.php

Spacing +2 added lines, -2 removed lines

@@ -17,10 +17,10 @@
         Liquid::set('INCLUDE_SUFFIX', 'html');
         Liquid::set('INCLUDE_PREFIX', '');
         $path = "app/Views";
-        $template  = new Template($path);
+        $template = new Template($path);
         $template->registerFilter(new SiteFilter());
         $template->parseFile($view);
-        $parameters = array_map(function ($x) {
+        $parameters = array_map(function($x) {
             if ($x instanceof QuerySet) {
                 return $x->do();
             } else {

src/Core/Database.php

Indentation +66 added lines, -66 removed lines

@@ -3,43 +3,43 @@ 
 
 class Database {
 
-  protected $connection;
-	protected $query;
-  protected $show_errors = TRUE;
-  protected $query_closed = TRUE;
-
-	public function __construct($dbhost = 'localhost', $dbuser = 'root', $dbpass = '', $dbname = '', $charset = 'utf8') {
-		$this->connection = new \mysqli($dbhost, $dbuser, $dbpass, $dbname);
-		if ($this->connection->connect_error) {
-			$this->error('Failed to connect to MySQL - ' . $this->connection->connect_error);
-		}
-		$this->connection->set_charset($charset);
-	}
-
-  public function query($query, &...$args) {
+    protected $connection;
+    protected $query;
+    protected $show_errors = TRUE;
+    protected $query_closed = TRUE;
+
+    public function __construct($dbhost = 'localhost', $dbuser = 'root', $dbpass = '', $dbname = '', $charset = 'utf8') {
+        $this->connection = new \mysqli($dbhost, $dbuser, $dbpass, $dbname);
+        if ($this->connection->connect_error) {
+            $this->error('Failed to connect to MySQL - ' . $this->connection->connect_error);
+        }
+        $this->connection->set_charset($charset);
+    }
+
+    public function query($query, &...$args) {
     if(!$this->query_closed){
-      $this->query_closed = TRUE;
-      $this->query->close();
+        $this->query_closed = TRUE;
+        $this->query->close();
     }
-		if ($this->query = $this->connection->prepare($query)) {
-      if(count($args)){
+        if ($this->query = $this->connection->prepare($query)) {
+        if(count($args)){
         $types = implode(array_map(array($this, '_gettype'), $args));
         $this->query->bind_param($types, ...$args);
-      }
+        }
 
-      $this->query->execute();
-      if ($this->query->errno) {
+        $this->query->execute();
+        if ($this->query->errno) {
         $this->error('Unable to process MySQL query (check your params) - ' . $this->query->error);
-      }
-      $this->query_closed = FALSE;
+        }
+        $this->query_closed = FALSE;
     } else {
-      $this->error('Unable to prepare MySQL statement (check your syntax) - ' . $this->connection->error);
+        $this->error('Unable to prepare MySQL statement (check your syntax) - ' . $this->connection->error);
+    }
+        return $this;
     }
-		return $this;
-  }
 
 
-  public function fetch_all($callback = null) {
+    public function fetch_all($callback = null) {
     $params = array();
     $row = array();
     $meta = $this->query->result_metadata();
@@ -50,74 +50,74 @@ 
 
     $result = array();
     while ($this->query->fetch()) {
-      $r = array();
-      foreach ($row as $key => $val) {
+        $r = array();
+        foreach ($row as $key => $val) {
         $r[$key] = $val;
-      }
-      if ($callback != null && is_callable($callback)) {
+        }
+        if ($callback != null && is_callable($callback)) {
         $value = $callback($r);//call_user_func($callback, $r);
         if ($value == 'break') break;
-      } else {
+        } else {
         $result[] = $r;
-      }
+        }
     }
     $this->query_closed = TRUE;
     return $result;
-	}
+    }
 
-	public function fetch_array() {
+    public function fetch_array() {
     $params = array();
     $row = array();
     $meta = $this->query->result_metadata();
     while ($field = $meta->fetch_field()) {
-      $params[] = &$row[$field->name];
+        $params[] = &$row[$field->name];
     }
     $this->query->bind_result(...$params);
     $result = array();
-		while ($this->query->fetch()) {
-			foreach ($row as $key => $val) {
-				$result[$key] = $val;
-			}
-		}
-		return $result;
-	}
+        while ($this->query->fetch()) {
+            foreach ($row as $key => $val) {
+                $result[$key] = $val;
+            }
+        }
+        return $result;
+    }
 
-  public function fetch_result(){
-		return $this->query->get_result();
-  }
+    public function fetch_result(){
+        return $this->query->get_result();
+    }
 
 
 
 
-	public function close() {
-		return $this->connection->close();
-	}
+    public function close() {
+        return $this->connection->close();
+    }
 
-  public function num_rows() {
-		$this->query->store_result();
-		return $this->query->num_rows;
-	}
+    public function num_rows() {
+        $this->query->store_result();
+        return $this->query->num_rows;
+    }
 
-	public function affected_rows() {
-		return $this->query->affected_rows;
-	}
+    public function affected_rows() {
+        return $this->query->affected_rows;
+    }
 
-  public function last_insert_id() {
+    public function last_insert_id() {
     return $this->connection->insert_id;
-  }
+    }
 
-  public function error($error) {
+    public function error($error) {
     if ($this->show_errors) {
         die($error);
     }
-  }
+    }
 
-	private function _gettype($var) {
-	    if (is_string($var)) return 's';
-	    if (is_float($var)) return 'd';
-	    if (is_int($var)) return 'i';
-	    return 'b';
-	}
+    private function _gettype($var) {
+        if (is_string($var)) return 's';
+        if (is_float($var)) return 'd';
+        if (is_int($var)) return 'i';
+        return 'b';
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -11,29 +11,29 @@ 
 	public function __construct($dbhost = 'localhost', $dbuser = 'root', $dbpass = '', $dbname = '', $charset = 'utf8') {
 		$this->connection = new \mysqli($dbhost, $dbuser, $dbpass, $dbname);
 		if ($this->connection->connect_error) {
-			$this->error('Failed to connect to MySQL - ' . $this->connection->connect_error);
+			$this->error('Failed to connect to MySQL - '.$this->connection->connect_error);
 		}
 		$this->connection->set_charset($charset);
 	}
 
   public function query($query, &...$args) {
-    if(!$this->query_closed){
+    if (!$this->query_closed) {
       $this->query_closed = TRUE;
       $this->query->close();
     }
 		if ($this->query = $this->connection->prepare($query)) {
-      if(count($args)){
+      if (count($args)) {
         $types = implode(array_map(array($this, '_gettype'), $args));
         $this->query->bind_param($types, ...$args);
       }
 
       $this->query->execute();
       if ($this->query->errno) {
-        $this->error('Unable to process MySQL query (check your params) - ' . $this->query->error);
+        $this->error('Unable to process MySQL query (check your params) - '.$this->query->error);
       }
       $this->query_closed = FALSE;
     } else {
-      $this->error('Unable to prepare MySQL statement (check your syntax) - ' . $this->connection->error);
+      $this->error('Unable to prepare MySQL statement (check your syntax) - '.$this->connection->error);
     }
 		return $this;
   }
@@ -55,7 +55,7 @@ 
         $r[$key] = $val;
       }
       if ($callback != null && is_callable($callback)) {
-        $value = $callback($r);//call_user_func($callback, $r);
+        $value = $callback($r); //call_user_func($callback, $r);
         if ($value == 'break') break;
       } else {
         $result[] = $r;
@@ -82,7 +82,7 @@ 
 		return $result;
 	}
 
-  public function fetch_result(){
+  public function fetch_result() {
 		return $this->query->get_result();
   }
 

Braces +14 added lines, -6 removed lines

@@ -17,12 +17,12 @@ 
 	}
 
   public function query($query, &...$args) {
-    if(!$this->query_closed){
+    if(!$this->query_closed) {
       $this->query_closed = TRUE;
       $this->query->close();
     }
 		if ($this->query = $this->connection->prepare($query)) {
-      if(count($args)){
+      if(count($args)) {
         $types = implode(array_map(array($this, '_gettype'), $args));
         $this->query->bind_param($types, ...$args);
       }
@@ -56,7 +56,9 @@ 
       }
       if ($callback != null && is_callable($callback)) {
         $value = $callback($r);//call_user_func($callback, $r);
-        if ($value == 'break') break;
+        if ($value == 'break') {
+            break;
+        }
       } else {
         $result[] = $r;
       }
@@ -113,9 +115,15 @@ 
   }
 
 	private function _gettype($var) {
-	    if (is_string($var)) return 's';
-	    if (is_float($var)) return 'd';
-	    if (is_int($var)) return 'i';
+	    if (is_string($var)) {
+	        return 's';
+	    }
+	    if (is_float($var)) {
+	        return 'd';
+	    }
+	    if (is_int($var)) {
+	        return 'i';
+	    }
 	    return 'b';
 	}