Постфиксная запись типов вместо префиксной
This commit is contained in:
parent
04662a94df
commit
11370eecc9
33 changed files with 95 additions and 79 deletions
|
|
@ -12,9 +12,9 @@ class ActionAccess
|
|||
{
|
||||
public $access = array();
|
||||
public $processor;
|
||||
public /*.User.*/$user;
|
||||
public $user/*: User*/;
|
||||
|
||||
function __construct(/*.Filter.*/$processor, $user) {
|
||||
function __construct($processor/*: Filter*/, $user) {
|
||||
$this->processor = $processor;
|
||||
$this->user = $user;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace ctiso\Filter;
|
||||
use ctiso\HttpRequest;
|
||||
use ctiso\Role\UserInterface,
|
||||
ctiso\HttpRequest;
|
||||
|
||||
/* Переделать формат Логов на список json */
|
||||
class ActionLogger
|
||||
|
|
@ -12,7 +13,7 @@ class ActionLogger
|
|||
public $action;
|
||||
public $processor;
|
||||
|
||||
function __construct(/*.Filter.*/$processor, $logPath, $user) {
|
||||
function __construct($processor/*: Filter*/, $logPath, $user/*: UserInterface*/) {
|
||||
$this->processor = $processor;
|
||||
$this->user = $user;
|
||||
|
||||
|
|
@ -27,7 +28,7 @@ class ActionLogger
|
|||
function execute(HttpRequest $request) {
|
||||
$action = $request->getAction();
|
||||
if(in_array($action, $this->before)) {
|
||||
$message = ["time" => date("r", time()), "query" => array_merge($_POST, $_GET), "user" => $this->user->name];
|
||||
$message = ["time" => date("r", time()), "query" => array_merge($_POST, $_GET), "user" => $this->user->getName()];
|
||||
fwrite($this->file, json_encode($message) . "\n");
|
||||
}
|
||||
return $this->processor->execute($request);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ use ctiso\Controller\Action,
|
|||
class Filter
|
||||
{
|
||||
public $processor;
|
||||
public function __construct(/*.Action.*/$processor)
|
||||
public function __construct($processor/*: Action*/)
|
||||
{
|
||||
$this->processor = $processor;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class Login extends Filter
|
|||
|
||||
public $mode = 'ajax';
|
||||
public $user;
|
||||
public /*.User.*/$role;
|
||||
public $role/*: User*/;
|
||||
public $whitelist;
|
||||
|
||||
function __construct($processor, $role, $whitelist = []) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue