Apply wdes/coding-standard

code-lts · Mar 24, 2021 · 08d91ae · 08d91ae
1 parent 94f2ffe
commit 08d91ae
Show file tree

Hide file tree

Showing 43 changed files with 345 additions and 181 deletions.
diff --git a/src/AnalysisResult.php b/src/AnalysisResult.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,12 +25,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools;
 
-use CodeLts\CliTools\Error;
-
 class AnalysisResult
 {
 
@@ -71,10 +70,10 @@ static function (Error $a, Error $b): int {
             }
         );
 
-        $this->fileSpecificErrors = $fileSpecificErrors;
+        $this->fileSpecificErrors    = $fileSpecificErrors;
         $this->notFileSpecificErrors = $notFileSpecificErrors;
-        $this->internalErrors = $internalErrors;
-        $this->warnings = $warnings;
+        $this->internalErrors        = $internalErrors;
+        $this->warnings              = $warnings;
     }
 
     public function hasErrors(): bool
@@ -128,4 +127,5 @@ public function hasInternalErrors(): bool
     {
         return count($this->internalErrors) > 0;
     }
+
 }
diff --git a/src/AnsiEscapeSequences.php b/src/AnsiEscapeSequences.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace CodeLts\CliTools;
 

diff --git a/src/Error.php b/src/Error.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace CodeLts\CliTools;
 
@@ -18,14 +18,13 @@ class Error
     protected $tip = null;
 
     public const LEVEL_EMERGENCY = 0;
-    public const LEVEL_ALERT = 1;
-    public const LEVEL_CRITICAL = 2;
-    public const LEVEL_ERROR = 3;
-    public const LEVEL_WARNING = 4;
-    public const LEVEL_NOTICE = 5;
-    public const LEVEL_INFO = 6;
-    public const LEVEL_DEBUG = 7;
-
+    public const LEVEL_ALERT     = 1;
+    public const LEVEL_CRITICAL  = 2;
+    public const LEVEL_ERROR     = 3;
+    public const LEVEL_WARNING   = 4;
+    public const LEVEL_NOTICE    = 5;
+    public const LEVEL_INFO      = 6;
+    public const LEVEL_DEBUG     = 7;
 
     public function __construct(
         string $message,
@@ -34,11 +33,11 @@ public function __construct(
         int $severity = Error::LEVEL_ERROR,
         ?string $tip = null
     ) {
-        $this->message = $message;
-        $this->file = $file;
-        $this->line = $line;
+        $this->message  = $message;
+        $this->file     = $file;
+        $this->line     = $line;
         $this->severity = $severity;
-        $this->tip = $tip;
+        $this->tip      = $tip;
     }
 
     public function getMessage(): string
@@ -65,4 +64,5 @@ public function getTip(): ?string
     {
         return $this->tip;
     }
+
 }
diff --git a/src/ErrorFormatter/CheckstyleErrorFormatter.php b/src/ErrorFormatter/CheckstyleErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -54,18 +55,22 @@ public function formatErrors(
         $output->writeLineFormatted('');
 
         foreach ($this->groupByFile($analysisResult) as $relativeFilePath => $errors) {
-            $output->writeRaw(sprintf(
-                '<file name="%s">',
-                $this->escape($relativeFilePath)
-            ));
+            $output->writeRaw(
+                sprintf(
+                    '<file name="%s">',
+                    $this->escape($relativeFilePath)
+                )
+            );
             $output->writeLineFormatted('');
 
             foreach ($errors as $error) {
-                $output->writeRaw(sprintf(
-                    '  <error line="%d" column="1" severity="error" message="%s" />',
-                    $this->escape((string) $error->getLine()),
-                    $this->escape((string) $error->getMessage())
-                ));
+                $output->writeRaw(
+                    sprintf(
+                        '  <error line="%d" column="1" severity="error" message="%s" />',
+                        $this->escape((string) $error->getLine()),
+                        $this->escape((string) $error->getMessage())
+                    )
+                );
                 $output->writeLineFormatted('');
             }
             $output->writeRaw('</file>');
@@ -143,4 +148,5 @@ private function groupByFile(AnalysisResult $analysisResult): array
 
         return $files;
     }
+
 }
