General code cleanup (#28)

* Add .idea folder to .gitignore

* Remove useless concatenation

* Add phpunit cache directory to .gitignore

* Use iterable type instead of unnecessary checks

* Remove unnecessary null coalescing

If the return value is `null`, it will return `null` anyway. If the method doesn't exist, it will throw an `Error` because of the undefined method.

* Add typehint

* Merge meta properties in one go instead of in a loop

* Simplify control flow

* Use non-deprecated phpstan configuration value

* Add missing types

* Fix style with php-cs-fixer

* Add tests that satisfy the ArrayIterator branch

* Use is() for comparison in in()

* from(int|string), tryFrom(int|string)

---------

Co-authored-by: Samuel Štancl <[email protected]>

Author: xHeaven

.gitignore

@@ -4,5 +4,7 @@ composer.lock
 vendor/
 .php-cs-fixer.cache
 .vscode/
+.idea/
+.phpunit.cache/
 coverage/
 node_modules

phpstan.neon

@@ -25,5 +25,4 @@ parameters:
         #    paths:
         #        - tests/*
         # - '#should return \$this#'
-
-    checkMissingIterableValueType: false
+        - identifier: missingType.iterableValue

src/Comparable.php

@@ -4,10 +4,6 @@
 
 namespace ArchTech\Enums;
 
-use Exception;
-use Iterator;
-use IteratorAggregate;
-
 trait Comparable
 {
     public function is(mixed $enum): bool
@@ -20,30 +16,18 @@ public function isNot(mixed $enum): bool
         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;
             }
         }
 
         return false;
     }
 
-    public function notIn(array|object $enums): bool
+    public function notIn(iterable $enums): bool
     {
         return ! $this->in($enums);
     }

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 @@ public static function from(string $case): static
      *
      * 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 @@ public static function tryFrom(string $case): ?static
      */
     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);
     }
 
     /**

src/InvokableCases.php

@@ -15,7 +15,7 @@ public function __invoke()
     }
 
     /** 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();
 

src/Meta/Reflection.php

@@ -25,11 +25,12 @@ public static function metaProperties(mixed $enum): array
         // 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<object> $reflection */
@@ -51,6 +52,7 @@ protected static function parseMetaProperties(ReflectionClass $reflection): arra
     /**
      * Get the value of a meta property on the provided enum.
      *
+     * @param class-string<MetaProperty> $metaProperty
      * @param \Enum $enum
      */
     public static function metaValue(string $metaProperty, mixed $enum): mixed
@@ -73,6 +75,6 @@ public static function metaValue(string $metaProperty, mixed $enum): mixed
             return $properties[0]->value;
         }
 
-        return $metaProperty::defaultValue() ?? null;
+        return $metaProperty::defaultValue();
     }
 }

src/Metadata.php

@@ -30,7 +30,7 @@ public static function fromMeta(MetaProperty $metaProperty): static
         );
     }
 
-    public function __call(string $property, $arguments): mixed
+    public function __call(string $property, array $arguments): mixed
     {
         $metaProperties = Meta\Reflection::metaProperties($this);
 

src/Options.php

@@ -29,13 +29,11 @@ public static function stringOptions(?Closure $callback = null, string $glue = '
 
         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);
         }

tests/PHPStan/InvokableCases/InvokableCasesTestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ArchTech\Enums\Tests\PHPStan\InvokableCases;
 
 use PHPStan\Analyser\OutOfClassScope;

tests/PHPStan/InvokableCasesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use ArchTech\Enums\Tests\PHPStan\InvokableCases\InvokableCasesTestCase;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;