Split files for PSR-4 compliance

composer.json

@@ -29,9 +29,9 @@
         "sort-packages": true
     },
     "autoload": {
-        "classmap": [
-            "./src/"
-        ]
+        "psr-4": {
+            "PHP_Parallel_Lint\\PhpParallelLint\\": "src/"
+        }
     },
     "autoload-dev": {
         "classmap": [

doc/syntax-error-callback.md

@@ -1,7 +1,7 @@
 # Syntax Error Callback
 
 1. Set a path to a file with custom error callback to `--syntax-error-callback` option.
-1. Create a class implementing `JakubOnderka\PhpParallelLint\Contracts\SyntaxErrorCallback` interface. File with the class must have the same name as the class inside.
+1. Create a class implementing `PHP_Parallel_Lint\PhpParallelLint\Contracts\SyntaxErrorCallback` interface. File with the class must have the same name as the class inside.
 1. Modify error before it is printed to the output.
 
 ## Example configuration
@@ -11,8 +11,8 @@ The content should look like:
 
 ```php
 
-use JakubOnderka\PhpParallelLint\Contracts\SyntaxErrorCallback;
-use JakubOnderka\PhpParallelLint\SyntaxError;
+use PHP_Parallel_Lint\PhpParallelLint\Contracts\SyntaxErrorCallback;
+use PHP_Parallel_Lint\PhpParallelLint\Errors\SyntaxError;
 
 class MyCustomErrorHandler implements SyntaxErrorCallback {
 	/**

parallel-lint

@@ -70,5 +70,5 @@ if (!$loaded) {
 
 require_once __DIR__ . '/src/polyfill.php';
 
-$app = new JakubOnderka\PhpParallelLint\Application();
+$app = new PHP_Parallel_Lint\PhpParallelLint\Application();
 exit($app->run());

src/Application.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace JakubOnderka\PhpParallelLint;
+namespace PHP_Parallel_Lint\PhpParallelLint;
+
+use PHP_Parallel_Lint\PhpParallelLint\Exceptions\InvalidArgumentException;
+use PHP_Parallel_Lint\PhpParallelLint\Exceptions\ParallelLintException;
 
 class Application
 {
@@ -54,7 +57,7 @@ public function run()
             $this->showOptions();
             return self::FAILED;
 
-        } catch (Exception $e) {
+        } catch (ParallelLintException $e) {
             if (isset($settings) && $settings->format === Settings::FORMAT_JSON) {
                 echo json_encode($e);
             } else {

src/Blame.php

@@ -0,0 +1,37 @@
+<?php
+namespace PHP_Parallel_Lint\PhpParallelLint;
+
+use ReturnTypeWillChange;
+
+class Blame implements \JsonSerializable
+{
+    public $name;
+
+    public $email;
+
+    /** @var \DateTime */
+    public $datetime;
+
+    public $commitHash;
+
+    public $summary;
+
+    /**
+     * (PHP 5 &gt;= 5.4.0)<br/>
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     */
+    #[ReturnTypeWillChange]
+    function jsonSerialize()
+    {
+        return array(
+            'name' => $this->name,
+            'email' => $this->email,
+            'datetime' => $this->datetime,
+            'commitHash' => $this->commitHash,
+            'summary' => $this->summary,
+        );
+    }
+}

src/Contracts/SyntaxErrorCallback.php

@@ -1,7 +1,7 @@
 <?php
-namespace JakubOnderka\PhpParallelLint\Contracts;
+namespace PHP_Parallel_Lint\PhpParallelLint\Contracts;
 
-use JakubOnderka\PhpParallelLint\SyntaxError;
+use PHP_Parallel_Lint\PhpParallelLint\Errors\SyntaxError;
 
 interface SyntaxErrorCallback
 {

src/ErrorFormatter.php

@@ -1,10 +1,12 @@
 <?php
-namespace JakubOnderka\PhpParallelLint;
+namespace PHP_Parallel_Lint\PhpParallelLint;
 
 use JakubOnderka\PhpConsoleColor\ConsoleColor as OldConsoleColor;
 use JakubOnderka\PhpConsoleHighlighter\Highlighter as OldHighlighter;
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
 use PHP_Parallel_Lint\PhpConsoleHighlighter\Highlighter;
+use PHP_Parallel_Lint\PhpParallelLint\Errors\ParallelLintError;
+use PHP_Parallel_Lint\PhpParallelLint\Errors\SyntaxError;
 
 class ErrorFormatter
 {
@@ -25,10 +27,10 @@ public function __construct($useColors = Settings::AUTODETECT, $translateTokens
     }
 
     /**
-     * @param Error $error
+     * @param ParallelLintError $error
      * @return string
      */
-    public function format(Error $error)
+    public function format(ParallelLintError $error)
     {
         if ($error instanceof SyntaxError) {
             return $this->formatSyntaxErrorMessage($error);

src/Errors/ParallelLintError.php

@@ -0,0 +1,71 @@
+<?php
+namespace PHP_Parallel_Lint\PhpParallelLint\Errors;
+
+use ReturnTypeWillChange;
+
+class ParallelLintError implements \JsonSerializable
+{
+    /** @var string */
+    protected $filePath;
+
+    /** @var string */
+    protected $message;
+
+    /**
+     * @param string $filePath
+     * @param string $message
+     */
+    public function __construct($filePath, $message)
+    {
+        $this->filePath = $filePath;
+        $this->message = rtrim($message);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFilePath()
+    {
+        return $this->filePath;
+    }
+
+    /**
+     * @return string
+     */
+    public function getShortFilePath()
+    {
+        $cwd = getcwd();
+
+        if ($cwd === '/') {
+            // For root directory in unix, do not modify path
+            return $this->filePath;
+        }
+
+        return preg_replace('/' . preg_quote($cwd, '/') . '/', '', $this->filePath, 1);
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.4.0)<br/>
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     */
+    #[ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        return array(
+            'type' => 'error',
+            'file' => $this->getFilePath(),
+            'message' => $this->getMessage(),
+        );
+    }
+}

src/Error.php → src/Errors/SyntaxError.php

@@ -1,111 +1,9 @@
 <?php
-namespace JakubOnderka\PhpParallelLint;
+namespace PHP_Parallel_Lint\PhpParallelLint\Errors;
 
-use ReturnTypeWillChange;
+use PHP_Parallel_Lint\PhpParallelLint\Blame;
 
-class Error implements \JsonSerializable
-{
-    /** @var string */
-    protected $filePath;
-
-    /** @var string */
-    protected $message;
-
-    /**
-     * @param string $filePath
-     * @param string $message
-     */
-    public function __construct($filePath, $message)
-    {
-        $this->filePath = $filePath;
-        $this->message = rtrim($message);
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFilePath()
-    {
-        return $this->filePath;
-    }
-
-    /**
-     * @return string
-     */
-    public function getShortFilePath()
-    {
-        $cwd = getcwd();
-
-        if ($cwd === '/') {
-            // For root directory in unix, do not modify path
-            return $this->filePath;
-        }
-
-        return preg_replace('/' . preg_quote($cwd, '/') . '/', '', $this->filePath, 1);
-    }
-
-    /**
-     * (PHP 5 &gt;= 5.4.0)<br/>
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     */
-    #[ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return array(
-            'type' => 'error',
-            'file' => $this->getFilePath(),
-            'message' => $this->getMessage(),
-        );
-    }
-}
-
-class Blame implements \JsonSerializable
-{
-    public $name;
-
-    public $email;
-
-    /** @var \DateTime */
-    public $datetime;
-
-    public $commitHash;
-
-    public $summary;
-
-    /**
-     * (PHP 5 &gt;= 5.4.0)<br/>
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     */
-    #[ReturnTypeWillChange]
-    function jsonSerialize()
-    {
-        return array(
-            'name' => $this->name,
-            'email' => $this->email,
-            'datetime' => $this->datetime,
-            'commitHash' => $this->commitHash,
-            'summary' => $this->summary,
-        );
-    }
-
-
-}
-
-class SyntaxError extends Error
+class SyntaxError extends ParallelLintError
 {
     /** @var Blame */
     private $blame;

src/Exceptions/CallbackNotImplementedException.php

@@ -0,0 +1,18 @@
+<?php
+namespace PHP_Parallel_Lint\PhpParallelLint\Exceptions;
+
+class CallbackNotImplementedException extends ParallelLintException
+{
+    protected $className;
+
+    public function __construct($className)
+    {
+        $this->className = $className;
+        $this->message = "Class '$className' does not implement SyntaxErrorCallback interface.";
+    }
+
+    public function getClassName()
+    {
+        return $this->className;
+    }
+}

src/Exceptions/ClassNotFoundException.php

@@ -0,0 +1,25 @@
+<?php
+namespace PHP_Parallel_Lint\PhpParallelLint\Exceptions;
+
+class ClassNotFoundException extends ParallelLintException
+{
+    protected $className;
+    protected $fileName;
+
+    public function __construct($className, $fileName)
+    {
+        $this->className = $className;
+        $this->fileName = $fileName;
+        $this->message = "Class with name '$className' does not exists in file '$fileName'";
+    }
+
+    public function getClassName()
+    {
+        return $this->className;
+    }
+
+    public function getFileName()
+    {
+        return $this->fileName;
+    }
+}

src/Exceptions/InvalidArgumentException.php

@@ -0,0 +1,18 @@
+<?php
+namespace PHP_Parallel_Lint\PhpParallelLint\Exceptions;
+
+class InvalidArgumentException extends ParallelLintException
+{
+    protected $argument;
+
+    public function __construct($argument)
+    {
+        $this->argument = $argument;
+        $this->message = "Invalid argument $argument";
+    }
+
+    public function getArgument()
+    {
+        return $this->argument;
+    }
+}