chore: add FileSystem helper; cleanup

Author: roxblnfk

src/Proto/Frame/Http.php

@@ -37,7 +37,7 @@ public function __construct(
 
     public static function fromString(string $payload, \DateTimeImmutable $time): static
     {
-        $payload = \json_decode($payload, true, \JSON_THROW_ON_ERROR);
+        $payload = \json_decode($payload, true, 64, \JSON_THROW_ON_ERROR);
 
         $request = new ServerRequest(
             $payload['method'] ?? 'GET',

src/Proto/Frame/Smtp.php

@@ -27,8 +27,8 @@ public function __construct(
 
     public static function fromString(string $payload, \DateTimeImmutable $time): static
     {
+        $payload = \json_decode($payload, true, 64, \JSON_THROW_ON_ERROR);
         /** @var TArrayData $payload */
-        $payload = \json_decode($payload, true, \JSON_THROW_ON_ERROR);
         $message = Message\Smtp::fromArray($payload);
 
         return new self($message, $time);

src/Sender/BodyToFileSender.php

@@ -6,6 +6,7 @@
 
 use Buggregator\Trap\Proto\Frame;
 use Buggregator\Trap\Sender;
+use Buggregator\Trap\Support\FileSystem;
 use Buggregator\Trap\Support\StreamHelper;
 use Nyholm\Psr7\Stream;
 
@@ -23,9 +24,7 @@ public function __construct(
         string $path = 'runtime/body',
     ) {
         $this->path = \rtrim($path, '/\\');
-        if (!\is_dir($path) && !\mkdir($path, 0o777, true) && !\is_dir($path)) {
-            throw new \RuntimeException(\sprintf('Directory "%s" was not created', $path));
-        }
+        FileSystem::mkdir($path);
     }
 
     public function send(iterable $frames): void

src/Sender/EventsToFileSender.php

@@ -6,6 +6,7 @@
 
 use Buggregator\Trap\Proto\Frame;
 use Buggregator\Trap\Sender;
+use Buggregator\Trap\Support\FileSystem;
 
 /**
  * Store event groups to files.
@@ -21,9 +22,7 @@ public function __construct(
         string $path = 'runtime',
     ) {
         $this->path = \rtrim($path, '/\\');
-        if (!\is_dir($path) && !\mkdir($path, 0o777, true) && !\is_dir($path)) {
-            throw new \RuntimeException(\sprintf('Directory "%s" was not created', $path));
-        }
+        FileSystem::mkdir($path);
     }
 
     public function send(iterable $frames): void

src/Sender/MailToFileSender.php

@@ -7,6 +7,7 @@
 use Buggregator\Trap\Proto\Frame;
 use Buggregator\Trap\Proto\Frame\Smtp;
 use Buggregator\Trap\Sender;
+use Buggregator\Trap\Support\FileSystem;
 
 /**
  * @internal
@@ -17,12 +18,9 @@ class MailToFileSender implements Sender
 
     public function __construct(
         string $path = 'runtime/mail',
-    )
-    {
+    ) {
         $this->path = \rtrim($path, '/\\');
-        if (!\is_dir($path) && !\mkdir($path, 0o777, true) && !\is_dir($path)) {
-            throw new \RuntimeException(\sprintf('Directory "%s" was not created', $path));
-        }
+        FileSystem::mkdir($path);
     }
 
     public function send(iterable $frames): void
@@ -34,14 +32,12 @@ public function send(iterable $frames): void
             }
 
             foreach ($frame->message->getBcc() as $bcc) {
-                if (null === $bcc->email) {
+                if ($bcc->email === null) {
                     continue;
                 }
 
                 $path = $this->path . DIRECTORY_SEPARATOR . $bcc->email;
-                if (!\is_dir($path) && !\mkdir($path, 0o777, true) && !\is_dir($path)) {
-                    throw new \RuntimeException(\sprintf('Directory "%s" was not created', $path));
-                }
+                FileSystem::mkdir($path);
                 $filepath = \sprintf("%s/%s.json", $path, \date('Y-m-d-H-i-s-v'));
                 \assert(!\file_exists($filepath));
                 \file_put_contents($filepath, \json_encode($frame->message, \JSON_THROW_ON_ERROR));

src/Support/FileSystem.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buggregator\Trap\Support;
+
+/**
+ * @internal
+ * @psalm-internal Buggregator\Trap
+ */
+final class FileSystem
+{
+    public static function mkdir(string $path, int $mode = 0777, bool $recursive = true): void
+    {
+        \is_dir($path) or \mkdir($path, $mode, $recursive) or \is_dir($path) or throw new \RuntimeException(
+            \sprintf('Directory "%s" was not created.', $path),
+        );
+    }
+}

tests/Unit/Sender/MailToFileSenderTest.php

@@ -16,14 +16,6 @@ final class MailToFileSenderTest extends TestCase
 {
     private array $cleanupFolders = [];
 
-    protected function tearDown(): void
-    {
-        foreach ($this->cleanupFolders as $folder) {
-            \array_map('unlink', glob("$folder/*.*"));
-            \rmdir($folder);
-        }
-    }
-
     public function testForSmtp(): void
     {
         $this->cleanupFolders[] = $root = \sys_get_temp_dir() . DIRECTORY_SEPARATOR . \uniqid('trap_mail_');
@@ -48,11 +40,19 @@ public function testForSmtp(): void
         $this->assertRecipient("$root/user2@company.tld");
     }
 
+    protected function tearDown(): void
+    {
+        foreach ($this->cleanupFolders as $folder) {
+            \array_map('unlink', \glob("$folder/*.*"));
+            \rmdir($folder);
+        }
+    }
+
     private function assertRecipient(string $folder): void
     {
         self::assertTrue(\file_exists($folder));
         self::assertTrue(\is_dir($folder));
-        $files = glob("$folder/*.json");
+        $files = \glob("$folder/*.json");
         self::assertCount(1, $files);
         $arr = \json_decode(\file_get_contents($files[0]), true, \JSON_THROW_ON_ERROR);
         self::assertArrayHasKey('protocol', $arr);