diff --git a/src/ErrorFormatter/ErrorFormatter.php b/src/ErrorFormatter/ErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -44,4 +45,5 @@ public function formatErrors(
         AnalysisResult $analysisResult,
         Output $output
     ): int;
+
 }
diff --git a/src/ErrorFormatter/GithubErrorFormatter.php b/src/ErrorFormatter/GithubErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -52,7 +53,7 @@ public function __construct(
         RelativePathHelper $relativePathHelper,
         TableErrorFormatter $tableErrorformatter
     ) {
-        $this->relativePathHelper = $relativePathHelper;
+        $this->relativePathHelper  = $relativePathHelper;
         $this->tableErrorformatter = $tableErrorformatter;
     }
 
@@ -66,9 +67,12 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
                 'line' => $fileSpecificError->getLine(),
                 'col' => 0,
             ];
-            array_walk($metas, static function (&$value, string $key): void {
-                $value = sprintf('%s=%s', $key, (string) $value);
-            });
+            array_walk(
+                $metas,
+                static function (&$value, string $key): void {
+                    $value = sprintf('%s=%s', $key, (string) $value);
+                }
+            );
 
             $message = $fileSpecificError->getMessage();
             // newlines need to be encoded
@@ -105,4 +109,5 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
 
         return $analysisResult->hasErrors() ? 1 : 0;
     }
+
 }
diff --git a/src/ErrorFormatter/GitlabErrorFormatter.php b/src/ErrorFormatter/GitlabErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -102,4 +103,5 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
 
         return $analysisResult->hasErrors() ? 1 : 0;
     }
+
 }
diff --git a/src/ErrorFormatter/JsonErrorFormatter.php b/src/ErrorFormatter/JsonErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -84,4 +85,5 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
 
         return $analysisResult->hasErrors() ? 1 : 0;
     }
+
 }
diff --git a/src/ErrorFormatter/JunitErrorFormatter.php b/src/ErrorFormatter/JunitErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -50,7 +51,7 @@ public function formatErrors(
         AnalysisResult $analysisResult,
         Output $output
     ): int {
-        $result = '<?xml version="1.0" encoding="UTF-8"?>';
+        $result  = '<?xml version="1.0" encoding="UTF-8"?>';
         $result .= sprintf(
             '<testsuite failures="%d" name="cli-tools" tests="%d" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/junit-team/junit5/r5.5.1/platform-tests/src/test/resources/jenkins-junit.xsd">',
             $analysisResult->getTotalErrorsCount(),
@@ -64,7 +65,7 @@ public function formatErrors(
             }
 
             $fileName = $this->relativePathHelper->getRelativePath($file);
-            $result .= $this->createTestCase(
+            $result  .= $this->createTestCase(
                 sprintf('%s:%s', $fileName, (string) $fileSpecificError->getLine()),
                 'ERROR',
                 $this->escape($fileSpecificError->getMessage())
@@ -121,4 +122,5 @@ protected function escape(string $string): string
     {
         return htmlspecialchars($string, ENT_XML1 | ENT_COMPAT, 'UTF-8');
     }
+
 }
diff --git a/src/ErrorFormatter/RawErrorFormatter.php b/src/ErrorFormatter/RawErrorFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * (c) Copyright (c) 2016-2020 Ondřej Mirtes <ondrej@mirtes.cz>
  *
@@ -23,7 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare(strict_types=1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -61,4 +62,5 @@ public function formatErrors(
 
         return $analysisResult->hasErrors() ? 1 : 0;
     }
+
 }
diff --git a/src/ErrorFormatter/RawTextErrorFormatter.php b/src/ErrorFormatter/RawTextErrorFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace CodeLts\CliTools\ErrorFormatter;
 
@@ -34,4 +34,5 @@ public function formatErrors(
 
         return $analysisResult->hasErrors() ? 1 : 0;
     }
+
 }