From 50de92e39914169773f0f958e8c3691b257994d3 Mon Sep 17 00:00:00 2001
From: flynsarmy <flynsarmy@gmail.com>
Date: Wed, 9 Mar 2022 21:11:51 +1000
Subject: [PATCH] Make compatible with PSR-12 formatting standard

---
 .phpcs.xml                                    | 22 +++++++++
 composer.json                                 | 11 ++++-
 src/ImageOptimizer/ChainOptimizer.php         | 16 +++++--
 src/ImageOptimizer/ChangedOutputOptimizer.php |  7 ++-
 src/ImageOptimizer/Command.php                | 35 +++++++++-----
 src/ImageOptimizer/CommandOptimizer.php       |  6 +--
 .../Exception/CommandNotFound.php             |  3 +-
 src/ImageOptimizer/Exception/Exception.php    |  3 +-
 src/ImageOptimizer/Optimizer.php              |  4 +-
 src/ImageOptimizer/OptimizerFactory.php       | 38 ++++++++++-----
 src/ImageOptimizer/SmartOptimizer.php         |  5 +-
 src/ImageOptimizer/SuppressErrorOptimizer.php |  9 ++--
 .../TypeGuesser/ExtensionTypeGuesser.php      |  7 ++-
 .../TypeGuesser/GdTypeGuesser.php             |  8 ++--
 .../TypeGuesser/SmartTypeGuesser.php          |  8 ++--
 .../TypeGuesser/TypeGuesser.php               | 13 +++---
 src/ImageOptimizer/WrapperOptimizer.php       |  6 ++-
 .../Assertion/ImageAssertion.php              |  7 +--
 tests/ImageOptimizer/CommandTest.php          |  3 +-
 tests/ImageOptimizer/ImageSimilarityJudge.php | 20 ++++----
 .../ImageSimilarityJudgeTest.php              |  5 +-
 tests/ImageOptimizer/OptimizersTest.php       | 46 +++++++++++--------
 tests/ImageOptimizer/SmartOptimizerTest.php   | 14 +++---
 .../TypeGuesser/AbstractTypeGuesserTest.php   | 10 ++--
 .../TypeGuesser/ExtensionTypeGuesserTest.php  |  5 +-
 .../TypeGuesser/GdTypeGuesserTest.php         |  3 +-
 .../TypeGuesser/SmartTypeGuesserTest.php      |  5 +-
 tests/bootstrap.php                           |  4 +-
 28 files changed, 203 insertions(+), 120 deletions(-)
 create mode 100755 .phpcs.xml

