CS Fix

Author: Slamdunk

.php_cs

@@ -1,6 +1,6 @@
 <?php
 
-$config = new SlamCsFixer\Config();
+$config = new SlamCsFixer\Config(SlamCsFixer\Config::LIB);
 $config->getFinder()
     ->in(__DIR__ . '/lib')
     ->in(__DIR__ . '/tests')

composer.json

@@ -16,8 +16,8 @@
     "require-dev": {
         "phpunit/phpunit": "^6.5",
         "roave/security-advisories": "dev-master",
-        "slam/php-cs-fixer-extensions": "^1.10",
-        "slam/php-debug-r": "^1.1",
+        "slam/php-cs-fixer-extensions": "^1.12",
+        "slam/php-debug-r": "^1.2",
         "symfony/console": "^4.0"
     },
     "autoload": {

lib/ErrorHandler.php

@@ -16,14 +16,14 @@ final class ErrorHandler
     private $logErrors;
     private $logVariables = true;
     private $emailCallback;
-    private $scream = array();
+    private $scream = [];
 
-    private static $colors = array(
+    private static $colors = [
         '<error>'   => "\033[37;41m",
         '</error>'  => "\033[0m",
-    );
+    ];
 
-    private static $errors = array(
+    private static $errors = [
         \E_COMPILE_ERROR        => 'E_COMPILE_ERROR',
         \E_COMPILE_WARNING      => 'E_COMPILE_WARNING',
         \E_CORE_ERROR           => 'E_CORE_ERROR',
@@ -39,7 +39,7 @@ final class ErrorHandler
         \E_USER_NOTICE          => 'E_USER_NOTICE',
         \E_USER_WARNING         => 'E_USER_WARNING',
         \E_WARNING              => 'E_WARNING',
-    );
+    ];
 
     public function __construct(callable $emailCallback)
     {
@@ -145,8 +145,8 @@ public function getScreamSilencedErrors(): array
 
     public function register(): void
     {
-        \set_error_handler(array($this, 'errorHandler'), \error_reporting());
-        \set_exception_handler(array($this, 'exceptionHandler'));
+        \set_error_handler([$this, 'errorHandler'], \error_reporting());
+        \set_exception_handler([$this, 'exceptionHandler']);
     }
 
     public function errorHandler($errno, $errstr = '', $errfile = '', $errline = 0): void
@@ -168,13 +168,13 @@ public function exceptionHandler(\Throwable $exception): void
             $currentEx = $exception;
             do {
                 $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 3 : 120;
-                $lines = array(
+                $lines = [
                     'Message: ' . $currentEx->getMessage(),
                     '',
                     'Class: ' . \get_class($currentEx),
                     'Code: ' . $this->getExceptionCode($currentEx),
                     'File: ' . $currentEx->getFile() . ':' . $currentEx->getLine(),
-                );
+                ];
                 $lines = \array_merge($lines, \explode(\PHP_EOL, $this->purgeTrace($currentEx->getTraceAsString())));
 
                 $i = 0;
@@ -286,18 +286,18 @@ public function emailException(\Throwable $exception): void
             return;
         }
 
-        $bodyArray = array(
+        $bodyArray = [
             'Data'          => \date(\DATE_RFC850),
             'REQUEST_URI'   => $_SERVER['REQUEST_URI'] ?? '',
             'HTTP_REFERER'  => $_SERVER['HTTP_REFERER'] ?? '',
             'USER_AGENT'    => $_SERVER['HTTP_USER_AGENT'] ?? '',
             'REMOTE_ADDR'   => $_SERVER['REMOTE_ADDR'] ?? '',
-        );
+        ];
         if ($this->isCli()) {
-            $bodyArray = array(
+            $bodyArray = [
                 'Data'      => \date(\DATE_RFC850),
                 'Comando'   => \sprintf('$ php %s', \implode(' ', $_SERVER['argv'])),
-            );
+            ];
         }
 
         $bodyText = '';
@@ -307,12 +307,12 @@ public function emailException(\Throwable $exception): void
 
         $currentEx = $exception;
         do {
-            $bodyArray = array(
+            $bodyArray = [
                 'Class'     => \get_class($currentEx),
                 'Code'      => $this->getExceptionCode($currentEx),
                 'Message'   => $currentEx->getMessage(),
                 'File'      => $currentEx->getFile() . ':' . $currentEx->getLine(),
-            );
+            ];
 
             foreach ($bodyArray as $key => $val) {
                 $bodyText .= \sprintf('%-15s%s%s', $key, $val, \PHP_EOL);

tests/ErrorHandlerTest.php

@@ -23,12 +23,12 @@ protected function setUp()
         \ini_set('error_log', $this->errorLog);
 
         $this->exception = new ErrorException(\uniqid('normal_'), \E_USER_NOTICE);
-        $this->emailsSent = array();
+        $this->emailsSent = [];
         $this->errorHandler = new ErrorHandler(function ($subject, $body) {
-            $this->emailsSent[] = array(
+            $this->emailsSent[] = [
                 'subject' => $subject,
                 'body' => $body,
-            );
+            ];
         });
 
         $this->errorHandler->setAutoExit(false);
@@ -76,7 +76,7 @@ public function testDefaultConfiguration()
     public function testRegisterBuiltinHandlers()
     {
         $this->errorHandler->register();
-        $arrayPerVerificaErrori = array();
+        $arrayPerVerificaErrori = [];
 
         @ $arrayPerVerificaErrori['no_exception_thrown_on_undefined_index_now'];
 
@@ -90,9 +90,9 @@ public function testRegisterBuiltinHandlers()
      */
     public function testScream()
     {
-        $scream = array(
+        $scream = [
             \E_USER_WARNING => true,
-        );
+        ];
 
         $this->assertEmpty($this->errorHandler->getScreamSilencedErrors());
         $this->errorHandler->setScreamSilencedErrors($scream);
@@ -184,8 +184,8 @@ public function testEmailException()
         $this->errorHandler->setLogErrors(true);
 
         $key = \uniqid(__FUNCTION__);
-        $_SESSION = array($key => \uniqid());
-        $_POST = array($key => \uniqid());
+        $_SESSION = [$key => \uniqid()];
+        $_POST = [$key => \uniqid()];
 
         $this->errorHandler->emailException($this->exception);
 
@@ -208,8 +208,8 @@ public function testCanHideVariablesFromEmail()
         $this->errorHandler->setLogErrors(true);
 
         $key = \uniqid(__FUNCTION__);
-        $_SESSION = array($key => \uniqid());
-        $_POST = array($key => \uniqid());
+        $_SESSION = [$key => \uniqid()];
+        $_POST = [$key => \uniqid()];
 
         $this->errorHandler->emailException($this->exception);
 
@@ -242,7 +242,7 @@ public function testErroriNellInvioDellaMailVengonoComunqueLoggati()
     public function testUsernameInEmailSubject()
     {
         $username = \uniqid('bob_');
-        $_SESSION = array('custom_username_key' => $username);
+        $_SESSION = ['custom_username_key' => $username];
 
         $this->errorHandler->setLogErrors(true);
         $this->errorHandler->emailException($this->exception);