Improved package

Author: Sebastian Fix

src/DTO/ConfigWithCredentials.php

@@ -17,9 +17,7 @@ public function __construct(
         public ?string $cacheDriver = null,
         public int $tokenTtlSeconds = 3600,
     ) {
-        if ($this->tokenTtlSeconds < 1) {
-            throw new InvalidArgumentException('Config [tokenTtlSeconds] must be at least 1 second.');
-        }
+        $this->tokenTtlSeconds = max(1, $this->tokenTtlSeconds);
     }
 
     /**
@@ -119,10 +117,6 @@ private static function optionalPositiveInt(array $data, string $key, int $defau
             throw new InvalidArgumentException("Config [{$key}] must be a positive integer.");
         }
 
-        if ($int < 1) {
-            throw new InvalidArgumentException("Config [{$key}] must be at least 1 second.");
-        }
-
-        return $int;
+        return max(1, $int);
     }
 }

src/DTO/DownloadedFile.php

@@ -21,10 +21,12 @@ public function __construct(
      */
     public static function fromArray(array $data): self
     {
+        $size = Arr::get($data, 'size');
+
         return new self(
             name: Arr::get($data, 'name'),
             extension: Arr::get($data, 'extension'),
-            size: Arr::get($data, 'size') !== null ? (int) Arr::get($data, 'size') : null,
+            size: $size !== null ? (int) $size : null,
             contentType: Arr::get($data, 'contentType'),
             content: Arr::get($data, 'content', ''),
         );

tests/Feature/Connectors/MFilesConnectorTest.php

@@ -6,6 +6,7 @@
 use CodebarAg\MFiles\DTO\ConfigWithCredentials;
 use CodebarAg\MFiles\Helpers\CacheKeyManager;
 use CodebarAg\MFiles\Requests\LogInToVaultRequest;
+use Illuminate\Support\Arr;
 use Saloon\Http\Faking\MockResponse;
 use Saloon\Laravel\Facades\Saloon;
 
@@ -54,7 +55,7 @@
 
     $headers = $connector->defaultHeaders();
 
-    expect($headers['X-Authentication'])->toBe($token);
+    expect(Arr::get($headers, 'X-Authentication'))->toBe($token);
     Saloon::assertSentCount(1);
 })->group('connectors');
 

tests/TestCase.php

@@ -3,6 +3,7 @@
 namespace CodebarAg\MFiles\Tests;
 
 use CodebarAg\MFiles\MFilesServiceProvider;
+use Illuminate\Support\Arr;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Saloon\Laravel\SaloonServiceProvider;
 
@@ -23,8 +24,8 @@ protected function getPackageProviders($app): array
 
     public function getEnvironmentSetUp($app): void
     {
-        $app['config']->set('database.default', 'sqlite');
-        $app['config']->set('database.connections.sqlite', [
+        Arr::get($app, 'config')->set('database.default', 'sqlite');
+        Arr::get($app, 'config')->set('database.connections.sqlite', [
             'driver' => 'sqlite',
             'database' => ':memory:',
             'prefix' => '',

tests/Unit/DTO/ConfigWithCredentialsFromArrayTest.php

@@ -50,26 +50,30 @@
     ]);
 })->throws(InvalidArgumentException::class, 'Config [url] must be a non-empty string.');
 
-test('fromArray rejects non positive tokenTtlSeconds', function () {
-    ConfigWithCredentials::fromArray([
+test('fromArray clamps tokenTtlSeconds below 1 to 1', function () {
+    $dto = ConfigWithCredentials::fromArray([
         'url' => 'https://a.test',
         'vaultGuid' => 'v',
         'username' => 'u',
         'password' => 'p',
         'tokenTtlSeconds' => 0,
     ]);
-})->throws(InvalidArgumentException::class, 'at least 1 second');
 
-test('constructor rejects tokenTtlSeconds below 1', function () {
-    new ConfigWithCredentials(
+    expect($dto->tokenTtlSeconds)->toBe(1);
+})->group('dto');
+
+test('constructor clamps tokenTtlSeconds below 1 to 1', function () {
+    $dto = new ConfigWithCredentials(
         url: 'https://a.test',
         vaultGuid: 'v',
         username: 'u',
         password: 'p',
         cacheDriver: null,
         tokenTtlSeconds: 0,
     );
-})->throws(InvalidArgumentException::class, 'Config [tokenTtlSeconds] must be at least 1 second.');
+
+    expect($dto->tokenTtlSeconds)->toBe(1);
+})->group('dto');
 
 test('fromArray treats empty cacheDriver as null', function () {
     $dto = ConfigWithCredentials::fromArray([

tests/Unit/DTO/MFilesErrorTest.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use CodebarAg\MFiles\DTO\MFilesError;
+use Illuminate\Support\Arr;
 
 it('creates instance with all properties', function () {
     $error = new MFilesError(
@@ -137,5 +138,5 @@
 
     $array = $error->toArray();
 
-    expect($array['stack'])->toBeNull();
+    expect(Arr::get($array, 'stack'))->toBeNull();
 });

tests/Unit/DTO/ObjectPropertiesTest.php

@@ -10,6 +10,7 @@
 use CodebarAg\MFiles\DTO\ObjectProperties;
 use CodebarAg\MFiles\Enums\MFDataTypeEnum;
 use CodebarAg\MFiles\Tests\TestCase;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 class ObjectPropertiesTest extends TestCase
@@ -221,15 +222,15 @@ public function test_to_array_returns_correct_structure_with_collections(): void
 
         $array = $objectProperties->toArray();
 
-        $this->assertEquals(2, $array['classId']);
-        $this->assertEquals(456, $array['objectId']);
-        $this->assertEquals(1, $array['objectTypeId']);
-        $this->assertEquals(2, $array['objectVersionId']);
-        $this->assertEquals('2023-01-01T10:00:00+00:00', $array['lastModifiedAt']);
-        $this->assertIsArray($array['properties']);
-        $this->assertIsArray($array['files']);
-        $this->assertEquals(1, count($array['properties']));
-        $this->assertEquals(1, count($array['files']));
+        $this->assertEquals(2, Arr::get($array, 'classId'));
+        $this->assertEquals(456, Arr::get($array, 'objectId'));
+        $this->assertEquals(1, Arr::get($array, 'objectTypeId'));
+        $this->assertEquals(2, Arr::get($array, 'objectVersionId'));
+        $this->assertEquals('2023-01-01T10:00:00+00:00', Arr::get($array, 'lastModifiedAt'));
+        $this->assertIsArray(Arr::get($array, 'properties'));
+        $this->assertIsArray(Arr::get($array, 'files'));
+        $this->assertEquals(1, count(Arr::get($array, 'properties', [])));
+        $this->assertEquals(1, count(Arr::get($array, 'files', [])));
     }
 
     public function test_properties_are_readonly(): void