diff --git a/.phpcs.xml b/.phpcs.xml
new file mode 100755
index 0000000..86bc432
--- /dev/null
+++ b/.phpcs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset name="PSR12 Coding Standards">
+    <description>A custom set of code standard rules</description>
+
+    <rule ref="PSR12"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+
+    <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
+
+    <exclude-pattern>*\.(?!php$)</exclude-pattern>
+    <exclude-pattern>vendor/*</exclude-pattern>
+</ruleset>
diff --git a/composer.json b/composer.json
index 1e9e104..77e0abc 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,15 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "ext-gd": "*"
+        "ext-gd": "*",
+        "squizlabs/php_codesniffer": "^3.6"
+    },
+    "scripts": {
+        "phpcs":  "vendor/bin/phpcs  -s --standard=./.phpcs.xml ./",
+        "phpcbf": "vendor/bin/phpcbf --standard=./.phpcs.xml ./",
+        "test": [
+            "composer validate --strict",
+            "@phpcs"
+        ]
     }
 }
diff --git a/src/ImageOptimizer/ChainOptimizer.php b/src/ImageOptimizer/ChainOptimizer.php
index 0850bf3..78a1d4f 100644
--- a/src/ImageOptimizer/ChainOptimizer.php
+++ b/src/ImageOptimizer/ChainOptimizer.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
@@ -25,19 +26,24 @@ public function __construct(array $optimizers, bool $executeFirst, LoggerInterfa
     public function optimize(string $filepath): void
     {
         $exceptions = [];
-        foreach($this->optimizers as $optimizer) {
+        foreach ($this->optimizers as $optimizer) {
             try {
                 $optimizer->optimize($filepath);
 
-                if($this->executeFirst) break;
+                if ($this->executeFirst) {
+                    break;
+                }
             } catch (Exception $e) {
-                $this->logger->error('Error during image optimization. See exception for more details.', [ 'exception' => $e ]);
+                $this->logger->error(
+                    'Error during image optimization. See exception for more details.',
+                    ['exception' => $e]
+                );
                 $exceptions[] = $e;
             }
         }
 
-        if(count($exceptions) === count($this->optimizers)) {
+        if (count($exceptions) === count($this->optimizers)) {
             throw new Exception(sprintf('All optimizers failed to optimize the file: %s', $filepath));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/ChangedOutputOptimizer.php b/src/ImageOptimizer/ChangedOutputOptimizer.php
index 993febf..38d157b 100644
--- a/src/ImageOptimizer/ChangedOutputOptimizer.php
+++ b/src/ImageOptimizer/ChangedOutputOptimizer.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
@@ -19,7 +20,11 @@ public function optimize(string $filepath): void
         $fileInfo = pathinfo($filepath);
         $outputFilepath = str_replace(
             ['%basename%', '%filename%', '%ext%'],
-            [$fileInfo['dirname'], $fileInfo['filename'], isset($fileInfo['extension']) ? '.'.$fileInfo['extension'] : ''],
+            [
+                $fileInfo['dirname'],
+                $fileInfo['filename'],
+                isset($fileInfo['extension']) ? '.' . $fileInfo['extension'] : ''
+            ],
             $this->outputPattern
         );
 
diff --git a/src/ImageOptimizer/Command.php b/src/ImageOptimizer/Command.php
index ff01648..f03f3bb 100644
--- a/src/ImageOptimizer/Command.php
+++ b/src/ImageOptimizer/Command.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-use function function_exists;
 use ImageOptimizer\Exception\CommandNotFound;
 use ImageOptimizer\Exception\Exception;
 use Symfony\Component\Process\Exception\RuntimeException;
@@ -17,12 +17,18 @@ final class Command
 
     public function __construct(string $bin, array $args = [], ?float $timeout = null)
     {
-        if(!function_exists('exec')) {
-            throw new Exception('"exec" function is not available. Please check if it is not listed as "disable_functions" in your "php.ini" file.');
+        if (!function_exists('exec')) {
+            throw new Exception(
+                '"exec" function is not available. ' .
+                'Please check if it is not listed as "disable_functions" in your "php.ini" file.'
+            );
         }
 
-        if(!function_exists('proc_open')) {
-            throw new RuntimeException('"proc_open" function is not available. Please check if it is not listed as "disable_functions" in your "php.ini" file.');
+        if (!function_exists('proc_open')) {
+            throw new RuntimeException(
+                '"proc_open" function is not available. ' .
+                'Please check if it is not listed as "disable_functions" in your "php.ini" file.'
+            );
         }
 
         $this->cmd = $bin;
@@ -38,17 +44,24 @@ public function execute(array $customArgs = []): void
         try {
             $exitCode = $process->run();
             $commandLine = $process->getCommandLine();
-            $output = $process->getOutput().PHP_EOL.$process->getErrorOutput();
+            $output = $process->getOutput() . PHP_EOL . $process->getErrorOutput();
 
-            if($exitCode == 127) {
+            if ($exitCode == 127) {
                 throw new CommandNotFound(sprintf('Command "%s" not found.', $this->cmd));
             }
 
-            if($exitCode !== 0 || stripos($output, 'error') !== false || stripos($output, 'permission') !== false) {
-                throw new Exception(sprintf('Command failed, return code: %d, command: %s, stderr: %s', $exitCode, $commandLine, trim($output)));
+            if ($exitCode !== 0 || stripos($output, 'error') !== false || stripos($output, 'permission') !== false) {
+                throw new Exception(
+                    sprintf(
+                        'Command failed, return code: %d, command: %s, stderr: %s',
+                        $exitCode,
+                        $commandLine,
+                        trim($output)
+                    )
+                );
             }
-        } catch(RuntimeException $e) {
+        } catch (RuntimeException $e) {
             throw new Exception($e->getMessage(), $e->getCode(), $e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/CommandOptimizer.php b/src/ImageOptimizer/CommandOptimizer.php
index 021b15a..4a22f7c 100644
--- a/src/ImageOptimizer/CommandOptimizer.php
+++ b/src/ImageOptimizer/CommandOptimizer.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-
 class CommandOptimizer implements Optimizer
 {
     private $command;
@@ -19,7 +19,7 @@ public function optimize(string $filepath): void
     {
         $customArgs = [$filepath];
 
-        if($this->extraArgs) {
+        if ($this->extraArgs) {
             $customArgs = array_merge(
                 is_callable($this->extraArgs) ? call_user_func($this->extraArgs, $filepath) : $this->extraArgs,
                 $customArgs
@@ -28,4 +28,4 @@ public function optimize(string $filepath): void
 
         $this->command->execute($customArgs);
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/Exception/CommandNotFound.php b/src/ImageOptimizer/Exception/CommandNotFound.php
index 7bb1056..c402618 100644
--- a/src/ImageOptimizer/Exception/CommandNotFound.php
+++ b/src/ImageOptimizer/Exception/CommandNotFound.php
@@ -1,8 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\Exception;
 
 class CommandNotFound extends Exception
 {
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/Exception/Exception.php b/src/ImageOptimizer/Exception/Exception.php
index af73ab6..770e695 100644
--- a/src/ImageOptimizer/Exception/Exception.php
+++ b/src/ImageOptimizer/Exception/Exception.php
@@ -1,8 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\Exception;
 
 class Exception extends \RuntimeException
 {
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/Optimizer.php b/src/ImageOptimizer/Optimizer.php
index 89ba2c1..92827bc 100644
--- a/src/ImageOptimizer/Optimizer.php
+++ b/src/ImageOptimizer/Optimizer.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-
 use ImageOptimizer\Exception\Exception;
 
 interface Optimizer
@@ -14,4 +14,4 @@ interface Optimizer
      * @throws Exception
      */
     public function optimize(string $filepath): void;
