@@ -3,12 +3,12 @@ |
||
| 3 | 3 | |
| 4 | 4 | #[\Attribute] |
| 5 | 5 | class DateTimeField extends Field{ |
| 6 | - public function __construct(...$args){ |
|
| 6 | + public function __construct(...$args){ |
|
| 7 | 7 | parent::__construct(...$args); |
| 8 | - } |
|
| 8 | + } |
|
| 9 | 9 | |
| 10 | - public function validate($value){ |
|
| 10 | + public function validate($value){ |
|
| 11 | 11 | if (!preg_match("/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/", $value)) return false; |
| 12 | 12 | return parent::validate($value); |
| 13 | - } |
|
| 13 | + } |
|
| 14 | 14 | } |
| 15 | 15 | \ No newline at end of file |
@@ -2,12 +2,12 @@ |
||
| 2 | 2 | namespace Lepton\Boson\DataTypes; |
| 3 | 3 | |
| 4 | 4 | #[\Attribute] |
| 5 | -class DateTimeField extends Field{ |
|
| 6 | - public function __construct(...$args){ |
|
| 5 | +class DateTimeField extends Field { |
|
| 6 | + public function __construct(...$args) { |
|
| 7 | 7 | parent::__construct(...$args); |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | - public function validate($value){ |
|
| 10 | + public function validate($value) { |
|
| 11 | 11 | if (!preg_match("/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/", $value)) return false; |
| 12 | 12 | return parent::validate($value); |
| 13 | 13 | } |
@@ -8,7 +8,9 @@ |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | public function validate($value){ |
| 11 | - if (!preg_match("/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/", $value)) return false; |
|
| 11 | + if (!preg_match("/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/", $value)) { |
|
| 12 | + return false; |
|
| 13 | + } |
|
| 12 | 14 | return parent::validate($value); |
| 13 | 15 | } |
| 14 | 16 | } |
| 15 | 17 | \ No newline at end of file |
@@ -14,7 +14,9 @@ |
||
| 14 | 14 | |
| 15 | 15 | public function validate($value) |
| 16 | 16 | { |
| 17 | - if (!is_a($value, $this->parent)) return false; |
|
| 17 | + if (!is_a($value, $this->parent)) { |
|
| 18 | + return false; |
|
| 19 | + } |
|
| 18 | 20 | return parent::validate($value); |
| 19 | 21 | } |
| 20 | 22 | } |
@@ -5,13 +5,13 @@ |
||
| 5 | 5 | class JSONField extends Field{ |
| 6 | 6 | |
| 7 | 7 | |
| 8 | - public function __construct(...$options ){ |
|
| 9 | - parent::__construct(...$options); |
|
| 8 | + public function __construct(...$options ){ |
|
| 9 | + parent::__construct(...$options); |
|
| 10 | 10 | |
| 11 | - } |
|
| 11 | + } |
|
| 12 | 12 | |
| 13 | - public function validate($value){ |
|
| 13 | + public function validate($value){ |
|
| 14 | 14 | if(!is_array(json_decode($value, true))) return false; |
| 15 | 15 | return parent::validate($value); |
| 16 | - } |
|
| 16 | + } |
|
| 17 | 17 | } |
| 18 | 18 | \ No newline at end of file |
@@ -2,16 +2,16 @@ |
||
| 2 | 2 | namespace Lepton\Boson\DataTypes; |
| 3 | 3 | |
| 4 | 4 | #[\Attribute] |
| 5 | -class JSONField extends Field{ |
|
| 5 | +class JSONField extends Field { |
|
| 6 | 6 | |
| 7 | 7 | |
| 8 | - public function __construct(...$options ){ |
|
| 8 | + public function __construct(...$options) { |
|
| 9 | 9 | parent::__construct(...$options); |
| 10 | 10 | |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public function validate($value){ |
|
| 14 | - if(!is_array(json_decode($value, true))) return false; |
|
| 13 | + public function validate($value) { |
|
| 14 | + if (!is_array(json_decode($value, true))) return false; |
|
| 15 | 15 | return parent::validate($value); |
| 16 | 16 | } |
| 17 | 17 | } |
| 18 | 18 | \ No newline at end of file |
@@ -11,7 +11,9 @@ |
||
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | public function validate($value){ |
| 14 | - if(!is_array(json_decode($value, true))) return false; |
|
| 14 | + if(!is_array(json_decode($value, true))) { |
|
| 15 | + return false; |
|
| 16 | + } |
|
| 15 | 17 | return parent::validate($value); |
| 16 | 18 | } |
| 17 | 19 | } |
| 18 | 20 | \ No newline at end of file |
@@ -81,49 +81,49 @@ discard block |
||
| 81 | 81 | public function __construct(protected string $model) |
| 82 | 82 | { |
| 83 | 83 | $this->lookup_map = array( |
| 84 | - "equals" => [ |
|
| 84 | + "equals" => [ |
|
| 85 | 85 | "operator" => "=", |
| 86 | 86 | "rhs" => fn ($x) => $x |
| 87 | - ], |
|
| 88 | - "startswith" => [ |
|
| 87 | + ], |
|
| 88 | + "startswith" => [ |
|
| 89 | 89 | "operator" => "LIKE", |
| 90 | 90 | "rhs" => fn ($x) => sprintf('%s%%', $x) |
| 91 | - ], |
|
| 91 | + ], |
|
| 92 | 92 | |
| 93 | - "endswith" => [ |
|
| 93 | + "endswith" => [ |
|
| 94 | 94 | "operator" => "LIKE", |
| 95 | 95 | "rhs" => fn ($x) => sprintf('%%%s', $x) |
| 96 | - ], |
|
| 96 | + ], |
|
| 97 | 97 | |
| 98 | - "contains" => [ |
|
| 98 | + "contains" => [ |
|
| 99 | 99 | "operator" => "LIKE", |
| 100 | 100 | "rhs" => fn ($x) => sprintf('%%%s%%', $x) |
| 101 | - ], |
|
| 101 | + ], |
|
| 102 | 102 | |
| 103 | - "lte" => [ |
|
| 103 | + "lte" => [ |
|
| 104 | 104 | "operator" => "<=", |
| 105 | 105 | "rhs" => fn ($x) => $x |
| 106 | - ], |
|
| 106 | + ], |
|
| 107 | 107 | |
| 108 | - "gte" => [ |
|
| 108 | + "gte" => [ |
|
| 109 | 109 | "operator" => ">=", |
| 110 | 110 | "rhs" => fn ($x) => $x |
| 111 | - ], |
|
| 111 | + ], |
|
| 112 | 112 | |
| 113 | - "lt" => [ |
|
| 113 | + "lt" => [ |
|
| 114 | 114 | "operator" => "<", |
| 115 | 115 | "rhs" => fn ($x) => $x |
| 116 | - ], |
|
| 116 | + ], |
|
| 117 | 117 | |
| 118 | - "gt" => [ |
|
| 118 | + "gt" => [ |
|
| 119 | 119 | "operator" => ">", |
| 120 | 120 | "rhs" => fn ($x) => $x |
| 121 | - ], |
|
| 121 | + ], |
|
| 122 | 122 | |
| 123 | - "neq" => [ |
|
| 123 | + "neq" => [ |
|
| 124 | 124 | "operator" => "<>", |
| 125 | 125 | "rhs" => fn ($x) => $x |
| 126 | - ] |
|
| 126 | + ] |
|
| 127 | 127 | ); |
| 128 | 128 | |
| 129 | 129 | $this->filters = array(); |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | $query .= sprintf(" ORDER BY %s", $modifiers); |
| 498 | 498 | } |
| 499 | 499 | |
| 500 | - //if(strpos($query, "ORDER BY")) die (print_r($query)); |
|
| 500 | + //if(strpos($query, "ORDER BY")) die (print_r($query)); |
|
| 501 | 501 | return array($query, $values); |
| 502 | 502 | } |
| 503 | 503 | |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | } |
| 575 | 575 | $clause = implode(", ", $conditions); |
| 576 | 576 | return [$clause, $join]; |
| 577 | - } |
|
| 577 | + } |
|
| 578 | 578 | |
| 579 | 579 | |
| 580 | 580 | private function buildWhereClause($filters) |
@@ -679,9 +679,9 @@ discard block |
||
| 679 | 679 | } |
| 680 | 680 | |
| 681 | 681 | return array( |
| 682 | - "column" => $last->getColumnFromField($column), |
|
| 683 | - "condition" => $condition, |
|
| 684 | - "join" => $join |
|
| 682 | + "column" => $last->getColumnFromField($column), |
|
| 683 | + "condition" => $condition, |
|
| 684 | + "join" => $join |
|
| 685 | 685 | ); |
| 686 | 686 | } |
| 687 | 687 | } |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | public function rewind(): void |
| 179 | 179 | { |
| 180 | 180 | $this->index = -1; |
| 181 | - if (! isset($this->result)) { |
|
| 181 | + if (!isset($this->result)) { |
|
| 182 | 182 | $this->cache = array(); |
| 183 | 183 | $this->do(); |
| 184 | 184 | } |
@@ -219,8 +219,8 @@ discard block |
||
| 219 | 219 | $db_columns = $this->current->db_columns(); |
| 220 | 220 | // Convert column names to field names |
| 221 | 221 | $fields = array(); |
| 222 | - foreach($items as $column => $value){ |
|
| 223 | - $fieldName = array_search($column ,$db_columns); |
|
| 222 | + foreach ($items as $column => $value) { |
|
| 223 | + $fieldName = array_search($column, $db_columns); |
|
| 224 | 224 | $fields[$fieldName] = $value; |
| 225 | 225 | } |
| 226 | 226 | $this->current->load(...$fields); |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $this->current->clearEditedFields(); |
| 229 | 229 | } else { |
| 230 | 230 | $this->current = null; |
| 231 | - $this->index = -1; |
|
| 231 | + $this->index = -1; |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | |
| 240 | 240 | public function first() |
| 241 | 241 | { |
| 242 | - if(!isset($this->cache)) { |
|
| 242 | + if (!isset($this->cache)) { |
|
| 243 | 243 | $this->rewind(); |
| 244 | 244 | } |
| 245 | 245 | |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | } |
| 385 | 385 | |
| 386 | 386 | $this->modifiers["ORDER BY"] = []; |
| 387 | - foreach($filters as $filter){ |
|
| 387 | + foreach ($filters as $filter) { |
|
| 388 | 388 | $this->modifiers["ORDER BY"][] = is_array($filter) ? $filter : [$filter => "ASC"]; |
| 389 | 389 | } |
| 390 | 390 | $this->modifiers["ORDER BY"] = $filters; |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | |
| 404 | 404 | public function count(): int |
| 405 | 405 | { |
| 406 | - if (! isset($this->result)) { |
|
| 406 | + if (!isset($this->result)) { |
|
| 407 | 407 | $this->do(); |
| 408 | 408 | } |
| 409 | 409 | return $this->result->num_rows; |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | |
| 440 | 440 | // Get the result |
| 441 | - $this->result = $result->fetch_result() ; |
|
| 441 | + $this->result = $result->fetch_result(); |
|
| 442 | 442 | return $this; |
| 443 | 443 | } |
| 444 | 444 | |
@@ -473,12 +473,12 @@ discard block |
||
| 473 | 473 | $modifiers = ""; |
| 474 | 474 | |
| 475 | 475 | // it there are any ORDER BY, build the clause |
| 476 | - if (count($this->modifiers)> 0) { |
|
| 476 | + if (count($this->modifiers) > 0) { |
|
| 477 | 477 | list($modifiers, $join) = $this->buildModifiers(); |
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | // if there are any filters build WHERE clause |
| 481 | - if (count($this->filters)> 0) { |
|
| 481 | + if (count($this->filters) > 0) { |
|
| 482 | 482 | list($whereClause, $values, $join_t) = $this->buildWhereClause($this->filters); |
| 483 | 483 | } |
| 484 | 484 | |
@@ -488,12 +488,12 @@ discard block |
||
| 488 | 488 | $query .= " ".$this->buildJoin($join); |
| 489 | 489 | $query .= " ".$this->buildJoin($join_t); |
| 490 | 490 | |
| 491 | - if(count($this->filters)>0){ |
|
| 491 | + if (count($this->filters) > 0) { |
|
| 492 | 492 | $query .= sprintf(" WHERE %s ", $whereClause); |
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | // it there are any ORDER BY, build the clause |
| 496 | - if (count($this->modifiers)> 0) { |
|
| 496 | + if (count($this->modifiers) > 0) { |
|
| 497 | 497 | $query .= sprintf(" ORDER BY %s", $modifiers); |
| 498 | 498 | } |
| 499 | 499 | |
@@ -523,10 +523,10 @@ discard block |
||
| 523 | 523 | |
| 524 | 524 | $clause = array(); |
| 525 | 525 | for ($i = 1; $i < count($join); $i++) { |
| 526 | - $clause[] = sprintf( |
|
| 526 | + $clause[] = sprintf( |
|
| 527 | 527 | " %s ON %s.%s = %s.%s", |
| 528 | 528 | $join[$i]["table"], |
| 529 | - $join[$i-1]["table"], |
|
| 529 | + $join[$i - 1]["table"], |
|
| 530 | 530 | $join[$i]["column"], |
| 531 | 531 | $join[$i]["table"], |
| 532 | 532 | $join[$i]["column"] |
@@ -548,8 +548,8 @@ discard block |
||
| 548 | 548 | $conditions = array(); |
| 549 | 549 | $join = array(); |
| 550 | 550 | |
| 551 | - foreach($order_by as $order_clause) { |
|
| 552 | - if(is_array($order_clause)) { |
|
| 551 | + foreach ($order_by as $order_clause) { |
|
| 552 | + if (is_array($order_clause)) { |
|
| 553 | 553 | $raw = array_key_first($order_clause); |
| 554 | 554 | $method = $order_clause[$raw]; |
| 555 | 555 | } else { |
@@ -608,7 +608,7 @@ discard block |
||
| 608 | 608 | $values = array(); |
| 609 | 609 | $join = array(); |
| 610 | 610 | |
| 611 | - foreach($filters as $key => $value) { |
|
| 611 | + foreach ($filters as $key => $value) { |
|
| 612 | 612 | $lookup = $this->lookup($key); |
| 613 | 613 | |
| 614 | 614 | $column = $lookup["column"]; |
@@ -656,8 +656,8 @@ discard block |
||
| 656 | 656 | // Now match has only joins |
| 657 | 657 | $join = array(); |
| 658 | 658 | foreach ($match as $k) { |
| 659 | - if($last->isForeignKey($k)) { |
|
| 660 | - $new= new ($last->getRelationshipParentModel($k))(); |
|
| 659 | + if ($last->isForeignKey($k)) { |
|
| 660 | + $new = new ($last->getRelationshipParentModel($k))(); |
|
| 661 | 661 | |
| 662 | 662 | $join[] = array( |
| 663 | 663 | "column"=> $last->getColumnFromField($k), |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | $this->connection = new \mysqli($dbhost, $dbuser, $dbpass, $dbname); |
| 24 | 24 | if ($this->connection->connect_error) { |
| 25 | - $this->error('Failed to connect to MySQL - ' . $this->connection->connect_error); |
|
| 25 | + $this->error('Failed to connect to MySQL - '.$this->connection->connect_error); |
|
| 26 | 26 | } |
| 27 | 27 | $this->connection->set_charset($charset); |
| 28 | 28 | } |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $this->query->execute(); |
| 50 | 50 | if ($this->query->errno) { |
| 51 | - $this->error('Unable to process MySQL query (check your params) - ' . $this->query->error); |
|
| 51 | + $this->error('Unable to process MySQL query (check your params) - '.$this->query->error); |
|
| 52 | 52 | } |
| 53 | 53 | $this->query_closed = FALSE; |
| 54 | 54 | } else { |
| 55 | - $this->error('Unable to prepare MySQL statement (check your syntax) - ' . $this->connection->error); |
|
| 55 | + $this->error('Unable to prepare MySQL statement (check your syntax) - '.$this->connection->error); |
|
| 56 | 56 | } |
| 57 | 57 | return $this; |
| 58 | 58 | } |
@@ -76,7 +76,9 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | if ($callback != null && is_callable($callback)) { |
| 78 | 78 | $value = $callback($r); //call_user_func($callback, $r); |
| 79 | - if ($value == 'break') break; |
|
| 79 | + if ($value == 'break') { |
|
| 80 | + break; |
|
| 81 | + } |
|
| 80 | 82 | } else { |
| 81 | 83 | $result[] = $r; |
| 82 | 84 | } |
@@ -141,10 +143,18 @@ discard block |
||
| 141 | 143 | |
| 142 | 144 | private function _gettype($var) |
| 143 | 145 | { |
| 144 | - if (is_string($var)) return 's'; |
|
| 145 | - if (is_float($var)) return 'd'; |
|
| 146 | - if (is_int($var)) return 'i'; |
|
| 147 | - if (is_null($var)) return 's'; |
|
| 146 | + if (is_string($var)) { |
|
| 147 | + return 's'; |
|
| 148 | + } |
|
| 149 | + if (is_float($var)) { |
|
| 150 | + return 'd'; |
|
| 151 | + } |
|
| 152 | + if (is_int($var)) { |
|
| 153 | + return 'i'; |
|
| 154 | + } |
|
| 155 | + if (is_null($var)) { |
|
| 156 | + return 's'; |
|
| 157 | + } |
|
| 148 | 158 | return 'b'; |
| 149 | 159 | } |
| 150 | 160 | } |
@@ -3,4 +3,4 @@ |
||
| 3 | 3 | |
| 4 | 4 | use Exception; |
| 5 | 5 | |
| 6 | -class MultipleResultsException extends Exception{} |
|
| 7 | 6 | \ No newline at end of file |
| 7 | +class MultipleResultsException extends Exception {} |
|
| 8 | 8 | \ No newline at end of file |
@@ -22,18 +22,18 @@ |
||
| 22 | 22 | protected function checkPermissions(string $modifier, mixed ...$params): bool |
| 23 | 23 | { |
| 24 | 24 | |
| 25 | - if($modifier == LoginRequired::class) { |
|
| 25 | + if ($modifier == LoginRequired::class) { |
|
| 26 | 26 | $level = $params[0] ?? 1; |
| 27 | 27 | |
| 28 | 28 | $authenticator = new \Lepton\Authenticator\UserAuthenticator(); |
| 29 | 29 | $loggedIn = $authenticator->isLoggedIn(); |
| 30 | - if(! $loggedIn) { |
|
| 30 | + if (!$loggedIn) { |
|
| 31 | 31 | return false; |
| 32 | 32 | } |
| 33 | 33 | $user = $authenticator->getLoggedUser(); |
| 34 | 34 | $splitted = explode("__", $this->level_field); |
| 35 | 35 | $user_level = $user; |
| 36 | - foreach($splitted as $part) { |
|
| 36 | + foreach ($splitted as $part) { |
|
| 37 | 37 | $user_level = $user_level->$part; |
| 38 | 38 | } |
| 39 | 39 | return ($user_level >= $level); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | return $this->request; |
| 22 | - } |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | 24 | abstract function check_request($middlewareParams); |
| 25 | 25 | } |
@@ -11,10 +11,10 @@ |
||
| 11 | 11 | { |
| 12 | 12 | protected function handle(mixed ...$middlewareParams): HttpResponse|Request |
| 13 | 13 | { |
| 14 | - $url = preg_replace("/^" . str_replace("/", "\/", Application::getAppConfig()->base_url) . "\//", "", $this->request->url); |
|
| 14 | + $url = preg_replace("/^".str_replace("/", "\/", Application::getAppConfig()->base_url)."\//", "", $this->request->url); |
|
| 15 | 15 | |
| 16 | - if(!in_array($url, $middlewareParams["allow"])){ |
|
| 17 | - if($this->check_request($middlewareParams)){ |
|
| 16 | + if (!in_array($url, $middlewareParams["allow"])) { |
|
| 17 | + if ($this->check_request($middlewareParams)) { |
|
| 18 | 18 | return new RedirectResponse($middlewareParams["redirect"], htmx: false, parse: false); |
| 19 | 19 | } |
| 20 | 20 | } |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | { |
| 14 | 14 | $url = preg_replace("/^" . str_replace("/", "\/", Application::getAppConfig()->base_url) . "\//", "", $this->request->url); |
| 15 | 15 | |
| 16 | - if(!in_array($url, $middlewareParams["allow"])){ |
|
| 17 | - if($this->check_request($middlewareParams)){ |
|
| 16 | + if(!in_array($url, $middlewareParams["allow"])) { |
|
| 17 | + if($this->check_request($middlewareParams)) { |
|
| 18 | 18 | return new RedirectResponse($middlewareParams["redirect"], htmx: false, parse: false); |
| 19 | 19 | } |
| 20 | 20 | } |