Skip to content

Commit 0776981

Browse files
markushausammannmarkushausammann
committed
fix inspections
1 parent 0420877 commit 0776981

File tree

7 files changed

+48
-53
lines changed

7 files changed

+48
-53
lines changed

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
INSTALL.txt
2-
LICENSE.txt
3-
README.txt
4-
demos/
5-
extras/documentation
6-
.DS_Store
7-

‎Module.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class Module
6464
/**
6565
* @param MvcEvent $event
6666
*/
67-
public function onBootstrap(MvcEvent $event)
67+
public function onBootstrap(MvcEvent $event): void
6868
{
6969
// Setup RavenClient (provided by Sentry) and Sentry (provided by this module)
7070
$this->config = $event->getApplication()->getServiceManager()->get('Config');
@@ -73,7 +73,7 @@ public function onBootstrap(MvcEvent $event)
7373
return;
7474
}
7575

76-
if (isset($this->config['zend-sentry']['raven-config']) && is_array($this->config['zend-sentry']['raven-config'])) {
76+
if (isset($this->config['zend-sentry']['raven-config']) && \is_array($this->config['zend-sentry']['raven-config'])) {
7777
$ravenConfig = $this->config['zend-sentry']['raven-config'];
7878
} else {
7979
$ravenConfig = [];
@@ -103,7 +103,7 @@ public function onBootstrap(MvcEvent $event)
103103

104104
// If ZendSentry is configured to log errors, register it as error handler
105105
if ($this->config['zend-sentry']['handle-errors']) {
106-
$errorReportingLevel = (isset($this->config['zend-sentry']['error-reporting'])) ? $this->config['zend-sentry']['error-reporting'] : -1;
106+
$errorReportingLevel = $this->config['zend-sentry']['error-reporting'] ?? -1;
107107
$this->zendSentry->registerErrorHandler($this->config['zend-sentry']['call-existing-error-handler'], $errorReportingLevel);
108108
}
109109

@@ -121,7 +121,7 @@ public function onBootstrap(MvcEvent $event)
121121
/**
122122
* @return array
123123
*/
124-
public function getAutoloaderConfig()
124+
public function getAutoloaderConfig(): array
125125
{
126126
return [
127127
'Zend\Loader\StandardAutoloader' => [
@@ -147,7 +147,7 @@ public function getConfig()
147147
*
148148
* @param MvcEvent $event
149149
*/
150-
protected function setupBasicLogging(MvcEvent $event)
150+
protected function setupBasicLogging(MvcEvent $event): void
151151
{
152152
// Get the shared event manager and attach a logging listener for the log event on application level
153153
$sharedManager = $this->eventManager->getSharedManager();
@@ -156,8 +156,8 @@ protected function setupBasicLogging(MvcEvent $event)
156156

157157
$sharedManager->attach('*', 'log', function($event) use ($raven, $logLevels) {
158158
/** @var $event MvcEvent */
159-
if (is_object($event->getTarget())) {
160-
$target = get_class($event->getTarget());
159+
if (\is_object($event->getTarget())) {
160+
$target = \get_class($event->getTarget());
161161
} else {
162162
$target = (string) $event->getTarget();
163163
}
@@ -178,7 +178,7 @@ protected function setupBasicLogging(MvcEvent $event)
178178
*
179179
* @param MvcEvent $event
180180
*/
181-
protected function setupExceptionLogging(MvcEvent $event)
181+
protected function setupExceptionLogging(MvcEvent $event): void
182182
{
183183
// Register Sentry as exception handler for exception that bubble up to the top
184184
$this->zendSentry->registerExceptionHandler($this->config['zend-sentry']['call-existing-exception-handler']);
@@ -191,7 +191,7 @@ protected function setupExceptionLogging(MvcEvent $event)
191191
}
192192

193193
// Check if script is running in console
194-
$exceptionStrategy = (PHP_SAPI == 'cli') ? (new SentryConsoleStrategy()) : (new SentryHttpStrategy());
194+
$exceptionStrategy = (PHP_SAPI == 'cli') ? new SentryConsoleStrategy() : new SentryHttpStrategy();
195195
$exceptionStrategy->attach($this->eventManager);
196196
$exceptionStrategy->setDisplayExceptions($this->config['zend-sentry']['display-exceptions']);
197197
$exceptionStrategy->setDefaultExceptionMessage($this->config['zend-sentry'][(PHP_SAPI == 'cli') ? 'default-exception-console-message' : 'default-exception-message']);
@@ -214,7 +214,7 @@ protected function setupExceptionLogging(MvcEvent $event)
214214
*
215215
* @param MvcEvent $event
216216
*/
217-
protected function setupJavascriptLogging(MvcEvent $event)
217+
protected function setupJavascriptLogging(MvcEvent $event): void
218218
{
219219
$viewHelper = $event->getApplication()->getServiceManager()->get('ViewHelperManager')->get('headscript');
220220
$useRavenjsCDN = $this->config['zend-sentry']['use-ravenjs-cdn'];
@@ -232,7 +232,7 @@ protected function setupJavascriptLogging(MvcEvent $event)
232232
* @param string $key
233233
* @return string $publicKey
234234
*/
235-
private function convertKeyToPublic($key)
235+
private function convertKeyToPublic($key): string
236236
{
237237
// If new DSN is configured, no converting is needed
238238
if (substr_count($key, ':') == 1) {

‎config/module.config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
2-
return array(
3-
);
2+
return [
3+
];

‎src/ZendSentry/Log/Writer/Sentry.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Sentry extends AbstractWriter
2323
/**
2424
* Translates Zend Framework log levels to Raven log levels.
2525
*/
26-
private $logLevels = array(
26+
private $logLevels = [
2727
'DEBUG' => Raven::DEBUG,
2828
'INFO' => Raven::INFO,
2929
'NOTICE' => Raven::INFO,
@@ -32,7 +32,7 @@ class Sentry extends AbstractWriter
3232
'CRIT' => Raven::FATAL,
3333
'ALERT' => Raven::FATAL,
3434
'EMERG' => Raven::FATAL,
35-
);
35+
];
3636

3737
protected $raven;
3838

@@ -56,9 +56,9 @@ public function __construct(Raven $raven, $options = null)
5656
*/
5757
protected function doWrite(array $event)
5858
{
59-
$extra = array();
59+
$extra = [];
6060
$extra['timestamp'] = $event['timestamp'];
61-
$eventID = $this->raven->captureMessage($event['message'], array(), $this->logLevels[$event['priorityName']], false, $event['extra']);
61+
$eventID = $this->raven->captureMessage($event['message'], [], $this->logLevels[$event['priorityName']], false, $event['extra']);
6262

6363
return $eventID;
6464
}

‎src/ZendSentry/Mvc/View/Console/ExceptionStrategy.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class ExceptionStrategy extends AbstractListenerAggregate
6464
*/
6565
public function attach(EventManagerInterface $events, $priority = 1)
6666
{
67-
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'prepareExceptionViewModel'));
68-
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, array($this, 'prepareExceptionViewModel'));
67+
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'prepareExceptionViewModel']);
68+
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'prepareExceptionViewModel']);
6969
}
7070

7171
/**
@@ -74,7 +74,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
7474
* @param bool $displayExceptions
7575
* @return ExceptionStrategy
7676
*/
77-
public function setDisplayExceptions($displayExceptions)
77+
public function setDisplayExceptions($displayExceptions): ExceptionStrategy
7878
{
7979
$this->displayExceptions = (bool) $displayExceptions;
8080
return $this;
@@ -85,7 +85,7 @@ public function setDisplayExceptions($displayExceptions)
8585
*
8686
* @return bool
8787
*/
88-
public function displayExceptions()
88+
public function displayExceptions(): bool
8989
{
9090
return $this->displayExceptions;
9191
}
@@ -95,7 +95,7 @@ public function displayExceptions()
9595
*
9696
* @return string
9797
*/
98-
public function getMessage()
98+
public function getMessage(): string
9999
{
100100
return $this->message;
101101
}
@@ -105,7 +105,7 @@ public function getMessage()
105105
* @param string $defaultExceptionMessage
106106
* @return self
107107
*/
108-
public function setDefaultExceptionMessage($defaultExceptionMessage)
108+
public function setDefaultExceptionMessage($defaultExceptionMessage): self
109109
{
110110
$this->defaultExceptionMessage = $defaultExceptionMessage;
111111
return $this;
@@ -131,7 +131,7 @@ public function setDefaultExceptionMessage($defaultExceptionMessage)
131131
* @param string|callable $message
132132
* @return ExceptionStrategy
133133
*/
134-
public function setMessage($message)
134+
public function setMessage($message): ExceptionStrategy
135135
{
136136
$this->message = $message;
137137
return $this;
@@ -143,7 +143,7 @@ public function setMessage($message)
143143
* @param MvcEvent $e
144144
* @return void
145145
*/
146-
public function prepareExceptionViewModel(MvcEvent $e)
146+
public function prepareExceptionViewModel(MvcEvent $e): void
147147
{
148148
// Do nothing if no error in the event
149149
$error = $e->getError();
@@ -171,31 +171,31 @@ public function prepareExceptionViewModel(MvcEvent $e)
171171
$exception = $e->getParam('exception');
172172

173173
// Log exception to sentry by triggering an exception event
174-
$e->getApplication()->getEventManager()->trigger('logException', $this, array('exception' => $exception));
174+
$e->getApplication()->getEventManager()->trigger('logException', $this, ['exception' => $exception]);
175175

176-
if (is_callable($this->message)) {
176+
if (\is_callable($this->message)) {
177177
$callback = $this->message;
178178
$message = (string) $callback($exception, $this->displayExceptions);
179179
} elseif ($this->displayExceptions && $exception instanceof \Exception) {
180180
/* @var $exception \Exception */
181181
$message = str_replace(
182-
array(
182+
[
183183
':className',
184184
':message',
185185
':code',
186186
':file',
187187
':line',
188188
':stack',
189189
':previous',
190-
), array(
191-
get_class($exception),
190+
], [
191+
\get_class($exception),
192192
$exception->getMessage(),
193193
$exception->getCode(),
194194
$exception->getFile(),
195195
$exception->getLine(),
196196
$exception->getTraceAsString(),
197197
$exception->getPrevious(),
198-
),
198+
],
199199
$this->message
200200
);
201201
} else {

‎src/ZendSentry/Mvc/View/Http/ExceptionStrategy.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class ExceptionStrategy extends AbstractListenerAggregate
5151
*/
5252
public function attach(EventManagerInterface $events, $priority = 1)
5353
{
54-
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'prepareExceptionViewModel'));
55-
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, array($this, 'prepareExceptionViewModel'));
54+
$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'prepareExceptionViewModel']);
55+
$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'prepareExceptionViewModel']);
5656
}
5757

5858
/**
@@ -61,7 +61,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
6161
* @param bool $displayExceptions
6262
* @return ExceptionStrategy
6363
*/
64-
public function setDisplayExceptions($displayExceptions)
64+
public function setDisplayExceptions($displayExceptions): ExceptionStrategy
6565
{
6666
$this->displayExceptions = (bool) $displayExceptions;
6767
return $this;
@@ -72,7 +72,7 @@ public function setDisplayExceptions($displayExceptions)
7272
*
7373
* @return bool
7474
*/
75-
public function displayExceptions()
75+
public function displayExceptions(): bool
7676
{
7777
return $this->displayExceptions;
7878
}
@@ -82,7 +82,7 @@ public function displayExceptions()
8282
* @param string $defaultExceptionMessage
8383
* @return self
8484
*/
85-
public function setDefaultExceptionMessage($defaultExceptionMessage)
85+
public function setDefaultExceptionMessage($defaultExceptionMessage): self
8686
{
8787
$this->defaultExceptionMessage = $defaultExceptionMessage;
8888
return $this;
@@ -94,7 +94,7 @@ public function setDefaultExceptionMessage($defaultExceptionMessage)
9494
* @param string $exceptionTemplate
9595
* @return ExceptionStrategy
9696
*/
97-
public function setExceptionTemplate($exceptionTemplate)
97+
public function setExceptionTemplate($exceptionTemplate): ExceptionStrategy
9898
{
9999
$this->exceptionTemplate = (string) $exceptionTemplate;
100100
return $this;
@@ -105,7 +105,7 @@ public function setExceptionTemplate($exceptionTemplate)
105105
*
106106
* @return string
107107
*/
108-
public function getExceptionTemplate()
108+
public function getExceptionTemplate(): string
109109
{
110110
return $this->exceptionTemplate;
111111
}
@@ -116,7 +116,7 @@ public function getExceptionTemplate()
116116
* @param MvcEvent $e
117117
* @return void
118118
*/
119-
public function prepareExceptionViewModel(MvcEvent $e)
119+
public function prepareExceptionViewModel(MvcEvent $e): void
120120
{
121121
// Do nothing if no error in the event
122122
$error = $e->getError();
@@ -148,13 +148,15 @@ public function prepareExceptionViewModel(MvcEvent $e)
148148
}
149149

150150
// Log exception to sentry by triggering an exception event
151-
$eventID = $e->getApplication()->getEventManager()->trigger('logException', $this, array('exception' => $e->getParam('exception')));
151+
$eventID = $e->getApplication()->getEventManager()->trigger('logException', $this, ['exception' => $e->getParam('exception')]);
152152

153-
$model = new ViewModel(array(
153+
$model = new ViewModel(
154+
[
154155
'message' => sprintf($this->defaultExceptionMessage, $eventID->last()),
155156
'exception' => $e->getParam('exception'),
156157
'display_exceptions' => $this->displayExceptions(),
157-
));
158+
]
159+
);
158160
$model->setTemplate($this->getExceptionTemplate());
159161
$e->setResult($model);
160162

‎src/ZendSentry/ZendSentry.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct(RavenClient $ravenClient, RavenErrorHandler $ravenEr
4646
*
4747
* @return ZendSentry
4848
*/
49-
public function registerErrorHandler($callExistingHandler = true, $errorReporting = E_ALL)
49+
public function registerErrorHandler($callExistingHandler = true, $errorReporting = E_ALL): ZendSentry
5050
{
5151
$this->ravenErrorHandler->registerErrorHandler($callExistingHandler, $errorReporting);
5252
return $this;
@@ -56,7 +56,7 @@ public function registerErrorHandler($callExistingHandler = true, $errorReportin
5656
* @param bool $callExistingHandler
5757
* @return ZendSentry
5858
*/
59-
public function registerExceptionHandler($callExistingHandler = true)
59+
public function registerExceptionHandler($callExistingHandler = true): ZendSentry
6060
{
6161
$this->ravenErrorHandler->registerExceptionHandler($callExistingHandler);
6262
return $this;
@@ -66,7 +66,7 @@ public function registerExceptionHandler($callExistingHandler = true)
6666
* @param int $reservedMemorySize
6767
* @return ZendSentry
6868
*/
69-
public function registerShutdownFunction($reservedMemorySize = 10)
69+
public function registerShutdownFunction($reservedMemorySize = 10): ZendSentry
7070
{
7171
$this->ravenErrorHandler->registerShutdownFunction($reservedMemorySize);
7272
return $this;
@@ -75,7 +75,7 @@ public function registerShutdownFunction($reservedMemorySize = 10)
7575
/**
7676
* @param null|RavenErrorHandler $ravenErrorHandler
7777
*/
78-
private function setOrLoadRavenErrorHandler($ravenErrorHandler)
78+
private function setOrLoadRavenErrorHandler($ravenErrorHandler): void
7979
{
8080
if ($ravenErrorHandler !== null) {
8181
$this->ravenErrorHandler = $ravenErrorHandler;

0 commit comments

Comments
 (0)