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

Compare commits

base: public:2.x
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.2.1
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

6 Commits
2.x ... 3.2.1

Author SHA1 Message Date
User
5eaf931847 20240410#8 2024-04-10 03:36:09 +03:00
User
efe3b0ad5a 20240410#4 2024-04-10 02:37:25 +03:00
User
d9a3deef90 20231113#2 2023-11-13 04:13:49 +03:00
User
0c121af290 20231113#1 2023-11-13 04:12:41 +03:00
User
7b03cf952e 20231010#7 2023-10-11 00:03:51 +03:00
User
33e3fba104 20231010#6 2023-10-11 00:00:54 +03:00
4 changed files with 17 additions and 18 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"
``` ```

2
composer.json
View File

@@ -12,7 +12,7 @@
"ext-yaml": "*", "ext-yaml": "*",
"psr/log": "^3.0.0", "psr/log": "^3.0.0",
"psr/container": "^1.0", "psr/container": "^1.0",
"rmphp/foundation": "^1.0" "rmphp/foundation": "^2.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

17
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,14 +69,7 @@ class App extends Main {
} }
} }
/** /**
* 2. Если итерации закончились и задан обьект Content им создаем результат для эмиттера * Отдаем пустой результат
*/
if($this->template() && !empty($this->template()->getResponse())){
$this->globals()->response()->getBody()->write($this->template()->getResponse());
return$this->globals()->response();
}
/**
* 3. Отдаем пустой результат если не определен шаблонизатор
*/ */
return $this->defaultPage(404); return $this->defaultPage(404);
} }
@@ -91,7 +82,7 @@ class App extends Main {
$this->syslogger()->warning("Exception: ".$exception->getMessage()." : ".$exception->getFile()." : ".$exception->getLine()); $this->syslogger()->warning("Exception: ".$exception->getMessage()." : ".$exception->getFile()." : ".$exception->getLine());
} }
catch (AppError $appError){ 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()); $this->syslogger()->error("Error: ".$appError->getMessage()." : ".$appError->getFile()." : ".$appError->getLine());
} }
catch (\Error $error) { catch (\Error $error) {
@@ -99,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);
} }

14
src/Globals.php
View File

@@ -4,6 +4,7 @@ namespace Rmphp\Kernel;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\UploadedFileInterface;
class Globals { class Globals {
@@ -150,10 +151,17 @@ class Globals {
/** /**
* @param string $name * @param string $name
* @return array|int|string * @return array|UploadedFileInterface|null
*/ */
public function files(string $name = "") { public function files(string $name = ""): array|UploadedFileInterface|null {
return $this->onGlobal($this->request->getUploadedFiles(), $name); $name = strtolower($name);
$var = $this->request->getUploadedFiles();
if (!empty($name))
{
if (!isset($var[$name])) return null;
return $var[$name];
}
return $var;
} }
/** /**