diff --git a/.gitignore b/.gitignore index a683006..f58ae8f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,7 @@ composer.lock vendor/ .php-cs-fixer.cache .vscode/ +.idea/ +.phpunit.cache/ coverage/ node_modules diff --git a/phpstan.neon b/phpstan.neon index 3fd1979..b4b7b9e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -25,5 +25,4 @@ parameters: # paths: # - tests/* # - '#should return \$this#' - - checkMissingIterableValueType: false + - identifier: missingType.iterableValue diff --git a/src/Comparable.php b/src/Comparable.php index c655912..deca592 100644 --- a/src/Comparable.php +++ b/src/Comparable.php @@ -4,10 +4,6 @@ declare(strict_types=1); namespace ArchTech\Enums; -use Exception; -use Iterator; -use IteratorAggregate; - trait Comparable { public function is(mixed $enum): bool @@ -20,22 +16,10 @@ trait Comparable return ! $this->is($enum); } - public function in(array|object $enums): bool + public function in(iterable $enums): bool { - $iterator = $enums; - - if (! is_array($enums)) { - if ($enums instanceof Iterator) { - $iterator = $enums; - } elseif ($enums instanceof IteratorAggregate) { - $iterator = $enums->getIterator(); - } else { - throw new Exception('in() expects an iterable value'); - } - } - - foreach ($iterator as $item) { - if ($item === $this) { + foreach ($enums as $item) { + if ($this->is($item)) { return true; } } @@ -43,7 +27,7 @@ trait Comparable return false; } - public function notIn(array|object $enums): bool + public function notIn(iterable $enums): bool { return ! $this->in($enums); } diff --git a/src/From.php b/src/From.php index 2ac8853..8d75946 100644 --- a/src/From.php +++ b/src/From.php @@ -15,7 +15,7 @@ trait From * * @throws ValueError */ - public static function from(string $case): static + public static function from(int|string $case): static { return static::fromName($case); } @@ -25,7 +25,7 @@ trait From * * This will not override the `tryFrom()` method on BackedEnums */ - public static function tryFrom(string $case): ?static + public static function tryFrom(int|string $case): ?static { return static::tryFromName($case); } @@ -37,7 +37,7 @@ trait From */ public static function fromName(string $case): static { - return static::tryFromName($case) ?? throw new ValueError('"' . $case . '" is not a valid name for enum ' . static::class . ''); + return static::tryFromName($case) ?? throw new ValueError('"' . $case . '" is not a valid name for enum ' . static::class); } /** diff --git a/src/InvokableCases.php b/src/InvokableCases.php index b5a2150..5ba92fd 100644 --- a/src/InvokableCases.php +++ b/src/InvokableCases.php @@ -15,7 +15,7 @@ trait InvokableCases } /** Return the enum's value or name when it's called ::STATICALLY(). */ - public static function __callStatic($name, $args) + public static function __callStatic(string $name, array $args) { $cases = static::cases(); diff --git a/src/Meta/Reflection.php b/src/Meta/Reflection.php index 929ac61..18fe88a 100644 --- a/src/Meta/Reflection.php +++ b/src/Meta/Reflection.php @@ -25,11 +25,12 @@ class Reflection // Traits except the `Metadata` trait $traits = array_values(array_filter($reflection->getTraits(), fn (ReflectionClass $class) => $class->getName() !== 'ArchTech\Enums\Metadata')); - foreach ($traits as $trait) { - $metaProperties = array_merge($metaProperties, static::parseMetaProperties($trait)); - } + $traitsMeta = array_map( + fn (ReflectionClass $trait) => static::parseMetaProperties($trait), + $traits + ); - return $metaProperties; + return array_merge($metaProperties, ...$traitsMeta); } /** @param ReflectionClass $reflection */ @@ -51,6 +52,7 @@ class Reflection /** * Get the value of a meta property on the provided enum. * + * @param class-string $metaProperty * @param \Enum $enum */ public static function metaValue(string $metaProperty, mixed $enum): mixed @@ -73,6 +75,6 @@ class Reflection return $properties[0]->value; } - return $metaProperty::defaultValue() ?? null; + return $metaProperty::defaultValue(); } } diff --git a/src/Metadata.php b/src/Metadata.php index 9232e94..69d6036 100644 --- a/src/Metadata.php +++ b/src/Metadata.php @@ -30,7 +30,7 @@ trait Metadata ); } - public function __call(string $property, $arguments): mixed + public function __call(string $property, array $arguments): mixed { $metaProperties = Meta\Reflection::metaProperties($this); diff --git a/src/Options.php b/src/Options.php index 25e141f..0692ed6 100644 --- a/src/Options.php +++ b/src/Options.php @@ -29,13 +29,11 @@ trait Options if ($firstCase === null) { return ''; - } elseif ($firstCase instanceof BackedEnum) { - // [name => value] - $options = static::options(); - } else { - // [name, name] - $options = static::options(); + } + // [name, name] + $options = static::options(); + if (! $firstCase instanceof BackedEnum) { // [name => name, name => name] $options = array_combine($options, $options); } diff --git a/tests/PHPStan/InvokableCases/InvokableCasesTestCase.php b/tests/PHPStan/InvokableCases/InvokableCasesTestCase.php index ae04874..1b45773 100644 --- a/tests/PHPStan/InvokableCases/InvokableCasesTestCase.php +++ b/tests/PHPStan/InvokableCases/InvokableCasesTestCase.php @@ -1,5 +1,7 @@ is(Status::PENDING))->toBeTrue(); expect(Status::PENDING->is(Status::DONE))->toBeFalse(); @@ -23,6 +25,11 @@ it('the in method checks for presence in an array', function () { expect(Status::PENDING->in([Status::PENDING, Status::DONE]))->toBeTrue(); expect(Role::ADMIN->in([Role::ADMIN]))->toBeTrue(); + $iterator = new ArrayIterator([Status::PENDING, Status::DONE]); + expect(Status::PENDING->in($iterator))->toBeTrue(); + expect(Status::DONE->in($iterator))->toBeTrue(); + expect(Status::PENDING->in(new ArrayIterator([Role::ADMIN, Role::GUEST])))->toBeFalse(); + expect(Status::PENDING->in([Status::DONE]))->toBeFalse(); expect(Status::PENDING->in([Role::ADMIN, Role::GUEST]))->toBeFalse(); }); diff --git a/tests/Pest/FromTest.php b/tests/Pest/FromTest.php index af9605a..229e510 100644 --- a/tests/Pest/FromTest.php +++ b/tests/Pest/FromTest.php @@ -1,5 +1,7 @@ expect(Status::from(0)) ->toBe(Status::PENDING); diff --git a/tests/Pest/InvokableCasesTest.php b/tests/Pest/InvokableCasesTest.php index 6dd5b8a..bd50805 100644 --- a/tests/Pest/InvokableCasesTest.php +++ b/tests/Pest/InvokableCasesTest.php @@ -1,5 +1,7 @@ color())->toBe('indigo'); expect(Role::GUEST->color())->toBe('gray'); diff --git a/tests/Pest/NamesTest.php b/tests/Pest/NamesTest.php index ec39e3f..4c51e88 100644 --- a/tests/Pest/NamesTest.php +++ b/tests/Pest/NamesTest.php @@ -1,5 +1,7 @@ expect(Status::names()) ->toBe(['PENDING', 'DONE']); diff --git a/tests/Pest/OptionsTest.php b/tests/Pest/OptionsTest.php index dda6086..e1220ed 100644 --- a/tests/Pest/OptionsTest.php +++ b/tests/Pest/OptionsTest.php @@ -1,5 +1,7 @@ expect(Status::options())->toBe([ 'PENDING' => 0, diff --git a/tests/Pest/TraitTest.php b/tests/Pest/TraitTest.php index 43730aa..6bbcae5 100644 --- a/tests/Pest/TraitTest.php +++ b/tests/Pest/TraitTest.php @@ -1,5 +1,7 @@ expect(Status::values()) ->toBe([0, 1]); diff --git a/tests/TestCase.php b/tests/TestCase.php index bb466c9..3edb27c 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -1,5 +1,7 @@