Update the coding standards using phpcbf

duncan3dc · duncan3dc · commit 540f61e353c7 · 2024-10-30T10:37:10.000Z
diff --git a/src/Argument/Argument.php b/src/Argument/Argument.php
@@ -3,6 +3,7 @@
 namespace League\CLImate\Argument;
 
 use League\CLImate\Exceptions\UnexpectedValueException;
+
 use function is_array;
 
 class Argument
diff --git a/src/Decorator/Component/BackgroundColor.php b/src/Decorator/Component/BackgroundColor.php
@@ -10,7 +10,7 @@ class BackgroundColor extends Color
      *
      * @const integer ADD
      */
-    const ADD = 10;
+    public const ADD = 10;
 
     /**
      * Get the code for the requested color
diff --git a/src/Logger.php b/src/Logger.php
@@ -5,6 +5,7 @@
 use Psr\Log\AbstractLogger;
 use Psr\Log\InvalidArgumentException;
 use Psr\Log\LogLevel;
+
 use function array_key_exists;
 use function is_array;
 use function str_replace;
@@ -50,7 +51,7 @@ public function __construct($level = LogLevel::INFO, CLImate $climate = null)
         $this->level = $this->convertLevel($level);
 
         if ($climate === null) {
-            $climate = new CLImate;
+            $climate = new CLImate();
         }
         $this->climate = $climate;
 
diff --git a/src/TerminalObject/Basic/BasicTerminalObject.php b/src/TerminalObject/Basic/BasicTerminalObject.php
@@ -10,7 +10,9 @@
 
 abstract class BasicTerminalObject implements BasicTerminalObjectInterface
 {
-    use SettingsImporter, ParserImporter, UtilImporter;
+    use SettingsImporter;
+    use ParserImporter;
+    use UtilImporter;
 
     /**
      * Set the property if there is a valid value
diff --git a/src/TerminalObject/Basic/Table.php b/src/TerminalObject/Basic/Table.php
@@ -197,7 +197,7 @@ protected function buildHeaderRow()
         $header_row = $this->getHeaderRow();
         if ($header_row) {
             $this->addLine($this->buildRow($header_row));
-            $this->addLine((new Border)->char('=')->length($this->table_width)->result());
+            $this->addLine((new Border())->char('=')->length($this->table_width)->result());
         }
     }
 
diff --git a/src/TerminalObject/Dynamic/Animation.php b/src/TerminalObject/Dynamic/Animation.php
@@ -138,7 +138,7 @@ protected function setSleeper($sleeper = null)
      */
     protected function setKeyFrames($keyframes)
     {
-        $this->keyframes = $keyframes ?: new Keyframe;
+        $this->keyframes = $keyframes ?: new Keyframe();
     }
 
     /**
diff --git a/src/TerminalObject/Dynamic/Animation/Keyframe.php b/src/TerminalObject/Dynamic/Animation/Keyframe.php
@@ -8,7 +8,9 @@
 
 class Keyframe
 {
-    use StringLength, ParserImporter, UtilImporter;
+    use StringLength;
+    use ParserImporter;
+    use UtilImporter;
 
     /**
      * Get the enter keyframes for the desired direction
diff --git a/src/TerminalObject/Dynamic/Checkbox/Checkbox.php b/src/TerminalObject/Dynamic/Checkbox/Checkbox.php
@@ -8,7 +8,9 @@
 
 class Checkbox
 {
-    use StringLength, ParserImporter, UtilImporter;
+    use StringLength;
+    use ParserImporter;
+    use UtilImporter;
 
     /**
      * The value of the checkbox
diff --git a/src/TerminalObject/Dynamic/Checkbox/CheckboxGroup.php b/src/TerminalObject/Dynamic/Checkbox/CheckboxGroup.php
@@ -8,7 +8,9 @@
 
 class CheckboxGroup
 {
-    use OutputImporter, ParserImporter, UtilImporter;
+    use OutputImporter;
+    use ParserImporter;
+    use UtilImporter;
 
     protected $checkboxes = [];
 
@@ -136,7 +138,7 @@ protected function getCurrent()
      */
     protected function getCurrentKey($direction, $option, $key)
     {
-        $method = 'get' . ucwords($direction). 'Key';
+        $method = 'get' . ucwords($direction) . 'Key';
 
         return $this->{$method}($option, $key);
     }
