public/rmphp-kernel
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: public:3.2
Branches Tags
public:6.x public:5.x public:4.x public:3.x public:2.x
public:6.1 public:6.0 public:5.0 public:4.1 public:4.0 public:3.2.1 public:3.2 public:3.1 public:3.0 public:2.0.1 public:2.0 public:1.2 public:1.1 public:1.0
...
compare: public:4.0
Branches Tags
public:6.x public:5.x public:4.x public:3.x public:2.x
public:6.1 public:6.0 public:5.0 public:4.1 public:4.0 public:3.2.1 public:3.2 public:3.1 public:3.0 public:2.0.1 public:2.0 public:1.2 public:1.1 public:1.0

2 Commits
3.2 ... 4.0

Author SHA1 Message Date
User
cf621dbaef 20240412#1 2024-04-12 02:43:39 +03:00
User
5eaf931847 20240410#8 2024-04-10 03:36:09 +03:00
1 changed files with 13 additions and 8 deletions
Expand all files Collapse all files

21
src/App.php
View File

@@ -82,7 +82,7 @@ class App extends Main {
$this->syslogger()->warning("Exception: ".$exception->getMessage()." : ".$exception->getFile()." : ".$exception->getLine());
}
catch (AppError $appError){
if($this->logger()) $this->logger()->warning($appError->getMessage()." on ".$appError->getFile().":".$appError->getLine());
if($this->logger()) $this->logger()->error($appError->getMessage()." on ".$appError->getFile().":".$appError->getLine());
$this->syslogger()->error("Error: ".$appError->getMessage()." : ".$appError->getFile()." : ".$appError->getLine());
}
catch (\Error $error) {
@@ -166,17 +166,22 @@ class App extends Main {
$params = (!empty($appNode['params']) && is_string($appNode['params'])) ? explode(",",str_replace(" ", "", $appNode['params'])) : [];
$this->appRoutes[] = new MatchObject($className, $methodName, $params);
}
elseif(!empty($appNode['router']) && is_array($appNode['router'])){
if(empty($this->router)) throw AppError::invalidRequiredObject("Application config without router");
$this->router->setStartPoint($mountKey);
$this->router->withRules($appNode['router']);
$routes = $this->router->match($this->globals()->request()) ?? [];
foreach ($routes as $route){
$this->appRoutes[] = $route;
}
}
elseif(!empty($appNode['router']) && file_exists($this->baseDir."/".$appNode['router'])){
if(empty($this->router)) throw AppError::invalidRequiredObject("Application config without router");
$this->router->setStartPoint($mountKey);
if(pathinfo($this->baseDir."/".$appNode['router'])['extension'] == "php") {
$this->router->withRules(include_once $this->baseDir."/".$appNode['router']);
}
elseif(pathinfo($this->baseDir."/".$appNode['router'])['extension'] == "yaml") {
$this->router->withRules(yaml_parse_file($this->baseDir."/".$appNode['router']));
}
ob_start(); $routes = include_once $this->baseDir."/".$appNode['router']; ob_end_clean();
if(is_array($routes)) $this->router->withRules($routes);
$routes = $this->router->match($this->globals()->request()) ?? [];
foreach ($routes as $route){