refactor

datashaman · Apr 15, 2019 · 9997b03 · 9997b03
1 parent 847d12c
commit 9997b03
Show file tree

Hide file tree

Showing 24 changed files with 130 additions and 109 deletions.
diff --git a/Makefile b/Makefile
@@ -4,6 +4,9 @@ phpcheck:
 phpcheck-no-defects:
 	@phpcheck -d
 
+php-cs-fixer:
+	php-cs-fixer fix --using-cache=no
+
 phpmd:
 	@phpmd src,checks text phpmd.xml
 

diff --git a/checks/GenCheck.php b/checks/GenCheck.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Checks;
 
 use Datashaman\PHPCheck\Check;

diff --git a/phpmd.xml b/phpmd.xml
@@ -9,8 +9,14 @@
     <description>
         Mess detection rules for PHPCheck
     </description>
+    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag" />
+    <rule ref="rulesets/cleancode.xml/ElseExpression" />
+    <rule ref="rulesets/cleancode.xml/StaticAccess">
+        <properties>
+            <property name="exceptions" value="\Faker\Factory,\phpDocumentor\Reflection\DocBlockFactory,\Webmozart\Assert\Assert" />
+        </properties>
+    </rule>
     <rule ref="rulesets/codesize.xml" />
-    <rule ref="rulesets/cleancode.xml" />
     <rule ref="rulesets/controversial.xml" />
     <rule ref="rulesets/design.xml" />
     <rule ref="rulesets/naming.xml" />

diff --git a/src/ArgumentFactory.php b/src/ArgumentFactory.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 use Exception;

diff --git a/src/Check.php b/src/Check.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 class Check

diff --git a/src/CheckCommand.php b/src/CheckCommand.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 use Symfony\Component\Console\Command\Command;

diff --git a/src/CheckEvents.php b/src/CheckEvents.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 final class CheckEvents

diff --git a/src/Events/EndAllEvent.php b/src/Events/EndAllEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 class EndAllEvent extends Event

diff --git a/src/Events/EndEvent.php b/src/Events/EndEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 use ReflectionMethod;

diff --git a/src/Events/ErrorEvent.php b/src/Events/ErrorEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 class ErrorEvent extends ResultEvent

diff --git a/src/Events/Event.php b/src/Events/Event.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 abstract class Event extends \Symfony\Component\EventDispatcher\Event

diff --git a/src/Events/FailureEvent.php b/src/Events/FailureEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 class FailureEvent extends ResultEvent

diff --git a/src/Events/ResultEvent.php b/src/Events/ResultEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 use ReflectionMethod;

diff --git a/src/Events/StartAllEvent.php b/src/Events/StartAllEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 class StartAllEvent extends Event

diff --git a/src/Events/StartEvent.php b/src/Events/StartEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 use ReflectionMethod;

diff --git a/src/Events/SuccessEvent.php b/src/Events/SuccessEvent.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Events;
 
 class SuccessEvent extends ResultEvent

diff --git a/src/ExecutionError.php b/src/ExecutionError.php
@@ -2,11 +2,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 use Exception;

diff --git a/src/ExecutionFailure.php b/src/ExecutionFailure.php
@@ -2,11 +2,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 use Exception;

diff --git a/src/Gen.php b/src/Gen.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck;
 
 use Faker\Factory;
@@ -18,8 +19,6 @@
 
 class Gen
 {
-    protected const DEFAULT_SIZE = 30;
-
     public const MIN_UNICODE = 0;
 
     public const MAX_UNICODE = 0x10FFFF;
@@ -32,6 +31,8 @@ class Gen
         [0x100000, 0x10FFFD],
     ];
 
+    protected const DEFAULT_SIZE = 30;
+
     /**
      * @var FakerGenerator
      */

diff --git a/src/Reporters/ConsoleReporter.php b/src/Reporters/ConsoleReporter.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Reporters;
 
 use Datashaman\PHPCheck\CheckCommand;
@@ -95,12 +96,12 @@ public function onEnd(Events\EndEvent $event): void
 
     public function onEndAll(Events\EndAllEvent $event): void
     {
-        $errors = $this->state->getErrors();
-        $failures = $this->state->getFailures();
+        $errors    = $this->state->getErrors();
+        $failures  = $this->state->getFailures();
         $successes = $this->state->getSuccesses();
 
         $successCount = \count($successes);
-        $errorCount = \count($errors);
+        $errorCount   = \count($errors);
         $failureCount = \count($failures);
 
         $totalCount = $successCount + $errorCount + $failureCount;

diff --git a/src/Reporters/JUnitReporter.php b/src/Reporters/JUnitReporter.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Reporters;
 
 use Datashaman\PHPCheck\CheckEvents;

diff --git a/src/Reporters/Reporter.php b/src/Reporters/Reporter.php
@@ -4,11 +4,12 @@
 /*
  * This file is part of the phpcheck package.
  *
- * (c) Marlin Forbes <marlinf@datashaman.com>
+ * ©Marlin Forbes <marlinf@datashaman.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Datashaman\PHPCheck\Reporters;
 
 use Datashaman\PHPCheck\Runner;
@@ -44,9 +45,9 @@ protected function convertBytes(int $bytes): string
             return '0.00 B';
         }
 
-        $s = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-        $e = (int) \floor(\log($bytes, 1024));
+        $suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+        $exponent = (int) \floor(\log($bytes, 1024));
 
-        return \sprintf('%.2f %s', \round($bytes / 1024 ** $e, 2), $s[$e]);
+        return \sprintf('%.2f %s', \round($bytes / 1024 ** $exponent, 2), $suffixes[$exponent]);
     }
 }