diff --git a/src/TerminalObject/Dynamic/Checkboxes.php b/src/TerminalObject/Dynamic/Checkboxes.php
@@ -102,15 +102,15 @@ protected function handleCharacter($char)
             case "\n":
                 $this->output->sameLine()->write($this->util->cursor->defaultStyle());
                 $this->output->sameLine()->write("\e[0m");
-            return true; // Break the while loop as well
+                return true; // Break the while loop as well
 
             case "\e":
                 $this->handleAnsi();
-            break;
+                break;
 
             case ' ':
                 $this->checkboxes->toggleCurrent();
-            break;
+                break;
         }
 
         return false;
@@ -136,12 +136,12 @@ protected function handleAnsi()
             // Up arrow
             case '[A':
                 $this->checkboxes->setCurrent('previous');
-            break;
+                break;
 
             // Down arrow
             case '[B':
                 $this->checkboxes->setCurrent('next');
-            break;
+                break;
         }
     }
 
diff --git a/src/TerminalObject/Dynamic/Confirm.php b/src/TerminalObject/Dynamic/Confirm.php
@@ -3,14 +3,13 @@
 namespace League\CLImate\TerminalObject\Dynamic;
 
 use League\CLImate\Util\Reader\ReaderInterface;
+
 use function in_array;
 use function strtolower;
 use function substr;
 
 class Confirm extends Input
 {
-
-
     /**
      * @inheritdoc
      */
diff --git a/src/TerminalObject/Dynamic/DynamicTerminalObject.php b/src/TerminalObject/Dynamic/DynamicTerminalObject.php
@@ -14,5 +14,8 @@
 
 abstract class DynamicTerminalObject implements DynamicTerminalObjectInterface
 {
-    use SettingsImporter, ParserImporter, OutputImporter, UtilImporter;
+    use SettingsImporter;
+    use ParserImporter;
+    use OutputImporter;
+    use UtilImporter;
 }
diff --git a/src/TerminalObject/Dynamic/Spinner.php b/src/TerminalObject/Dynamic/Spinner.php
@@ -3,6 +3,7 @@
 namespace League\CLImate\TerminalObject\Dynamic;
 
 use League\CLImate\Exceptions\UnexpectedValueException;
+
 use function array_merge;
 use function count;
 use function microtime;
diff --git a/src/TerminalObject/Router/Router.php b/src/TerminalObject/Router/Router.php
@@ -10,7 +10,10 @@
 
 class Router
 {
-    use ParserImporter, SettingsImporter, OutputImporter, UtilImporter;
+    use ParserImporter;
+    use SettingsImporter;
+    use OutputImporter;
+    use UtilImporter;
 
     /**
      * An instance of the Settings Manager class
diff --git a/src/Util/Output.php b/src/Util/Output.php
@@ -47,9 +47,9 @@ class Output
 
     public function __construct()
     {
-        $this->add('out', new Writer\StdOut);
-        $this->add('error', new Writer\StdErr);
-        $this->add('buffer', new Writer\Buffer);
+        $this->add('out', new Writer\StdOut());
+        $this->add('error', new Writer\StdErr());
+        $this->add('buffer', new Writer\Buffer());
 
         $this->defaultTo('out');
     }
diff --git a/src/Util/System/Windows.php b/src/Util/System/Windows.php
@@ -72,7 +72,7 @@ protected function systemHasAnsiSupport()
         return (function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT))
             || false !== getenv('ANSICON')
             || 'ON' === getenv('ConEmuANSI')
-            || 'Hyper' === getenv('TERM_PROGRAM') 
+            || 'Hyper' === getenv('TERM_PROGRAM')
             || 'xterm' === getenv('TERM');
     }
 }
diff --git a/tests/Animation/AnimationTest.php b/tests/Animation/AnimationTest.php
@@ -7,7 +7,11 @@
 
 class AnimationTest extends TestBase
 {
-    use ExitToTopFrames, ExitToBottomFrames, ExitToLeftFrames, ExitToRightFrames, RunFrames;
+    use ExitToTopFrames;
+    use ExitToBottomFrames;
+    use ExitToLeftFrames;
+    use ExitToRightFrames;
+    use RunFrames;
 
 
     private function addArt(): void
diff --git a/tests/Argument/ManagerTest.php b/tests/Argument/ManagerTest.php
@@ -12,7 +12,7 @@ class ManagerTest extends TestCase
 
     public function setUp(): void
     {
-        $this->manager = new Manager;
+        $this->manager = new Manager();
     }
 
 
diff --git a/tests/ArgumentTest.php b/tests/ArgumentTest.php
@@ -25,7 +25,7 @@ public function it_throws_an_exception_when_building_arguments_from_an_unknown_t
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage("Please provide an argument name or object.");
 
-        $this->cli->arguments->add(new \stdClass);
+        $this->cli->arguments->add(new \stdClass());
     }
 
     protected function getFullArguments()
diff --git a/tests/BufferTest.php b/tests/BufferTest.php
@@ -10,8 +10,8 @@ class BufferTest extends TestBase
     /** @test */
     public function it_can_buffer_content()
     {
-        $buffer = new Buffer;
-        $output = new Output;
+        $buffer = new Buffer();
+        $output = new Output();
         $output->add('buffer', $buffer);
         $output->defaultTo('buffer');
 
@@ -23,8 +23,8 @@ public function it_can_buffer_content()
     /** @test */
     public function it_can_buffer_content_without_a_new_line()
     {
-        $buffer = new Buffer;
-        $output = new Output;
+        $buffer = new Buffer();
+        $output = new Output();
         $output->add('buffer', $buffer);
         $output->defaultTo('buffer');
 
@@ -36,8 +36,8 @@ public function it_can_buffer_content_without_a_new_line()
     /** @test */
     public function it_can_buffer_multiple_lines()
     {
-        $buffer = new Buffer;
-        $output = new Output;
+        $buffer = new Buffer();
+        $output = new Output();
         $output->add('buffer', $buffer);
         $output->defaultTo('buffer');
 
@@ -50,8 +50,8 @@ public function it_can_buffer_multiple_lines()
     /** @test */
     public function it_can_clean_buffered_content()
     {
-        $buffer = new Buffer;
-        $output = new Output;
+        $buffer = new Buffer();
+        $output = new Output();
         $output->add('buffer', $buffer);
         $output->defaultTo('buffer');
 
diff --git a/tests/CLImateTest.php b/tests/CLImateTest.php
@@ -70,7 +70,7 @@ public function it_can_be_extended_using_a_basic_object()
         $this->shouldWrite("\e[mThis just outputs this.\e[0m");
         $this->shouldHavePersisted();
 
-        $this->cli->extend(new BasicObject);
+        $this->cli->extend(new BasicObject());
         $this->cli->basicObject();
     }
 
@@ -83,7 +83,7 @@ public function it_can_be_extended_using_a_basic_object_with_argument_setter()
         $this->shouldWrite("\e[mHey: This is the thing that will print to the console.\e[0m");
         $this->shouldHavePersisted();
 
-        $this->cli->extend(new BasicObjectArgument);
+        $this->cli->extend(new BasicObjectArgument());
         $this->cli->basicObjectArgument('This is the thing that will print to the console.');
     }
 
diff --git a/tests/FileTest.php b/tests/FileTest.php
@@ -35,7 +35,7 @@ public function it_can_write_to_a_file()
                         ->with($this->file->url(), 'a')
                         ->andReturn(fopen($this->file->url(), 'a'));
 
-        $output = new Output;
+        $output = new Output();
         $output->add('file', $file);
         $output->defaultTo('file');
 
@@ -49,7 +49,7 @@ public function it_will_accept_a_resource()
     {
         $resource = fopen($this->file->url(), 'a');
         $file     = $this->getFileMock($resource);
-        $output   = new Output;
+        $output   = new Output();
         $output->add('file', $file);
         $output->defaultTo('file');
 
@@ -74,7 +74,7 @@ public function it_can_lock_the_file()
 
         $file->lock();
 
-        $output = new Output;
+        $output = new Output();
         $output->add('file', $file);
         $output->defaultTo('file');
 
@@ -120,7 +120,7 @@ public function it_will_yell_when_a_non_writable_resource_is_passed()
         $this->expectExceptionMessage("is not writable");
 
         $file   = $this->getFileMock($this->file->url());
-        $output = new Output;
+        $output = new Output();
         $output->add('file', $file);
         $output->defaultTo('file');
 
@@ -134,7 +134,7 @@ public function it_will_yell_when_a_non_existent_resource_is_passed()
         $this->expectExceptionMessage("The resource [something-that-doesnt-exist] is not writable");
 
         $file   = $this->getFileMock('something-that-doesnt-exist');
-        $output = new Output;
+        $output = new Output();
         $output->add('file', $file);
         $output->defaultTo('file');
 
@@ -154,7 +154,7 @@ public function it_will_yell_when_it_failed_to_open_a_resource()
                         ->with($this->file->url(), 'a')
                         ->andReturn(false);
 
-        $output = new Output;
+        $output = new Output();
         $output->add('file', $file);
         $output->defaultTo('file');
 
diff --git a/tests/LoggerTest.php b/tests/LoggerTest.php
@@ -45,7 +45,7 @@ public function tearDown(): void
 
     public function testConstructor1()
     {
-        $logger = new Logger;
+        $logger = new Logger();
         $this->assertInstanceOf(LoggerInterface::class, $logger);
         $this->assertInstanceOf(Logger::class, $logger);
     }
diff --git a/tests/OutputTest.php b/tests/OutputTest.php
diff --git a/tests/PaddingTest.php b/tests/PaddingTest.php
diff --git a/tests/SleeperTest.php b/tests/SleeperTest.php
diff --git a/tests/StdinTest.php b/tests/StdinTest.php
diff --git a/tests/TerminalObject/Basic/ClearLineTest.php b/tests/TerminalObject/Basic/ClearLineTest.php
diff --git a/tests/TerminalObject/Basic/JsonTest.php b/tests/TerminalObject/Basic/JsonTest.php
diff --git a/tests/TerminalObject/Dynamic/SpinnerTest.php b/tests/TerminalObject/Dynamic/SpinnerTest.php

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class BackgroundColor extends Color`
`10`	`10`	`*`
`11`	`11`	`* @const integer ADD`
`12`	`12`	`*/`
`13`		`- const ADD = 10;`
	`13`	`+ public const ADD = 10;`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* Get the code for the requested color`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@`
`10`	`10`
`11`	`11`	`abstract class BasicTerminalObject implements BasicTerminalObjectInterface`
`12`	`12`	`{`
`13`		`- use SettingsImporter, ParserImporter, UtilImporter;`
	`13`	`+ use SettingsImporter;`
	`14`	`+ use ParserImporter;`
	`15`	`+ use UtilImporter;`
`14`	`16`
`15`	`17`	`/**`
`16`	`18`	`* Set the property if there is a valid value`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ protected function buildHeaderRow()`
`197`	`197`	`$header_row = $this->getHeaderRow();`
`198`	`198`	`if ($header_row) {`
`199`	`199`	`$this->addLine($this->buildRow($header_row));`
`200`		`- $this->addLine((new Border)->char('=')->length($this->table_width)->result());`
	`200`	`+ $this->addLine((new Border())->char('=')->length($this->table_width)->result());`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ protected function setSleeper($sleeper = null)`
`138`	`138`	`*/`
`139`	`139`	`protected function setKeyFrames($keyframes)`
`140`	`140`	`{`
`141`		`- $this->keyframes = $keyframes ?: new Keyframe;`
	`141`	`+ $this->keyframes = $keyframes ?: new Keyframe();`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`
`9`	`9`	`class Keyframe`
`10`	`10`	`{`
`11`		`- use StringLength, ParserImporter, UtilImporter;`
	`11`	`+ use StringLength;`
	`12`	`+ use ParserImporter;`
	`13`	`+ use UtilImporter;`
`12`	`14`
`13`	`15`	`/**`
`14`	`16`	`* Get the enter keyframes for the desired direction`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`
`9`	`9`	`class Checkbox`
`10`	`10`	`{`
`11`		`- use StringLength, ParserImporter, UtilImporter;`
	`11`	`+ use StringLength;`
	`12`	`+ use ParserImporter;`
	`13`	`+ use UtilImporter;`
`12`	`14`
`13`	`15`	`/**`
`14`	`16`	`* The value of the checkbox`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`
`9`	`9`	`class CheckboxGroup`
`10`	`10`	`{`
`11`		`- use OutputImporter, ParserImporter, UtilImporter;`
	`11`	`+ use OutputImporter;`
	`12`	`+ use ParserImporter;`
	`13`	`+ use UtilImporter;`
`12`	`14`
`13`	`15`	`protected $checkboxes = [];`
`14`	`16`
`@@ -136,7 +138,7 @@ protected function getCurrent()`
`136`	`138`	`*/`
`137`	`139`	`protected function getCurrentKey($direction, $option, $key)`
`138`	`140`	`{`
`139`		`- $method = 'get' . ucwords($direction). 'Key';`
	`141`	`+ $method = 'get' . ucwords($direction) . 'Key';`
`140`	`142`
`141`	`143`	`return $this->{$method}($option, $key);`
`142`	`144`	`}`