diff --git a/composer.json b/composer.json index b9db3f9..cfff27d 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,11 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^v3.15.1", - "phpstan/phpstan": "^1.10.47", + "phpstan/phpstan": "^1.10.48", "phpstan/phpstan-strict-rules": "^1.5.2", "phpstan/phpstan-phpunit": "^1.3.15", "phpstan/phpstan-deprecation-rules": "^1.1.4", - "phpunit/phpunit": "^10.5.1", + "phpunit/phpunit": "^10.5.2", "symfony/var-dumper": "^6.4.0" }, "autoload": { diff --git a/src/Enum/Hasser.php b/src/Enum/Hasser.php index 7ee3128..287576c 100644 --- a/src/Enum/Hasser.php +++ b/src/Enum/Hasser.php @@ -45,12 +45,8 @@ public static function hasName(string $name): bool */ public static function hasValue(int|string $value): bool { - if (!(new ReflectionEnum(static::class))->isBacked()) { - return false; - } - foreach (static::cases() as $enum) { - if ($enum->value === $value) { /* @phpstan-ignore-line */ + if ($enum?->value === $value) { /* @phpstan-ignore-line */ return true; } } @@ -65,12 +61,8 @@ public static function hasValue(int|string $value): bool */ public static function hasCase(string $name, int|string $value): bool { - if (!(new ReflectionEnum(static::class))->isBacked()) { - return false; - } - foreach (static::cases() as $enum) { - if ($enum->name === $name && $enum->value === $value) { /* @phpstan-ignore-line */ + if ($enum?->name === $name && $enum?->value === $value) { /* @phpstan-ignore-line */ return true; } } diff --git a/src/Enum/Info.php b/src/Enum/Info.php index 9da224b..b6c5d31 100644 --- a/src/Enum/Info.php +++ b/src/Enum/Info.php @@ -14,7 +14,7 @@ trait Info { public static function isBacked(): bool { - return (new ReflectionEnum(static::class))->isBacked(); + return (new ReflectionEnum(static::class))->isBacked(); /* @phpstan-ignore-line */ } public static function isNotBacked(): bool diff --git a/src/Error/CloakTest.php b/src/Error/CloakTest.php index 61eda5e..0cf96ab 100644 --- a/src/Error/CloakTest.php +++ b/src/Error/CloakTest.php @@ -82,7 +82,7 @@ public function testErrorTransformedIntoARuntimeException(): void $touch('/foo'); } - public function testErrorTransformedIntoAnInvalidArgumentException(): void + public function testErrorTransformedIntoAnErrorException(): void { Cloak::throwOnError(); $this->expectException(ErrorException::class); @@ -96,14 +96,14 @@ public function testSpecificBehaviourOverrideGeneralErrorSetting(): void $this->expectNotToPerformAssertions(); Cloak::throwOnError(); - $touch = Cloak::userDeprecated(touch(...), Cloak::SILENT); + $touch = Cloak::warning(touch(...), Cloak::SILENT); $touch('/foo'); } public function testCaptureNothingThrowNoException(): void { Cloak::throwOnError(); - $strtoupper = Cloak::notice(strtoupper(...)); + $strtoupper = Cloak::userDeprecated(strtoupper(...)); self::assertSame('FOO', $strtoupper('foo')); }