Cleanup code with php cs fixer

8ctopus · Dec 28, 2023 · 7cbe129 · 7cbe129
1 parent bf80458
commit 7cbe129
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 70 deletions.
diff --git a/src/ApixLogException.php b/src/ApixLogException.php
@@ -14,6 +14,4 @@
 
 use Exception;
 
-class ApixLogException extends Exception
-{
-}
+class ApixLogException extends Exception {}
diff --git a/src/LogEntry.php b/src/LogEntry.php
@@ -38,7 +38,7 @@ class LogEntry
      * @param string     $message message
      * @param mixed[]    $context context
      */
-    public function __construct(string|int $level, string $message, array $context = [])
+    public function __construct(int|string $level, string $message, array $context = [])
     {
         $this->timestamp = time();
 

diff --git a/src/Logger/AbstractLogger.php b/src/Logger/AbstractLogger.php
@@ -151,9 +151,9 @@ public static function getLevelName(int $levelCode) : string
      *
      * @return void
      *
-     * @throws \Psr\Log\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
-    public function log(mixed $level, Stringable|string $message, array $context = []) : void
+    public function log(mixed $level, string|Stringable $message, array $context = []) : void
     {
         $this->process(new LogEntry($level, (string) $message, $context));
     }

diff --git a/src/Logger/ErrorLog.php b/src/Logger/ErrorLog.php
@@ -97,7 +97,7 @@ public function write(LogEntry|string $log) : bool
      *
      * @return null|string
      */
-    public function getDestination() : string|null
+    public function getDestination() : null|string
     {
         return $this->destination;
     }

diff --git a/tests/Format/ConsoleColorsTest.php b/tests/Format/ConsoleColorsTest.php
@@ -28,15 +28,15 @@ protected function tearDown() : void
 
     public function testGetFormatReturnsStandardFormat() : void
     {
-        static::assertInstanceOf('\Apix\Log\Format\Standard', $this->logger->getFormat());
+        self::assertInstanceOf('\Apix\Log\Format\Standard', $this->logger->getFormat());
     }
 
     public function testSetFormat() : void
     {
         $format = new ConsoleColors();
         $this->logger->setFormat($format);
 
-        static::assertSame($this->logger->getFormat(), $format);
+        self::assertSame($this->logger->getFormat(), $format);
     }
 
     public function testFormatInterfaceExample() : void
@@ -45,6 +45,6 @@ public function testFormatInterfaceExample() : void
         $this->logger->setFormat($format);
 
         $this->logger->error('hello {who}', ['who' => 'world']);
-        static::assertSame(date('[Y-m-d H:i:s]') . ' [01;31mERROR hello world[0m' . PHP_EOL, $this->logger->getItems()[0]);
+        self::assertSame(date('[Y-m-d H:i:s]') . ' [01;31mERROR hello world[0m' . PHP_EOL, $this->logger->getItems()[0]);
     }
 }
diff --git a/tests/Format/InterfaceTest.php b/tests/Format/InterfaceTest.php
@@ -37,14 +37,14 @@ protected function tearDown() : void
 
     public function testGetFormatReturnsStandardFormat() : void
     {
-        static::assertInstanceOf('\Apix\Log\Format\Standard', $this->logger->getFormat());
+        self::assertInstanceOf('\Apix\Log\Format\Standard', $this->logger->getFormat());
     }
 
     public function testSetFormat() : void
     {
         $formatter = new MyJsonFormatter();
         $this->logger->setFormat($formatter);
-        static::assertSame($this->logger->getFormat(), $formatter);
+        self::assertSame($this->logger->getFormat(), $formatter);
     }
 
     public function testFormatInterfaceExample() : void
@@ -53,7 +53,7 @@ public function testFormatInterfaceExample() : void
         $this->logger->setFormat($formatter);
         $this->logger->error('hello {who}', ['who' => 'world']);
 
-        static::assertMatchesRegularExpression(
+        self::assertMatchesRegularExpression(
             '@\{"timestamp":.*\,"name":"error"\,"levelCode":3\,"message":"hello world","context":\{"who":"world"\}\}@',
             $this->logger->getItems()[0]
         );

diff --git a/tests/Format/StandardTest.php b/tests/Format/StandardTest.php
@@ -35,7 +35,7 @@ protected function tearDown() : void
 
     public function testGetFormatReturnsStandardFormat() : void
     {
-        static::assertInstanceOf('\Apix\Log\Format\Standard', $this->logger->getFormat());
+        self::assertInstanceOf('\Apix\Log\Format\Standard', $this->logger->getFormat());
     }
 
     public function testFormatInterfaceExample() : void
@@ -51,6 +51,6 @@ public function testFormatInterfaceExample() : void
             'file' => tmpfile(),
         ]);
 
-        static::assertSame(date('[Y-m-d H:i:s]') . ' ERROR hello world 18 true {"key1":"2","key2":true}' . PHP_EOL, $this->logger->getItems()[0]);
+        self::assertSame(date('[Y-m-d H:i:s]') . ' ERROR hello world 18 true {"key1":"2","key2":true}' . PHP_EOL, $this->logger->getItems()[0]);
     }
 }
diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
@@ -93,20 +93,20 @@ public function testUsages() : void
 
         $date = date('[Y-m-d H:i:s]');
 
-        static::assertSame($date . ' ALERT Running out of beers 5 left, recharge: true [type: resource]' . PHP_EOL, $urgent_logs[0]);
+        self::assertSame($date . ' ALERT Running out of beers 5 left, recharge: true [type: resource]' . PHP_EOL, $urgent_logs[0]);
 
         $prefixException = 'Exception: Boo! in ';
 
-        static::assertStringStartsWith($date . ' CRITICAL OMG saw ' . $prefixException, $urgent_logs[1]);
+        self::assertStringStartsWith($date . ' CRITICAL OMG saw ' . $prefixException, $urgent_logs[1]);
 
         $app_logger->flushDeferredLogs();
 
         $app_logs = $this->getLogs($app_logger, false);
 
-        static::assertStringStartsWith($date . ' CRITICAL OMG saw ' . $prefixException, $app_logs[0]);
+        self::assertStringStartsWith($date . ' CRITICAL OMG saw ' . $prefixException, $app_logs[0]);
 
-        static::assertStringContainsString($date . ' ERROR ' . $prefixException, $app_logs[0]);
+        self::assertStringContainsString($date . ' ERROR ' . $prefixException, $app_logs[0]);
 
-        static::assertSame([$date . ' INFO Something happened -> ["xyz"]' . PHP_EOL], $this->getLogs($debug_logger));
+        self::assertSame([$date . ' INFO Something happened -> ["xyz"]' . PHP_EOL], $this->getLogs($debug_logger));
     }
 }
diff --git a/tests/LogEntryTest.php b/tests/LogEntryTest.php
@@ -28,13 +28,13 @@ public function testConstructor() : void
             'b' => false,
         ]);
 
-        static::assertSame(date('[Y-m-d H:i:s]') . ' EMERGENCY test' . PHP_EOL, (string) $entry);
+        self::assertSame(date('[Y-m-d H:i:s]') . ' EMERGENCY test' . PHP_EOL, (string) $entry);
 
         $entry = new LogEntry(0, 'test', [
             'a' => 1,
             'b' => false,
         ]);
 
-        static::assertSame(date('[Y-m-d H:i:s]') . ' EMERGENCY test' . PHP_EOL, (string) $entry);
+        self::assertSame(date('[Y-m-d H:i:s]') . ' EMERGENCY test' . PHP_EOL, (string) $entry);
     }
 }
diff --git a/tests/Logger/ErrorLogTest.php b/tests/Logger/ErrorLogTest.php
@@ -52,7 +52,7 @@ public function testWriteString() : void
 
         $content = file_get_contents($this->dest);
 
-        static::assertStringContainsString($message, $content);
+        self::assertStringContainsString($message, $content);
     }
 
     public function testWriteObject() : void
@@ -69,8 +69,8 @@ public function testWriteObject() : void
 
         $content = file_get_contents($this->dest);
 
-        static::assertStringContainsString((string) $test, $content);
-        static::assertSame($destination, $logger->getDestination());
+        self::assertStringContainsString((string) $test, $content);
+        self::assertSame($destination, $logger->getDestination());
     }
 }
 

diff --git a/tests/Logger/FileTest.php b/tests/Logger/FileTest.php
@@ -36,7 +36,7 @@ public function testConstructor() : void
     {
         $logger = new File($this->dest);
 
-        static::assertInstanceOf(File::class, $logger);
+        self::assertInstanceOf(File::class, $logger);
     }
 
     public function testThrowsInvalidArgumentExceptionWhenFileCannotBeCreated() : void

diff --git a/tests/Logger/MailTest.php b/tests/Logger/MailTest.php
@@ -39,6 +39,6 @@ public function testThrowsInvalidArgumentException() : void
     public function testConstructor() : void
     {
         new Mail('foo@bar.com', 'CC: some@somewhere.com');
-        static::assertTrue(true);
+        self::assertTrue(true);
     }
 }
diff --git a/tests/Logger/RuntimeTest.php b/tests/Logger/RuntimeTest.php
@@ -38,7 +38,7 @@ public function testAbstractLogger() : void
         $this->logger->debug('msg1', $context);
         $this->logger->error('msg2', $context);
 
-        static::assertSame(
+        self::assertSame(
             [
                 date('[Y-m-d H:i:s]') . ' DEBUG msg1' . PHP_EOL,
                 date('[Y-m-d H:i:s]') . ' ERROR msg2' . PHP_EOL,

diff --git a/tests/Logger/StreamTest.php b/tests/Logger/StreamTest.php
@@ -63,7 +63,7 @@ public function getLogs() : array
     public function testWrite() : void
     {
         $this->logger->info('test');
-        static::assertSame(date('[Y-m-d H:i:s]') . ' INFO test', $this->getLogs()[0]);
+        self::assertSame(date('[Y-m-d H:i:s]') . ' INFO test', $this->getLogs()[0]);
     }
 
     public function testInvalidResource() : void