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

Compare commits

base: public:2.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
...
compare: public:3.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

3 Commits
2.0 ... 3.0

Author SHA1 Message Date
User
7b03cf952e 20231010#7 2023-10-11 00:03:51 +03:00
User
33e3fba104 20231010#6 2023-10-11 00:00:54 +03:00
User
2a620798b3 20231009#1 2023-10-09 14:12:18 +03:00
2 changed files with 5 additions and 19 deletions
Expand all files Collapse all files

2
README.md
View File

@@ -11,5 +11,5 @@ composer require rmphp/kernel
``` ```
```bash ```bash
composer require rmphp/kernel:"^2.0" composer require rmphp/kernel:"^3.0"
``` ```

22
src/App.php
View File

@@ -61,9 +61,7 @@ class App extends Main {
$log = "Method ".$appHandler->className."/".$appHandler->methodName; $log = "Method ".$appHandler->className."/".$appHandler->methodName;
} }
$this->syslogger()->log("handlers", "OK - ".$log); $this->syslogger()->log("handlers", "OK - ".$log);
/**
* 1. Если на этапе итерации уже получен ответ ResponseInterface - досрочно отдаем результат в эмиттер
*/
if($response instanceof ResponseInterface) { if($response instanceof ResponseInterface) {
return $response; return $response;
} }
@@ -71,16 +69,7 @@ class App extends Main {
} }
} }
/** /**
* 2. Если итерации закончились и задан обьект Content им создаем результат для эмиттера * Отдаем пустой результат
*/
if($this->template() && !empty($this->template()->getResponse())){
$body = $this->globals()->response()->getBody();
$body->write($this->template()->getResponse());
$body->rewind();
return $this->globals()->response()->withBody($body);
}
/**
* 3. Отдаем пустой результат если не определен шаблонизатор
*/ */
return $this->defaultPage(404); return $this->defaultPage(404);
} }
@@ -101,7 +90,7 @@ class App extends Main {
$this->syslogger()->error("Error: ".$error->getMessage()." : ".$error->getFile()." : ".$error->getLine()); $this->syslogger()->error("Error: ".$error->getMessage()." : ".$error->getFile()." : ".$error->getLine());
} }
/** /**
* 4. Отдаем ошибку без шаблона * Отдаем после ошибки
*/ */
return $this->defaultPage(501); return $this->defaultPage(501);
} }
@@ -112,10 +101,7 @@ class App extends Main {
*/ */
private function defaultPage(int $code) : ResponseInterface{ private function defaultPage(int $code) : ResponseInterface{
if(is_file($this->baseDir.'/'.getenv("PAGE".$code))){ if(is_file($this->baseDir.'/'.getenv("PAGE".$code))){
$body = $this->globals()->response()->getBody(); $this->globals()->response()->getBody()->write(file_get_contents($this->baseDir.'/'.getenv("PAGE".$code)));
$body->write(file_get_contents($this->baseDir.'/'.getenv("PAGE".$code)));
$body->rewind();
return $this->globals()->response()->withBody($body)->withStatus($code);
} }
return $this->globals()->response()->withStatus($code); return $this->globals()->response()->withStatus($code);
} }