@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Lepton\Http\Response; |
| 4 | 4 | |
| 5 | - class FileResponse extends SuccessResponse |
|
| 5 | + class FileResponse extends SuccessResponse |
|
| 6 | 6 | { |
| 7 | 7 | |
| 8 | 8 | public function __construct( |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | parent::__construct(headers: ["Content-Type" => $contentType]); |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - public function sendBody(){ |
|
| 17 | + public function sendBody() { |
|
| 18 | 18 | readfile($this->filePath); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | public $headers; |
| 10 | 10 | public $body; |
| 11 | 11 | |
| 12 | - public function __construct($url, $htmx = false, $parse = true, $code = 302, $redirect_after = null ) |
|
| 12 | + public function __construct($url, $htmx = false, $parse = true, $code = 302, $redirect_after = null) |
|
| 13 | 13 | { |
| 14 | 14 | if ($this->isLocalUrl($url) && $parse) { |
| 15 | 15 | $parsedUrl = Application::getDir()."/".$url; |
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | if ($htmx) { |
| 20 | 20 | $headers = ["HX-Redirect" => $parsedUrl]; |
| 21 | 21 | } else { |
| 22 | - $headers = [ "Location" => $parsedUrl ]; |
|
| 22 | + $headers = ["Location" => $parsedUrl]; |
|
| 23 | 23 | } |
| 24 | - if(isset($redirect_after)){ |
|
| 24 | + if (isset($redirect_after)) { |
|
| 25 | 25 | $_SESSION["redirect_url"] = $redirect_after; |
| 26 | 26 | |
| 27 | 27 | } |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | } else { |
| 22 | 22 | $headers = [ "Location" => $parsedUrl ]; |
| 23 | 23 | } |
| 24 | - if(isset($redirect_after)){ |
|
| 24 | + if(isset($redirect_after)) { |
|
| 25 | 25 | $_SESSION["redirect_url"] = $redirect_after; |
| 26 | 26 | |
| 27 | 27 | } |
@@ -13,13 +13,13 @@ |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | |
| 16 | - public function sendHeaders(){ |
|
| 16 | + public function sendHeaders() { |
|
| 17 | 17 | foreach ($this->headers as $key => $value) { |
| 18 | 18 | header("$key: $value"); |
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function sendBody(){ |
|
| 22 | + public function sendBody() { |
|
| 23 | 23 | echo $this->body; |
| 24 | 24 | } |
| 25 | 25 | |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Lepton\Http\Response; |
| 4 | 4 | |
| 5 | - class NotFoundResponse extends HttpResponse |
|
| 5 | + class NotFoundResponse extends HttpResponse |
|
| 6 | 6 | { |
| 7 | 7 | |
| 8 | 8 | public function __construct( |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Lepton\Http\Response; |
| 4 | 4 | |
| 5 | - class InternalErrorResponse extends HttpResponse |
|
| 5 | + class InternalErrorResponse extends HttpResponse |
|
| 6 | 6 | { |
| 7 | 7 | |
| 8 | 8 | public function __construct( |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public function handle($match): FileResponse|NotFoundResponse{ |
| 53 | - if($match instanceof Match404){ |
|
| 53 | + if($match instanceof Match404) { |
|
| 54 | 54 | return new NotFoundResponse(); |
| 55 | 55 | } |
| 56 | 56 | return new FileResponse($match->filePath, $match->contentType); |
@@ -52,14 +52,14 @@ |
||
| 52 | 52 | return new MatchFile(filePath: $filePath, contentType: $contentType); |
| 53 | 53 | } else { |
| 54 | 54 | die($filePath); |
| 55 | - return new Match404(); |
|
| 55 | + return new Match404(); |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function handle($match): FileResponse|NotFoundResponse{ |
| 60 | - if($match instanceof Match404){ |
|
| 60 | + if($match instanceof Match404){ |
|
| 61 | 61 | return new NotFoundResponse(); |
| 62 | - } |
|
| 63 | - return new FileResponse($match->filePath, $match->contentType); |
|
| 62 | + } |
|
| 63 | + return new FileResponse($match->filePath, $match->contentType); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | $root = Application::$documentRoot; |
| 19 | 19 | $root .= Application::getAppConfig()->base_url; |
| 20 | - $filePath = $root."/".Application::getAppConfig()->static_files_dir. "/". $url; |
|
| 20 | + $filePath = $root."/".Application::getAppConfig()->static_files_dir."/".$url; |
|
| 21 | 21 | |
| 22 | 22 | // Check if the file exists |
| 23 | 23 | if (file_exists($filePath)) { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function handle($match): FileResponse|NotFoundResponse{ |
| 60 | - if($match instanceof Match404){ |
|
| 60 | + if ($match instanceof Match404) { |
|
| 61 | 61 | return new NotFoundResponse(); |
| 62 | 62 | } |
| 63 | 63 | return new FileResponse($match->filePath, $match->contentType); |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | $middlewareInstance->addMatcher($matcher); |
| 61 | 61 | $middlewareInstance->setRequest($this->request); |
| 62 | 62 | $middlewareResult = $middlewareInstance(...$args); |
| 63 | - if($middlewareResult instanceof HttpResponse){ |
|
| 63 | + if($middlewareResult instanceof HttpResponse) { |
|
| 64 | 64 | return $middlewareResult; |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -58,13 +58,13 @@ |
||
| 58 | 58 | if($matcher instanceof MatchRoute) { |
| 59 | 59 | |
| 60 | 60 | foreach($this->middlewares as $middleware => $args){ |
| 61 | - $middlewareInstance = new $middleware(); |
|
| 62 | - $middlewareInstance->addMatcher($matcher); |
|
| 63 | - $middlewareInstance->setRequest($this->request); |
|
| 64 | - $middlewareResult = $middlewareInstance(...$args); |
|
| 65 | - if($middlewareResult instanceof HttpResponse){ |
|
| 61 | + $middlewareInstance = new $middleware(); |
|
| 62 | + $middlewareInstance->addMatcher($matcher); |
|
| 63 | + $middlewareInstance->setRequest($this->request); |
|
| 64 | + $middlewareResult = $middlewareInstance(...$args); |
|
| 65 | + if($middlewareResult instanceof HttpResponse){ |
|
| 66 | 66 | return $middlewareResult; |
| 67 | - } |
|
| 67 | + } |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | Application::$controller = $matcher->controller; |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | // Add base_url to $pattern, if needed |
| 28 | 28 | |
| 29 | - $link = "%s/%s"; |
|
| 29 | + $link = "%s/%s"; |
|
| 30 | 30 | $pattern = sprintf($link, Application::getAppConfig()->base_url, $pattern); |
| 31 | 31 | // If it matches, return the match |
| 32 | 32 | $parameters = $resolver->match($pattern); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | // Check if callback is a controller method |
| 35 | 35 | $controller = $callback[0]; |
| 36 | 36 | $method = $callback[1]; |
| 37 | - if (! method_exists($controller, $method)) { |
|
| 37 | + if (!method_exists($controller, $method)) { |
|
| 38 | 38 | throw new Exceptions\ControllerNotFoundException("Invalid Controller and/or method in routes.php"); |
| 39 | 39 | } |
| 40 | 40 | return new MatchRoute(controller: $controller, method: $method, parameters: $parameters); |
@@ -51,25 +51,25 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | protected function handle(BaseMatch $matcher): HttpResponse |
| 53 | 53 | { |
| 54 | - if($matcher instanceof Match404) { |
|
| 54 | + if ($matcher instanceof Match404) { |
|
| 55 | 55 | return new NotFoundResponse(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - if($matcher instanceof MatchRoute) { |
|
| 58 | + if ($matcher instanceof MatchRoute) { |
|
| 59 | 59 | |
| 60 | - foreach($this->middlewares as $middleware => $args){ |
|
| 60 | + foreach ($this->middlewares as $middleware => $args) { |
|
| 61 | 61 | $middlewareInstance = new $middleware(); |
| 62 | 62 | $middlewareInstance->addMatcher($matcher); |
| 63 | 63 | $middlewareInstance->setRequest($this->request); |
| 64 | 64 | $middlewareResult = $middlewareInstance(...$args); |
| 65 | - if($middlewareResult instanceof HttpResponse){ |
|
| 65 | + if ($middlewareResult instanceof HttpResponse) { |
|
| 66 | 66 | return $middlewareResult; |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | Application::$controller = $matcher->controller; |
| 71 | 71 | $controller = new $matcher->controller(); |
| 72 | - $method = $matcher->method; |
|
| 72 | + $method = $matcher->method; |
|
| 73 | 73 | return $controller->$method(...$matcher->parameters); |
| 74 | 74 | } |
| 75 | 75 | throw new \Exception("Wrong matcher!"); |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | protected function checkPermissions(string $modifier, mixed ...$params):bool{ |
| 39 | - if($modifier == LoginRequired::class){ |
|
| 39 | + if($modifier == LoginRequired::class) { |
|
| 40 | 40 | $authenticator = new \Lepton\Authenticator\UserAuthenticator(); |
| 41 | 41 | return $authenticator->isLoggedIn(); |
| 42 | 42 | } |
@@ -14,18 +14,17 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | protected function handle(mixed ...$middlewareParams): HttpResponse|Request |
| 16 | 16 | { |
| 17 | - if($this->match instanceof MatchRoute) { |
|
| 17 | + if ($this->match instanceof MatchRoute) { |
|
| 18 | 18 | $reflection = new \ReflectionMethod($this->match->controller, $this->match->method); |
| 19 | 19 | $attributes = $reflection->getAttributes(); |
| 20 | 20 | |
| 21 | 21 | foreach ($attributes as $attribute) { |
| 22 | - if(is_subclass_of($attribute->getName(), AbstractAccessControlAttribute::class)) { |
|
| 22 | + if (is_subclass_of($attribute->getName(), AbstractAccessControlAttribute::class)) { |
|
| 23 | 23 | return |
| 24 | - $this->checkPermissions($attribute->getName(), ...($attribute->getArguments()))? |
|
| 25 | - $this->request : |
|
| 26 | - new RedirectResponse( |
|
| 24 | + $this->checkPermissions($attribute->getName(), ...($attribute->getArguments())) ? |
|
| 25 | + $this->request : new RedirectResponse( |
|
| 27 | 26 | Application::getAuthConfig()->login_url, |
| 28 | - redirect_after: $this->request->url |
|
| 27 | + redirect_after : $this->request->url |
|
| 29 | 28 | ); |
| 30 | 29 | } |
| 31 | 30 | |
@@ -36,7 +35,7 @@ discard block |
||
| 36 | 35 | |
| 37 | 36 | |
| 38 | 37 | protected function checkPermissions(string $modifier, mixed ...$params):bool{ |
| 39 | - if($modifier == LoginRequired::class){ |
|
| 38 | + if ($modifier == LoginRequired::class) { |
|
| 40 | 39 | $authenticator = new \Lepton\Authenticator\UserAuthenticator(); |
| 41 | 40 | return $authenticator->isLoggedIn(); |
| 42 | 41 | } |
@@ -414,11 +414,13 @@ discard block |
||
| 414 | 414 | * @return QuerySet |
| 415 | 415 | */ |
| 416 | 416 | |
| 417 | - public function do(): QuerySet |
|
| 417 | + public function do { |
|
| 418 | + (): QuerySet |
|
| 418 | 419 | { |
| 419 | 420 | |
| 420 | 421 | // Build the query |
| 421 | 422 | list($query, $values) = $this->buildQuery(); |
| 423 | + } |
|
| 422 | 424 | |
| 423 | 425 | // Connect to DB |
| 424 | 426 | $db = Application::getDb(); |
@@ -484,7 +486,7 @@ discard block |
||
| 484 | 486 | $query .= " ".$this->buildJoin($join); |
| 485 | 487 | $query .= " ".$this->buildJoin($join_t); |
| 486 | 488 | |
| 487 | - if(count($this->filters)>0){ |
|
| 489 | + if(count($this->filters)>0) { |
|
| 488 | 490 | $query .= sprintf(" WHERE %s ", $whereClause); |
| 489 | 491 | } |
| 490 | 492 | |
@@ -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), |