Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions src/JsonSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
use EventEngine\JsonSchema\Type\EmailType;
use EventEngine\JsonSchema\Type\EnumType;
use EventEngine\JsonSchema\Type\FloatType;
use EventEngine\JsonSchema\Type\IntEnumType;
use EventEngine\JsonSchema\Type\IntType;
use EventEngine\JsonSchema\Type\ObjectType;
use EventEngine\JsonSchema\Type\StringEnumType;
use EventEngine\JsonSchema\Type\StringType;
use EventEngine\JsonSchema\Type\TypeRef;
use EventEngine\JsonSchema\Type\UnionType;
Expand Down Expand Up @@ -105,9 +107,20 @@ public static function boolean(): BoolType
return new BoolType();
}

public static function enum(array $entries): EnumType
public static function enum(array $entries, string $type = JsonSchema::TYPE_STRING): EnumType
{
return new EnumType(...$entries);
switch($type) {
case JsonSchema::TYPE_STRING:
$class = StringEnumType::class;
break;
case JsonSchema::TYPE_INT:
$class = IntEnumType::class;
break;
default:
$class = EnumType::class;
}

return new $class(...$entries);
}

public static function nullOr(Type $schema): Type
Expand Down
4 changes: 2 additions & 2 deletions src/Type/EnumType.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ class EnumType implements AnnotatedType
/**
* @var string|array
*/
private $type = JsonSchema::TYPE_STRING;
protected $type = JsonSchema::TYPE_STRING;

/**
* @var string[]
*/
private $entries;
protected $entries;

public function __construct(string ...$entries)
{
Expand Down
25 changes: 25 additions & 0 deletions src/Type/IntEnumType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

declare(strict_types=1);

namespace EventEngine\JsonSchema\Type;

use EventEngine\JsonSchema\JsonSchema;

class IntEnumType extends EnumType
{
/**
* @var string|array
*/
protected $type = JsonSchema::TYPE_INT;

/**
* @var int[]
*/
protected $entries;

public function __construct(int ...$entries)
{
$this->entries = $entries;
}
}
15 changes: 15 additions & 0 deletions src/Type/StringEnumType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

declare(strict_types=1);

namespace EventEngine\JsonSchema\Type;

use EventEngine\JsonSchema\JsonSchema;

class StringEnumType extends EnumType
{
/**
* @var string|array
*/
protected $type = JsonSchema::TYPE_STRING;
}
36 changes: 36 additions & 0 deletions tests/Type/EnumTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace EventEngineTest\JsonSchema\Type;

use EventEngine\JsonSchema\JsonSchema;
use EventEngine\JsonSchema\Type\EnumType;
use EventEngineTest\JsonSchema\BasicTestCase;

Expand Down Expand Up @@ -47,4 +48,39 @@ public function it_creates_nullable_enum_type()
$enumType->toArray()
);
}


/**
* @test
*/
public function it_creates_int_enum_type()
{
$enumType = JsonSchema::enum([0, 1], JsonSchema::TYPE_INT);

$this->assertEquals(
[
'type' => 'integer',
'enum' => [0, 1],
],
$enumType->toArray()
);
}


/**
* @test
*/
public function it_creates_int_nullable_enum_type()
{
$enumType = JsonSchema::enum([0, 1], JsonSchema::TYPE_INT)
->asNullable();

$this->assertEquals(
[
'type' => ['integer', 'null'],
'enum' => [0, 1, null]
],
$enumType->toArray()
);
}
}