Maintenance on CodeBase (#225)

Author: JoshuaEstes

Formatter/SimpleFormatter.php

@@ -28,8 +28,7 @@ public function formatMessage(RecordInterface $record): string
         $output = str_replace('%channel%', $record->getChannel(), $output);
         $output = str_replace('%level_name%', $record->getLevel()->getName(), $output);
         $output = str_replace('%message%', $message, $output);
-        $output = str_replace('%context%', json_encode($record->getContext()->all()), $output);
 
-        return $output;
+        return str_replace('%context%', json_encode($record->getContext()->all()), $output);
     }
 }

Handler/FileHandler.php

@@ -15,6 +15,7 @@
 class FileHandler extends AbstractHandler
 {
     private bool $isOpen = false;
+
     private $handle;
 
     public function __construct(
@@ -44,6 +45,7 @@ private function open(): void
         if (false === $this->handle = fopen($this->filename, 'a')) {
             throw new RuntimeException(sprintf('"%s" could not be opened', $this->filename));
         }
+
         $this->isOpen = true;
     }
 

Handler/StreamHandler.php

@@ -12,8 +12,6 @@
  */
 class StreamHandler extends AbstractHandler
 {
-    private bool $isOpen = false;
-
     public function __construct(private $stream) {}
 
     public function doHandle(RecordInterface $record, string $message): void
@@ -24,7 +22,7 @@ public function doHandle(RecordInterface $record, string $message): void
     private function write(string $message): void
     {
         if (false === fwrite($this->stream, $message)) {
-            throw new RuntimeException(sprintf('stream could not be written to'));
+            throw new RuntimeException('stream could not be written to');
         }
     }
 }

Level.php

@@ -36,8 +36,8 @@ public static function fromName(string $name): LevelInterface
                 'info'      => self::Info,
                 'debug'     => self::Debug,
             };
-        } catch (UnhandledMatchError $e) {
-            throw new ValueError(sprintf('"%s" is invalid', $name), $e->getCode(), $e);
+        } catch (UnhandledMatchError $unhandledMatchError) {
+            throw new ValueError(sprintf('"%s" is invalid', $name), $unhandledMatchError->getCode(), $unhandledMatchError);
         }
     }
 
@@ -53,7 +53,7 @@ public static function tryFromName(string $name): ?LevelInterface
 
     public function getName(): string
     {
-        return match($this) {
+        return match ($this) {
             self::Emergency => 'EMERGENCY',
             self::Alert     => 'ALERT',
             self::Critical  => 'CRITICAL',
@@ -87,7 +87,7 @@ public function isLowerThan(LevelInterface $level): bool
 
     public function toPsrLogLevel(): string
     {
-        return match($this) {
+        return match ($this) {
             self::Emergency => LogLevel::EMERGENCY,
             self::Alert     => LogLevel::ALERT,
             self::Critical  => LogLevel::CRITICAL,

Tests/ContextTest.php

@@ -52,11 +52,11 @@ public function testOffsetExists(): void
     {
         $context = new Context();
 
-        $this->assertFalse(isset($context['test']));
+        $this->assertArrayNotHasKey('test', $context);
         $this->assertEmpty($context['test']);
 
         $context['test'] = 'testing';
-        $this->assertTrue(isset($context['test']));
+        $this->assertArrayHasKey('test', $context);
         $this->assertNotEmpty($context['test']);
     }
 
@@ -65,11 +65,11 @@ public function testOffsetUnset(): void
         $context = new Context();
 
         $context['key'] = 'value';
-        $this->assertTrue(isset($context['key']));
+        $this->assertArrayHasKey('key', $context);
         $this->assertNotEmpty($context['key']);
 
         unset($context['key']);
-        $this->assertFalse(isset($context['key']));
+        $this->assertArrayNotHasKey('key', $context);
         $this->assertEmpty($context['key']);
     }
 
@@ -78,11 +78,11 @@ public function testOffsetSet(): void
         $context = new Context();
 
         $context['test'] = 'unit test';
-        $this->assertTrue(isset($context['test']));
+        $this->assertArrayHasKey('test', $context);
         $this->assertNotEmpty($context['test']);
 
         $context['key'] = 'value';
-        $this->assertTrue(isset($context['key']));
+        $this->assertArrayHasKey('key', $context);
         $this->assertNotEmpty($context['key']);
     }
 
@@ -91,7 +91,7 @@ public function testItWillThrowExceptionDuringOffsetExistsWithInvalidOffset(): v
         $context = new Context();
 
         $this->expectException('InvalidArgumentException');
-        isset($context[new stdClass()]);
+        $context[new stdClass()];
     }
 
     public function testItWillThrowExceptionDuringOffsetGetWithInvalidOffset(): void

Tests/Filter/LogLevelFilterTest.php

@@ -29,7 +29,7 @@ public function testItHasTheCorrectInterface(): void
     public function testConstructWillThrowInvalidArgumentException(): void
     {
         $this->expectException('InvalidArgumentException');
-        $filter = new LogLevelFilter('app');
+        new LogLevelFilter('app');
     }
 
     public function testIsLoggableIsTrueWhenLevelIsEqual(): void

Tests/Handler/FileHandlerTest.php

@@ -24,7 +24,7 @@
 #[UsesClass(Level::class)]
 final class FileHandlerTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         if (file_exists('/tmp/testing.log')) {
             unlink('/tmp/testing.log');

Tests/Handler/StreamHandlerTest.php

@@ -24,7 +24,7 @@
 #[UsesClass(Level::class)]
 final class StreamHandlerTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         if (file_exists('/tmp/testing.log')) {
             unlink('/tmp/testing.log');

Tests/LoggerTest.php

@@ -28,9 +28,10 @@
 final class LoggerTest extends TestCase
 {
     private MockObject $enricher;
+
     private MockObject $handler;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->enricher = $this->createMock(EnricherInterface::class);
         $this->handler = $this->createMock(HandlerInterface::class);