Skip to content

Commit e406484

Browse files
samsonasiksamsonasik
committed
tidyfy
1 parent c223a26 commit e406484

5 files changed

Lines changed: 67 additions & 67 deletions

File tree

‎src/Handler/Formatter/Json.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function format($event)
1919
}
2020

2121
$formatted = json_encode($event, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
22-
$newLine = <<<newLine
22+
$newLine = <<<newLine
2323
2424
2525
newLine;

‎src/Handler/Logging.php‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ public function __construct(
7979
Message $mailMessageService = null,
8080
TransportInterface $mailMessageTransport = null
8181
) {
82-
$this->logger = $logger;
83-
$this->serverUrl = $serverUrl;
84-
$this->request = $request;
85-
$this->requestUri = $requestUri;
82+
$this->logger = $logger;
83+
$this->serverUrl = $serverUrl;
84+
$this->request = $request;
85+
$this->requestUri = $requestUri;
8686
$this->configLoggingSettings = $errorHeroModuleLocalConfig['logging-settings'];
87-
$this->logWritersConfig = $logWritersConfig;
88-
$this->mailMessageService = $mailMessageService;
89-
$this->mailMessageTransport = $mailMessageTransport;
90-
$this->emailReceivers = $errorHeroModuleLocalConfig['email-notification-settings']['email-to-send'];
91-
$this->emailSender = $errorHeroModuleLocalConfig['email-notification-settings']['email-from'];
87+
$this->logWritersConfig = $logWritersConfig;
88+
$this->mailMessageService = $mailMessageService;
89+
$this->mailMessageTransport = $mailMessageTransport;
90+
$this->emailReceivers = $errorHeroModuleLocalConfig['email-notification-settings']['email-to-send'];
91+
$this->emailSender = $errorHeroModuleLocalConfig['email-notification-settings']['email-from'];
9292
}
9393

9494
/**
@@ -123,22 +123,21 @@ private function getRequestData()
123123
{
124124
$request_data = [];
125125
if ($this->request instanceof Request) {
126-
$query = $this->request->getQuery()->toArray();
126+
$query = $this->request->getQuery()->toArray();
127127
$request_method = $this->request->getServer('REQUEST_METHOD');
128-
$body_data = ($this->request->isPost())
128+
$body_data = ($this->request->isPost())
129129
? $this->request->getPost()->toArray()
130130
: [];
131-
132-
$raw_data = $this->request->getContent();
133-
$raw_data = str_replace("\r\n", '', $raw_data);
134-
$files_data = $this->request->getFiles()->toArray();
131+
$raw_data = $this->request->getContent();
132+
$raw_data = str_replace("\r\n", '', $raw_data);
133+
$files_data = $this->request->getFiles()->toArray();
135134

136135
$request_data = [
137-
'query' => $query,
136+
'query' => $query,
138137
'request_method' => $request_method,
139-
'body_data' => $body_data,
140-
'raw_data' => $raw_data,
141-
'files_data' => $files_data,
138+
'body_data' => $body_data,
139+
'raw_data' => $raw_data,
140+
'files_data' => $files_data,
142141
];
143142
}
144143

@@ -160,7 +159,7 @@ private function sendMail($priority, $errorMessage, $extra, $subject)
160159
$this->mailMessageService->setTo($email);
161160
$this->mailMessageService->setSubject($subject);
162161

163-
$writer = new Mail(
162+
$writer = new Mail(
164163
$this->mailMessageService,
165164
$this->mailMessageTransport
166165
);
@@ -204,11 +203,11 @@ public function handleException($e)
204203
}
205204

206205
$extra = [
207-
'url' => $this->serverUrl.$this->requestUri,
208-
'file' => $errorFile,
209-
'line' => $errorLine,
210-
'error_type' => $exceptionClass,
211-
'trace' => $trace,
206+
'url' => $this->serverUrl.$this->requestUri,
207+
'file' => $errorFile,
208+
'line' => $errorLine,
209+
'error_type' => $exceptionClass,
210+
'trace' => $trace,
212211
'request_data' => $this->getRequestData(),
213212
];
214213
$this->logger->log($priority, $errorMessage, $extra);
@@ -236,10 +235,10 @@ public function handleError(
236235
$priority = Logger::$errorPriorityMap[$errorType];
237236

238237
$extra = [
239-
'url' => $this->serverUrl.$this->requestUri,
240-
'file' => $errorFile,
241-
'line' => $errorLine,
242-
'error_type' => $errorTypeString,
238+
'url' => $this->serverUrl.$this->requestUri,
239+
'file' => $errorFile,
240+
'line' => $errorLine,
241+
'error_type' => $errorTypeString,
243242
'request_data' => $this->getRequestData(),
244243
];
245244
$this->logger->log($priority, $errorMessage, $extra);

‎src/Handler/LoggingFactory.php‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,30 @@ class LoggingFactory
1111
{
1212
public function __invoke($container)
1313
{
14-
$serverUrl = '';
15-
$request = '';
14+
$serverUrl = '';
15+
$request = '';
1616
$requestUri = '';
1717

1818
if (!Console::isConsole()) {
19-
$serverUrl = $container->get('ViewHelperManager')->get('ServerUrl')->__invoke();
20-
$request = $container->get('Request');
19+
$serverUrl = $container->get('ViewHelperManager')->get('ServerUrl')->__invoke();
20+
$request = $container->get('Request');
2121
$requestUri = $request->getRequestUri();
2222
} else {
2323
$serverUrl = php_uname('n');
2424
}
2525

26-
$config = $container->get('config');
26+
$config = $container->get('config');
2727
$errorHeroModuleLogger = $container->get('ErrorHeroModuleLogger');
2828

2929
$errorHeroModuleLocalConfig = $config['error-hero-module'];
30-
$logWritersConfig = $config['log']['ErrorHeroModuleLogger']['writers'];
30+
$logWritersConfig = $config['log']['ErrorHeroModuleLogger']['writers'];
3131

32-
$mailConfig = $errorHeroModuleLocalConfig['email-notification-settings'];
33-
$mailMessageService = null;
32+
$mailConfig = $errorHeroModuleLocalConfig['email-notification-settings'];
33+
$mailMessageService = null;
3434
$mailMessageTransport = null;
35+
3536
if ($mailConfig['enable'] === true) {
36-
$mailMessageService = $container->get($mailConfig['mail-message']);
37+
$mailMessageService = $container->get($mailConfig['mail-message']);
3738
if (!$mailMessageService instanceof Message) {
3839
throw new RuntimeException('You are enabling email log writer, your "mail-message" config must be instanceof '.Message::class);
3940
}

‎src/Handler/Writer/Db.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ class Db
3232
*/
3333
public function __construct(
3434
DbWriter $dbWriter,
35-
array $configLoggingSettings,
36-
array $logWritersConfig
35+
array $configLoggingSettings,
36+
array $logWritersConfig
3737
) {
38-
$this->dbWriter = $dbWriter;
38+
$this->dbWriter = $dbWriter;
3939
$this->configLoggingSettings = $configLoggingSettings;
40-
$this->logWritersConfig = $logWritersConfig;
40+
$this->logWritersConfig = $logWritersConfig;
4141
}
4242

4343
/**
@@ -64,18 +64,18 @@ public function isExists($errorFile, $errorLine, $errorMessage, $errorUrl)
6464

6565
// columns definition
6666
$timestamp = $writerConfig['options']['column']['timestamp'];
67-
$message = $writerConfig['options']['column']['message'];
68-
$file = $writerConfig['options']['column']['extra']['file'];
69-
$line = $writerConfig['options']['column']['extra']['line'];
70-
$url = $writerConfig['options']['column']['extra']['url'];
67+
$message = $writerConfig['options']['column']['message'];
68+
$file = $writerConfig['options']['column']['extra']['file'];
69+
$line = $writerConfig['options']['column']['extra']['line'];
70+
$url = $writerConfig['options']['column']['extra']['url'];
7171

7272
$tableGateway = new TableGateway($table, $db, null, new ResultSet());
73-
$select = $tableGateway->getSql()->select();
73+
$select = $tableGateway->getSql()->select();
7474
$select->where([
7575
$message => $errorMessage,
76-
$line => $errorLine,
77-
$url => $errorUrl,
78-
$file => $errorFile,
76+
$line => $errorLine,
77+
$url => $errorUrl,
78+
$file => $errorFile,
7979
]);
8080
$select->order($timestamp.' DESC');
8181
$select->limit(1);

‎src/Listener/Mvc.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ class Mvc extends AbstractListenerAggregate
3333
private $renderer;
3434

3535
private $errorType = [
36-
E_ERROR => 'E_ERROR',
37-
E_WARNING => 'E_WARNING',
38-
E_PARSE => 'E_PARSE',
39-
E_NOTICE => 'E_NOTICE',
40-
E_CORE_ERROR => 'E_CORE_ERROR',
41-
E_CORE_WARNING => 'E_CORE_WARNING',
42-
E_COMPILE_ERROR => 'E_COMPILE_ERROR',
43-
E_COMPILE_WARNING => 'E_COMPILE_WARNING',
44-
E_USER_ERROR => 'E_USER_ERROR',
45-
E_USER_WARNING => 'E_USER_WARNING',
46-
E_USER_NOTICE => 'E_USER_NOTICE',
47-
E_STRICT => 'E_STRICT',
36+
E_ERROR => 'E_ERROR',
37+
E_WARNING => 'E_WARNING',
38+
E_PARSE => 'E_PARSE',
39+
E_NOTICE => 'E_NOTICE',
40+
E_CORE_ERROR => 'E_CORE_ERROR',
41+
E_CORE_WARNING => 'E_CORE_WARNING',
42+
E_COMPILE_ERROR => 'E_COMPILE_ERROR',
43+
E_COMPILE_WARNING => 'E_COMPILE_WARNING',
44+
E_USER_ERROR => 'E_USER_ERROR',
45+
E_USER_WARNING => 'E_USER_WARNING',
46+
E_USER_NOTICE => 'E_USER_NOTICE',
47+
E_STRICT => 'E_STRICT',
4848
E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
49-
E_DEPRECATED => 'E_DEPRECATED',
50-
E_USER_DEPRECATED => 'E_USER_DEPRECATED',
49+
E_DEPRECATED => 'E_DEPRECATED',
50+
E_USER_DEPRECATED => 'E_USER_DEPRECATED',
5151
];
5252

5353
/**
@@ -61,8 +61,8 @@ public function __construct(
6161
PhpRenderer $renderer
6262
) {
6363
$this->errorHeroModuleConfig = $errorHeroModuleConfig;
64-
$this->logging = $logging;
65-
$this->renderer = $renderer;
64+
$this->logging = $logging;
65+
$this->renderer = $renderer;
6666
}
6767

6868
/**

0 commit comments

Comments
 (0)