-} 
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/OptimizerFactory.php b/src/ImageOptimizer/OptimizerFactory.php
index ee98fda..e3288b7 100644
--- a/src/ImageOptimizer/OptimizerFactory.php
+++ b/src/ImageOptimizer/OptimizerFactory.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-
 use ImageOptimizer\Exception\Exception;
 use ImageOptimizer\TypeGuesser\TypeGuesser;
 use Psr\Log\LoggerInterface;
@@ -13,7 +13,7 @@
 
 class OptimizerFactory
 {
-    const OPTIMIZER_SMART = 'smart';
+    public const OPTIMIZER_SMART = 'smart';
 
     private $optimizers = [];
     private $options;
@@ -78,10 +78,12 @@ protected function setUpOptimizers(): void
             $this->commandOptimizer('optipng', $this->options['optipng_options'])
         );
         $this->optimizers['pngquant'] = $this->wrap(
-            $this->commandOptimizer('pngquant', $this->options['pngquant_options'],
-                function($filepath){
+            $this->commandOptimizer(
+                'pngquant',
+                $this->options['pngquant_options'],
+                function ($filepath) {
                     $ext = pathinfo($filepath, PATHINFO_EXTENSION);
-                    return ['--ext='.($ext ? '.'.$ext : ''), '--'];
+                    return ['--ext=' . ($ext ? '.' . $ext : ''), '--'];
                 }
             )
         );
@@ -109,7 +111,9 @@ function($filepath){
             $this->commandOptimizer('jpegoptim', $this->options['jpegoptim_options'])
         );
         $this->optimizers['jpegtran'] = $this->wrap(
-            $this->commandOptimizer('jpegtran', $this->options['jpegtran_options'],
+            $this->commandOptimizer(
+                'jpegtran',
+                $this->options['jpegtran_options'],
                 function ($filepath) {
                     return ['-outfile', $filepath];
                 }
@@ -121,14 +125,16 @@ function ($filepath) {
         ], $this->options['execute_only_first_jpeg_optimizer'], $this->logger));
 
         $this->optimizers['svg'] = $this->optimizers['svgo'] = $this->wrap(
-            $this->commandOptimizer('svgo', $this->options['svgo_options'],
+            $this->commandOptimizer(
+                'svgo',
+                $this->options['svgo_options'],
                 function ($filepath) {
                     return ['--input' => $filepath, '--output' => $filepath];
                 }
             )
         );
 
-        foreach($this->options['custom_optimizers'] as $key => $options) {
+        foreach ($this->options['custom_optimizers'] as $key => $options) {
             $this->optimizers[$key] = $this->wrap(
                 $this->commandOptimizer($options['command'], isset($options['args']) ? $options['args'] : [])
             );
@@ -152,8 +158,16 @@ private function commandOptimizer(string $command, array $args, $extraArgs = nul
 
     private function wrap(Optimizer $optimizer): Optimizer
     {
-        $optimizer = $optimizer instanceof ChangedOutputOptimizer ? $optimizer : new ChangedOutputOptimizer($this->option('output_filepath_pattern'), $optimizer);
-        return $this->option('ignore_errors', true) ? new SuppressErrorOptimizer($optimizer, $this->logger) : $optimizer;
+        $optimizer = $optimizer instanceof ChangedOutputOptimizer ?
+            $optimizer :
+            new ChangedOutputOptimizer(
+                $this->option('output_filepath_pattern'),
+                $optimizer
+            );
+
+        return $this->option('ignore_errors', true) ?
+            new SuppressErrorOptimizer($optimizer, $this->logger) :
+            $optimizer;
     }
 
     private function unwrap(Optimizer $optimizer): Optimizer
@@ -164,7 +178,7 @@ private function unwrap(Optimizer $optimizer): Optimizer
     private function executable(string $name): string
     {
         $executableFinder = $this->executableFinder;
-        return $this->option($name.'_bin', function() use($name, $executableFinder){
+        return $this->option($name . '_bin', function () use ($name, $executableFinder) {
             return $executableFinder->find($name, $name);
         });
     }
@@ -181,7 +195,7 @@ private function option(string $name, $default = null)
      */
     public function get(string $name = self::OPTIMIZER_SMART): Optimizer
     {
-        if(!isset($this->optimizers[$name])) {
+        if (!isset($this->optimizers[$name])) {
             throw new Exception(sprintf('Optimizer "%s" not found', $name));
         }
 
diff --git a/src/ImageOptimizer/SmartOptimizer.php b/src/ImageOptimizer/SmartOptimizer.php
index 728434f..cd3f179 100644
--- a/src/ImageOptimizer/SmartOptimizer.php
+++ b/src/ImageOptimizer/SmartOptimizer.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
@@ -25,10 +26,10 @@ public function optimize(string $filepath): void
     {
         $type = $this->typeGuesser->guess($filepath);
 
-        if(!isset($this->optimizers[$type])) {
+        if (!isset($this->optimizers[$type])) {
             throw new Exception(sprintf('Optimizer for type "%s" not found.', $type));
         }
 
         $this->optimizers[$type]->optimize($filepath);
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/SuppressErrorOptimizer.php b/src/ImageOptimizer/SuppressErrorOptimizer.php
index 7b189af..881bbcd 100644
--- a/src/ImageOptimizer/SuppressErrorOptimizer.php
+++ b/src/ImageOptimizer/SuppressErrorOptimizer.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-
 use ImageOptimizer\Exception\Exception;
 use Psr\Log\LoggerInterface;
 
@@ -23,7 +23,10 @@ public function optimize(string $filepath): void
         try {
             $this->optimizer->optimize($filepath);
         } catch (Exception $e) {
-            $this->logger->error('Error during image optimization. See exception for more details.', [ 'exception' => $e ]);
+            $this->logger->error(
+                'Error during image optimization. See exception for more details.',
+                ['exception' => $e]
+            );
         }
     }
 
@@ -31,4 +34,4 @@ public function unwrap(): Optimizer
     {
         return $this->optimizer instanceof WrapperOptimizer ? $this->optimizer->unwrap() : $this->optimizer;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/TypeGuesser/ExtensionTypeGuesser.php b/src/ImageOptimizer/TypeGuesser/ExtensionTypeGuesser.php
index 8767718..75a5fdb 100644
--- a/src/ImageOptimizer/TypeGuesser/ExtensionTypeGuesser.php
+++ b/src/ImageOptimizer/TypeGuesser/ExtensionTypeGuesser.php
@@ -1,12 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 class ExtensionTypeGuesser implements TypeGuesser
 {
-
     /**
      * @param string $filepath
      * @return string Image file type, value of one of the TYPE_* const
@@ -15,7 +14,7 @@ public function guess(string $filepath): string
     {
         $ext = strtolower(pathinfo($filepath, PATHINFO_EXTENSION));
 
-        switch($ext) {
+        switch ($ext) {
             case 'png':
                 return self::TYPE_PNG;
             case 'gif':
@@ -29,4 +28,4 @@ public function guess(string $filepath): string
                 return self::TYPE_UNKNOWN;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/TypeGuesser/GdTypeGuesser.php b/src/ImageOptimizer/TypeGuesser/GdTypeGuesser.php
index 2b8661e..9c93243 100644
--- a/src/ImageOptimizer/TypeGuesser/GdTypeGuesser.php
+++ b/src/ImageOptimizer/TypeGuesser/GdTypeGuesser.php
@@ -1,14 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 class GdTypeGuesser implements TypeGuesser
 {
     public function __construct()
     {
-        if(!function_exists('gd_info')) {
+        if (!function_exists('gd_info')) {
             throw new \RuntimeException(sprintf('%s class require gd extension to be enabled', __CLASS__));
         }
     }
@@ -17,7 +17,7 @@ public function guess(string $filepath): string
     {
         list(,,$type) = getimagesize($filepath);
 
-        switch($type) {
+        switch ($type) {
             case \IMAGETYPE_PNG:
                 return self::TYPE_PNG;
             case \IMAGETYPE_GIF:
@@ -29,4 +29,4 @@ public function guess(string $filepath): string
                 return self::TYPE_UNKNOWN;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/TypeGuesser/SmartTypeGuesser.php b/src/ImageOptimizer/TypeGuesser/SmartTypeGuesser.php
index a258cb1..d5ddd1c 100644
--- a/src/ImageOptimizer/TypeGuesser/SmartTypeGuesser.php
+++ b/src/ImageOptimizer/TypeGuesser/SmartTypeGuesser.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 class SmartTypeGuesser implements TypeGuesser
 {
     /**
@@ -23,14 +23,14 @@ public function __construct()
 
     public function guess(string $filepath): string
     {
-        foreach($this->typeGuessers as $typeGuesser) {
+        foreach ($this->typeGuessers as $typeGuesser) {
             $type = $typeGuesser->guess($filepath);
 
-            if($type !== self::TYPE_UNKNOWN) {
+            if ($type !== self::TYPE_UNKNOWN) {
                 return $type;
             }
         }
 
         return self::TYPE_UNKNOWN;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/TypeGuesser/TypeGuesser.php b/src/ImageOptimizer/TypeGuesser/TypeGuesser.php
index b42773f..d30a6bc 100644
--- a/src/ImageOptimizer/TypeGuesser/TypeGuesser.php
+++ b/src/ImageOptimizer/TypeGuesser/TypeGuesser.php
@@ -1,19 +1,20 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
 interface TypeGuesser
 {
-    const TYPE_JPEG = 'jpeg';
-    const TYPE_PNG = 'png';
-    const TYPE_GIF = 'gif';
-    const TYPE_SVG = 'svg';
-    const TYPE_UNKNOWN = 'unknown';
+    public const TYPE_JPEG = 'jpeg';
+    public const TYPE_PNG = 'png';
+    public const TYPE_GIF = 'gif';
+    public const TYPE_SVG = 'svg';
+    public const TYPE_UNKNOWN = 'unknown';
 
     /**
      * @param string $filepath
      * @return string Image file type, value of one of the TYPE_* const
      */
     public function guess(string $filepath): string;
-} 
\ No newline at end of file
+}
diff --git a/src/ImageOptimizer/WrapperOptimizer.php b/src/ImageOptimizer/WrapperOptimizer.php
index f4d5cd4..e3d1201 100644
--- a/src/ImageOptimizer/WrapperOptimizer.php
+++ b/src/ImageOptimizer/WrapperOptimizer.php
@@ -1,8 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-interface WrapperOptimizer extends Optimizer {
+interface WrapperOptimizer extends Optimizer
+{
     public function unwrap(): Optimizer;
-}
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/Assertion/ImageAssertion.php b/tests/ImageOptimizer/Assertion/ImageAssertion.php
index cfc27c3..7449e2c 100644
--- a/tests/ImageOptimizer/Assertion/ImageAssertion.php
+++ b/tests/ImageOptimizer/Assertion/ImageAssertion.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\Assertion;
@@ -25,7 +26,7 @@ public static function create(string $originalImage, string $optimizedImage): Im
     public function optimizedFileIsSmallerThanPercent(float $percent): ImageAssertion
     {
         $originalFilesize = filesize($this->originalImage);
-        $actualPercent = filesize($this->optimizedImage)/ $originalFilesize * 100;
+        $actualPercent = filesize($this->optimizedImage) / $originalFilesize * 100;
 
         Assert::assertLessThan($percent, $actualPercent, 'compression level is too small');
 
@@ -46,10 +47,10 @@ public function imagesHaveTheSameDimensions(): ImageAssertion
     public function imagesAreSimilarInPercent(float $percent): ImageAssertion
     {
         $similarity = ImageSimilarityJudge::judge($this->originalImage, $this->optimizedImage);
-        $percent = $percent/100;
+        $percent = $percent / 100;
 
         Assert::assertGreaterThan($percent, $similarity);
 
         return $this;
     }
-} 
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/CommandTest.php b/tests/ImageOptimizer/CommandTest.php
index 2fd33eb..5542246 100644
--- a/tests/ImageOptimizer/CommandTest.php
+++ b/tests/ImageOptimizer/CommandTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
@@ -84,4 +85,4 @@ public function testCommandSucceeds()
 
         $this->assertSame(false, $exception);
     }
-} 
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/ImageSimilarityJudge.php b/tests/ImageOptimizer/ImageSimilarityJudge.php
index 162102e..8977e9e 100644
--- a/tests/ImageOptimizer/ImageSimilarityJudge.php
+++ b/tests/ImageOptimizer/ImageSimilarityJudge.php
@@ -1,10 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-use function imagecolorat;
-use function imagecolorsforindex;
 use ImageOptimizer\TypeGuesser\SmartTypeGuesser;
 use ImageOptimizer\TypeGuesser\TypeGuesser;
 use InvalidArgumentException;
@@ -24,7 +23,10 @@ public static function judge(string $image1, string $image2): float
         $typeGuesser = new SmartTypeGuesser();
 
         // svg images are not supported, so judge the as identical
-        if($typeGuesser->guess($image1) === TypeGuesser::TYPE_SVG || $typeGuesser->guess($image2) === TypeGuesser::TYPE_SVG) {
+        if (
+            $typeGuesser->guess($image1) === TypeGuesser::TYPE_SVG ||
+            $typeGuesser->guess($image2) === TypeGuesser::TYPE_SVG
+        ) {
             return 1;
         }
 
@@ -35,8 +37,8 @@ public static function judge(string $image1, string $image2): float
 
         $delta = 0;
 
-        for($x=0; $x<$width; $x++) {
-            for($y=0; $y<$height; $y++) {
+        for ($x = 0; $x < $width; $x++) {
+            for ($y = 0; $y < $height; $y++) {
                 //is faster about 30% than array_sum(array_map(...)) solution
                 $color1 = self::colorAt($resource1, $x, $y);
                 $color2 = self::colorAt($resource2, $x, $y);
@@ -46,7 +48,7 @@ public static function judge(string $image1, string $image2): float
             }
         }
 
-        return 1 - ($width && $height ? $delta/(3*255*$width*$height) : 0);
+        return 1 - ($width && $height ? $delta / (3 * 255 * $width * $height) : 0);
     }
 
     private static function createResource(string $image)
@@ -54,9 +56,9 @@ private static function createResource(string $image)
         $typeGuesser = new SmartTypeGuesser();
         $type = $typeGuesser->guess($image);
 
-        $function = 'imagecreatefrom'.$type;
+        $function = 'imagecreatefrom' . $type;
 
-        if(!function_exists($function)) {
+        if (!function_exists($function)) {
             throw new InvalidArgumentException(sprintf('Image "%s" is not supported', $type));
         }
 
@@ -68,4 +70,4 @@ private static function colorAt($image, int $x, int $y): array
         $colorIndex = imagecolorat($image, $x, $y);
         return imagecolorsforindex($image, $colorIndex);
     }
-} 
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/ImageSimilarityJudgeTest.php b/tests/ImageOptimizer/ImageSimilarityJudgeTest.php
index 7658c7f..be2543c 100644
--- a/tests/ImageOptimizer/ImageSimilarityJudgeTest.php
+++ b/tests/ImageOptimizer/ImageSimilarityJudgeTest.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-
 use PHPUnit\Framework\TestCase;
 
 class ImageSimilarityJudgeTest extends TestCase
@@ -14,7 +14,7 @@ class ImageSimilarityJudgeTest extends TestCase
      */
     public function testJudge(string $image1, string $image2, float $expectedGreaterThan, float $expectedLessThan = 1.)
     {
-        $actual = ImageSimilarityJudge::judge(__DIR__.'/Resources/'.$image1, __DIR__.'/Resources/'.$image2);
+        $actual = ImageSimilarityJudge::judge(__DIR__ . '/Resources/' . $image1, __DIR__ . '/Resources/' . $image2);
 
         $this->assertGreaterThanOrEqual($expectedGreaterThan, $actual);
         $this->assertLessThanOrEqual($expectedLessThan, $actual);
@@ -30,4 +30,3 @@ public function judgeProvider()
         ];
     }
 }
- 
\ No newline at end of file
diff --git a/tests/ImageOptimizer/OptimizersTest.php b/tests/ImageOptimizer/OptimizersTest.php
index c815155..4258a7d 100644
--- a/tests/ImageOptimizer/OptimizersTest.php
+++ b/tests/ImageOptimizer/OptimizersTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
@@ -9,14 +10,17 @@
 
 class OptimizersTest extends TestCase
 {
-    const TMP_DIR = 'tmp';
+    public const TMP_DIR = 'tmp';
 
     /**
      * @test
      * @dataProvider optimizerProvider
      */
-    public function givenOptimizerAndSampleFile_runOptimization_fileShouldBeSmallerAndTheSame(string $optimizerName, string $originalFile, float $expectedSizeOfOriginalFile = 70)
-    {
+    public function givenOptimizerAndSampleFile_runOptimization_fileShouldBeSmallerAndTheSame(
+        string $optimizerName,
+        string $originalFile,
+        float $expectedSizeOfOriginalFile = 70
+    ) {
         //given
 
         $factory = new OptimizerFactory([
@@ -51,11 +55,11 @@ public function givenOptimizerAndSampleFile_runOptimization_fileShouldBeSmallerA
 
     public function optimizerProvider()
     {
-        $pngFile = __DIR__.'/Resources/sample.png';
-        $pngWithoutExtension = __DIR__.'/Resources/samplepng';
-        $gifFile = __DIR__.'/Resources/sample.gif';
-        $jpgFile = __DIR__.'/Resources/sample.jpg';
-        $svgFile = __DIR__.'/Resources/sample.svg';
+        $pngFile = __DIR__ . '/Resources/sample.png';
+        $pngWithoutExtension = __DIR__ . '/Resources/samplepng';
+        $gifFile = __DIR__ . '/Resources/sample.gif';
+        $jpgFile = __DIR__ . '/Resources/sample.jpg';
+        $svgFile = __DIR__ . '/Resources/sample.svg';
 
         return [
             ['optipng', $pngFile, 98.5],
@@ -86,7 +90,7 @@ public function givenUnsupportedFileForOptimizer_givenIgnoreErrorDisabled_throwE
 
         $optimizer = $factory->get('png');
 
-        $optimizer->optimize(__DIR__.'/Resources/sample.jpg');
+        $optimizer->optimize(__DIR__ . '/Resources/sample.jpg');
     }
 
     /**
@@ -98,7 +102,7 @@ public function givenUnsupportedFileForOptimizer_givenIgnoreErrorEnabled_ok()
 
         $optimizer = $factory->get('png');
 
-        $optimizer->optimize(__DIR__.'/Resources/sample.jpg');
+        $optimizer->optimize(__DIR__ . '/Resources/sample.jpg');
     }
 
     /**
@@ -110,11 +114,11 @@ public function givenOutputPath_optimizeOutputFile()
 
         $optimizer = $factory->get('jpg');
 
-        $sampleFile = $this->prepareSampleFile(__DIR__.'/Resources/sample.jpg');
+        $sampleFile = $this->prepareSampleFile(__DIR__ . '/Resources/sample.jpg');
 
         $optimizer->optimize($sampleFile);
 
-        ImageAssertion::create($sampleFile, __DIR__.'/Resources/'.self::TMP_DIR.'/sample-optimized.jpg')
+        ImageAssertion::create($sampleFile, __DIR__ . '/Resources/' . self::TMP_DIR . '/sample-optimized.jpg')
             ->imagesHaveTheSameDimensions()
             ->optimizedFileIsSmallerThanPercent(99)
             ->imagesAreSimilarInPercent(98.7)
@@ -141,32 +145,34 @@ public function optimizerFailed_optimizeChangedOutputFileWillBeDeleted()
 
         $optimizer = $factory->get('jpg');
 
-        $sampleFile = $this->prepareSampleFile(__DIR__.'/Resources/sample.jpg');
+        $sampleFile = $this->prepareSampleFile(__DIR__ . '/Resources/sample.jpg');
 
         $optimizer->optimize($sampleFile);
 
-        $this->assertFileDoesNotExist(__DIR__.'/Resources/'.self::TMP_DIR.'/sample-optimized.jpg');
+        $this->assertFileDoesNotExist(__DIR__ . '/Resources/' . self::TMP_DIR . '/sample-optimized.jpg');
 
         // smart optimizer will delete the file if it fails
         $optimizer = $factory->get();
         $optimizer->optimize($sampleFile);
-        $this->assertFileDoesNotExist(__DIR__.'/Resources/'.self::TMP_DIR.'/sample-optimized.jpg');
+        $this->assertFileDoesNotExist(__DIR__ . '/Resources/' . self::TMP_DIR . '/sample-optimized.jpg');
     }
 
     protected function tearDown(): void
     {
-        foreach(['sample.gif', 'sample.jpg', 'sample.png', 'samplepng', 'sample.svg', 'sample-optimized.jpg'] as $file) {
-            @unlink(__DIR__.'/Resources/'.self::TMP_DIR.'/'.$file);
+        $files = ['sample.gif', 'sample.jpg', 'sample.png', 'samplepng', 'sample.svg', 'sample-optimized.jpg'];
+
+        foreach ($files as $file) {
+            @unlink(__DIR__ . '/Resources/' . self::TMP_DIR . '/' . $file);
         }
     }
 
     private function prepareSampleFile(string $originalFile)
     {
-        $destination = __DIR__.'/Resources/'.self::TMP_DIR.'/'.basename($originalFile);
-        if(!@copy($originalFile, $destination)) {
+        $destination = __DIR__ . '/Resources/' . self::TMP_DIR . '/' . basename($originalFile);
+        if (!@copy($originalFile, $destination)) {
             $this->fail(sprintf('Preparing sample file "%s" failed.', $originalFile));
         }
 
         return $destination;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/SmartOptimizerTest.php b/tests/ImageOptimizer/SmartOptimizerTest.php
index 767fe30..7fd52de 100644
--- a/tests/ImageOptimizer/SmartOptimizerTest.php
+++ b/tests/ImageOptimizer/SmartOptimizerTest.php
@@ -1,19 +1,19 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer;
 
-
 use ImageOptimizer\TypeGuesser\TypeGuesser;
 use PHPUnit\Framework\TestCase;
 
 class SmartOptimizerTest extends TestCase
 {
-    const SUPPORTED_TYPE = 'png';
-    const UNSUPPORTED_TYPE = 'gif';
+    public const SUPPORTED_TYPE = 'png';
+    public const UNSUPPORTED_TYPE = 'gif';
 
-    const SUPPORTED_FILEPATH = 'somefilepath';
-    const UNSUPPORTED_FILEPATH = 'unsupportedFilepath';
+    public const SUPPORTED_FILEPATH = 'somefilepath';
+    public const UNSUPPORTED_FILEPATH = 'unsupportedFilepath';
 
     /**
      * @var SmartOptimizer
@@ -61,7 +61,7 @@ public function givenSupportedFilepath_executeInternalOptimizer()
     public function givenUnsupportedFilepath_throwException()
     {
         $this->expectException(\ImageOptimizer\Exception\Exception::class);
-        
+
         //given
 
         $filepath = self::UNSUPPORTED_FILEPATH;
@@ -88,4 +88,4 @@ public function guess(string $filepath): string
     {
         return isset($this->filepathToType[$filepath]) ? $this->filepathToType[$filepath] : 'unknown';
     }
-}
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/TypeGuesser/AbstractTypeGuesserTest.php b/tests/ImageOptimizer/TypeGuesser/AbstractTypeGuesserTest.php
index a5e47a2..febd8d2 100644
--- a/tests/ImageOptimizer/TypeGuesser/AbstractTypeGuesserTest.php
+++ b/tests/ImageOptimizer/TypeGuesser/AbstractTypeGuesserTest.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 use PHPUnit\Framework\TestCase;
 
 abstract class AbstractTypeGuesserTest extends TestCase
@@ -30,12 +30,12 @@ public function givenImageFile_returnType(string $filepath, string $expectedType
     public function validImageFileProvider()
     {
         return [
-            [__DIR__.'/../Resources/sample.png', TypeGuesser::TYPE_PNG],
-            [__DIR__.'/../Resources/sample.jpg', TypeGuesser::TYPE_JPEG],
-            [__DIR__.'/../Resources/sample.gif', TypeGuesser::TYPE_GIF],
+            [__DIR__ . '/../Resources/sample.png', TypeGuesser::TYPE_PNG],
+            [__DIR__ . '/../Resources/sample.jpg', TypeGuesser::TYPE_JPEG],
+            [__DIR__ . '/../Resources/sample.gif', TypeGuesser::TYPE_GIF],
             [__FILE__, TypeGuesser::TYPE_UNKNOWN],
         ];
     }
 
     abstract protected function createTypeGuesser(): TypeGuesser;
-}
\ No newline at end of file
+}
diff --git a/tests/ImageOptimizer/TypeGuesser/ExtensionTypeGuesserTest.php b/tests/ImageOptimizer/TypeGuesser/ExtensionTypeGuesserTest.php
index 7dc0106..ad10692 100644
--- a/tests/ImageOptimizer/TypeGuesser/ExtensionTypeGuesserTest.php
+++ b/tests/ImageOptimizer/TypeGuesser/ExtensionTypeGuesserTest.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 class ExtensionTypeGuesserTest extends AbstractTypeGuesserTest
 {
     protected function createTypeGuesser(): TypeGuesser
@@ -15,11 +15,10 @@ public function validImageFileProvider()
     {
         $images = parent::validImageFileProvider();
         $images[] =  [
-            __DIR__.'/../Resources/sample.svg',
+            __DIR__ . '/../Resources/sample.svg',
             TypeGuesser::TYPE_SVG,
         ];
 
         return $images;
     }
 }
- 
\ No newline at end of file
diff --git a/tests/ImageOptimizer/TypeGuesser/GdTypeGuesserTest.php b/tests/ImageOptimizer/TypeGuesser/GdTypeGuesserTest.php
index 8914ba4..a9662c7 100644
--- a/tests/ImageOptimizer/TypeGuesser/GdTypeGuesserTest.php
+++ b/tests/ImageOptimizer/TypeGuesser/GdTypeGuesserTest.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 class GdTypeGuesserTest extends AbstractTypeGuesserTest
 {
     protected function createTypeGuesser(): TypeGuesser
@@ -15,4 +15,3 @@ protected function createTypeGuesser(): TypeGuesser
         }
     }
 }
- 
\ No newline at end of file
diff --git a/tests/ImageOptimizer/TypeGuesser/SmartTypeGuesserTest.php b/tests/ImageOptimizer/TypeGuesser/SmartTypeGuesserTest.php
index ec4dfdf..a9b119e 100644
--- a/tests/ImageOptimizer/TypeGuesser/SmartTypeGuesserTest.php
+++ b/tests/ImageOptimizer/TypeGuesser/SmartTypeGuesserTest.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ImageOptimizer\TypeGuesser;
 
-
 class SmartTypeGuesserTest extends AbstractTypeGuesserTest
 {
     protected function createTypeGuesser(): TypeGuesser
@@ -15,11 +15,10 @@ public function validImageFileProvider()
     {
         $images = parent::validImageFileProvider();
         $images[] =  [
-            __DIR__.'/../Resources/sample.svg',
+            __DIR__ . '/../Resources/sample.svg',
             TypeGuesser::TYPE_SVG,
         ];
 
         return $images;
     }
 }
- 
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c1bb662..6b1cb45 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,6 +3,6 @@
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
-$loader = require __DIR__.'/../vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 
-$loader->addPsr4('ImageOptimizer\\', __DIR__.'/ImageOptimizer');
+$loader->addPsr4('ImageOptimizer\\', __DIR__ . '/ImageOptimizer');