Added PHP-CS-Fixer to build

Author: Slamdunk

.gitattributes

@@ -1,5 +1,6 @@
 /tests export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
+.php_cs export-ignore
 .travis.yml export-ignore
 phpunit.xml export-ignore

.gitignore

@@ -1,2 +1,2 @@
 /vendor
-composer.lock
+.php_cs.cache

.travis.yml

@@ -2,16 +2,20 @@ language: php
 
 sudo: false
 
+cache:
+  directory:
+    - $HOME/.composer/cache
+
 php:
   - 7.0
   - 7.1
 
 install:
-  - composer self-update
   - composer install --prefer-dist
 
 script:
   - phpunit --coverage-text
+  - vendor/bin/php-cs-fixer --diff --dry-run --verbose fix
 
 notifications:
   email: false

composer.json

@@ -20,10 +20,11 @@
             "SlamTest\\ErrorHandler\\": "tests/"
         }
     },
-    "require" : {
-        "php" : "^7.0"
+    "require": {
+        "php": "^7.0"
     },
     "require-dev": {
+        "slam/php-cs-fixer-extensions": "^1.0",
         "slam/php-debug-r": "^1.0.2"
     }
 }

lib/ErrorHandler.php

@@ -50,7 +50,7 @@ public function setAutoExit(bool $autoExit)
         $this->autoExit = $autoExit;
     }
 
-    public function autoExit() : bool
+    public function autoExit(): bool
     {
         return $this->autoExit;
     }
@@ -60,7 +60,7 @@ public function setCli(bool $cli)
         $this->cli = $cli;
     }
 
-    public function isCli() : bool
+    public function isCli(): bool
     {
         if ($this->cli === null) {
             $this->setCli(PHP_SAPI === 'cli');
@@ -115,7 +115,7 @@ public function setLogErrors(bool $logErrors)
         $this->logErrors = $logErrors;
     }
 
-    public function logErrors() : bool
+    public function logErrors(): bool
     {
         if ($this->logErrors === null) {
             $this->setLogErrors(
@@ -132,7 +132,7 @@ public function setLogVariables(bool $logVariables)
         $this->logVariables = $logVariables;
     }
 
-    public function logVariables() : bool
+    public function logVariables(): bool
     {
         return $this->logVariables;
     }
@@ -176,9 +176,9 @@ public function exceptionHandler(\Throwable $exception)
                     $line = $lines[$i];
 
                     if (isset($line[$width])) {
-                        $lines[$i] = substr($line, 0, $width);
+                        $lines[$i] = mb_substr($line, 0, $width);
                         if (isset($line[0]) and $line[0] !== '#') {
-                            array_splice($lines, $i + 1, 0, '   ' . substr($line, $width));
+                            array_splice($lines, $i + 1, 0, '   ' . mb_substr($line, $width));
                         }
                     }
 
@@ -188,7 +188,7 @@ public function exceptionHandler(\Throwable $exception)
                 $this->outputError(PHP_EOL);
                 $this->outputError(sprintf('<error> %s </error>', str_repeat(' ', $width)));
                 foreach ($lines as $line) {
-                    $this->outputError(sprintf('<error> %s%s </error>', $line, str_repeat(' ', max(0, $width - strlen($line)))));
+                    $this->outputError(sprintf('<error> %s%s </error>', $line, str_repeat(' ', max(0, $width - mb_strlen($line)))));
                 }
                 $this->outputError(sprintf('<error> %s </error>', str_repeat(' ', $width)));
                 $this->outputError(PHP_EOL);
@@ -356,7 +356,7 @@ private function getExceptionCode(\Throwable $exception)
         return $code;
     }
 
-    private function purgeTrace(string $trace) : string
+    private function purgeTrace(string $trace): string
     {
         return defined('ROOT_PATH') ? str_replace(ROOT_PATH, '.', $trace) : $trace;
     }

tests/ErrorHandlerTest.php

@@ -5,8 +5,8 @@
 namespace SlamTest\ErrorHandler;
 
 use ErrorException;
-use Slam\ErrorHandler\ErrorHandler;
 use PHPUnit\Framework\TestCase;
+use Slam\ErrorHandler\ErrorHandler;
 
 final class ErrorHandlerTest extends TestCase
 {
@@ -42,7 +42,8 @@ protected function tearDown()
 
     public function testDefaultConfiguration()
     {
-        $errorHandler = new ErrorHandler(function(){});
+        $errorHandler = new ErrorHandler(function () {
+        });
 
         $this->assertTrue($errorHandler->isCli());
         $this->assertTrue($errorHandler->autoExit());
@@ -198,7 +199,7 @@ public function testCanHideVariablesFromEmail()
     public function testErroriNellInvioDellaMailVengonoComunqueLoggati()
     {
         $mailError = uniqid('mail_not_sent_');
-        $mailCallback = function ($body, $text) use ($mailError){
+        $mailCallback = function ($body, $text) use ($mailError) {
             throw new ErrorException($mailError, E_USER_ERROR);
         };
         $errorHandler = new ErrorHandler($mailCallback);