Skip to content

feat: add version property to Options class #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
babeuloula merged 1 commit into from
May 8, 2026
Merged

feat: add version property to Options class #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ final class Options
private const DEFAULT_WATERMARK_SCALE = 75;
private const DEFAULT_WATERMARK_OPACITY = 50;
private const DEFAULT_SIGNATURE = null;
private const DEFAULT_VERSION = null;

public function __construct(
public readonly ?int $width = self::DEFAULT_WIDTH,
Expand All @@ -33,6 +34,7 @@ public function __construct(
public readonly int $watermarkScale = self::DEFAULT_WATERMARK_SCALE,
public readonly int $watermarkOpacity = self::DEFAULT_WATERMARK_OPACITY,
public readonly ?string $signature = self::DEFAULT_SIGNATURE,
public readonly ?string $version = self::DEFAULT_VERSION,
) {
}

Expand All @@ -47,6 +49,7 @@ public function toArray(bool $withSignature = true): array
$options = [
'w' => $this->width,
'h' => $this->height,
'v' => $this->version,
];

if (true === $withSignature) {
Expand Down Expand Up @@ -97,6 +100,7 @@ public static function fromArray(array $options): self
(int) ($options['watermarkScale'] ?? $options['ws'] ?? $options['wat_scale'] ?? self::DEFAULT_WATERMARK_SCALE),
(int) ($options['watermarkOpacity'] ?? $options['wo'] ?? $options['wat_opacity'] ?? self::DEFAULT_WATERMARK_OPACITY),
$options[self::SIGNATURE_KEY] ?? self::DEFAULT_SIGNATURE,
$options['version'] ?? $options['v'] ?? self::DEFAULT_VERSION,
);
}
}
39 changes: 39 additions & 0 deletions tests/OptionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,43 @@ public function testFromArrayNormalizesStringDimensionsToInt(): void
self::assertSame(200, $options->width);
self::assertSame(100, $options->height);
}

public function testToArrayIncludesVersionWhenSet(): void
{
$result = (new Options(version: '2'))->toArray();
self::assertArrayHasKey('v', $result);
self::assertSame('2', $result['v']);
}

public function testToArrayExcludesVersionWhenNull(): void
{
$result = (new Options())->toArray();
self::assertArrayNotHasKey('v', $result);
}

public function testBuildQueryWithVersion(): void
{
self::assertSame('w=200&v=2', (new Options(200, version: '2'))->buildQuery(false));
}

public function testFromArrayWithVersionShortAlias(): void
{
$options = Options::fromArray(['v' => '2']);
self::assertSame('2', $options->version);
}

public function testFromArrayWithVersionLongAlias(): void
{
$options = Options::fromArray(['version' => '2']);
self::assertSame('2', $options->version);
}

public function testSetSignaturePreservesVersion(): void
{
$original = new Options(200, version: 'abc');
$new = $original->setSignature('xyz');

self::assertSame('abc', $new->version);
self::assertSame(200, $new->width);
}
}
Loading