cs: Update CS (#229)

theofidry · Apr 22, 2024 · 9bbed12 · 9bbed12
1 parent 37f0349
commit 9bbed12
Show file tree

Hide file tree

Showing 22 changed files with 169 additions and 187 deletions.
diff --git a/src/Input/DecoratesInput.php b/src/Input/DecoratesInput.php
@@ -52,7 +52,7 @@ public function hasParameterOption(array|string $values, bool $onlyParams = fals
 
  public function getParameterOption(
  array|string $values,
- null|array|bool|float|int|string $default = false,
+ array|bool|float|int|string|null $default = false,
  bool $onlyParams = false
  ): mixed {
  return $this->input->getParameterOption(...func_get_args());

diff --git a/src/Input/IO.php b/src/Input/IO.php
@@ -17,7 +17,7 @@
 use function class_alias;
 use function sprintf;
 
-$alias = \Fidry\Console\Input\IO::class;
+$alias = IO::class;
 $newClass = \Fidry\Console\IO::class;
 
 Deprecation::trigger(

diff --git a/src/Input/TypedInput.php b/src/Input/TypedInput.php
@@ -36,7 +36,7 @@ final class TypedInput
  * @psalm-suppress RedundantCondition
  */
  private function __construct(
- private readonly null|array|bool|string $value,
+ private readonly array|bool|string|null $value,
  private readonly string $label,
  ) {
  Assert::stringNotEmpty($label);
@@ -198,7 +198,7 @@ public function asNullableBackedEnum(
  /**
  * @return null|bool|string|list<string>
  */
- public function asRaw(?string $errorMessage = null): null|array|bool|string
+ public function asRaw(?string $errorMessage = null): array|bool|string|null
  {
  $type = TypeFactory::createTypeFromClassNames([
  \Fidry\Console\Internal\Type\RawType::class,
@@ -241,7 +241,7 @@ public function asBoolean(?string $errorMessage = null): bool
  public function asNullableBoolean(?string $errorMessage = null): ?bool
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\BooleanType::class,
  ]);
 
@@ -336,7 +336,7 @@ public function asNatural(?string $errorMessage = null): int
  public function asNullableNatural(?string $errorMessage = null): ?int
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\NaturalType::class,
  ]);
 
@@ -431,7 +431,7 @@ public function asPositiveInteger(?string $errorMessage = null): int
  public function asNullablePositiveInteger(?string $errorMessage = null): ?int
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\PositiveIntegerType::class,
  ]);
 
@@ -520,7 +520,7 @@ public function asFloat(?string $errorMessage = null): float
  public function asNullableFloat(?string $errorMessage = null): ?float
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\FloatType::class,
  ]);
 
@@ -609,7 +609,7 @@ public function asString(?string $errorMessage = null): string
  public function asNullableString(?string $errorMessage = null): ?string
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\StringType::class,
  ]);
 
@@ -704,7 +704,7 @@ public function asNonEmptyString(?string $errorMessage = null): string
  public function asNullableNonEmptyString(?string $errorMessage = null): ?string
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\NonEmptyStringType::class,
  ]);
 
@@ -793,7 +793,7 @@ public function asUntrimmedString(?string $errorMessage = null): string
  public function asNullableUntrimmedString(?string $errorMessage = null): ?string
  {
  $type = TypeFactory::createTypeFromClassNames([
- \Fidry\Console\Internal\Type\NullableType::class,
+ NullableType::class,
  \Fidry\Console\Internal\Type\UntrimmedStringType::class,
  ]);
 

diff --git a/src/Internal/InputAssert.php b/src/Internal/InputAssert.php
@@ -89,7 +89,7 @@ public static function assertIsValidOptionType(mixed $option, string $name): voi
  *
  * @psalm-assert scalar|null $value
  */
- public static function assertIsScalar(null|array|bool|string $value, string $label): void
+ public static function assertIsScalar(array|bool|string|null $value, string $label): void
  {
  self::castThrowException(
  static function () use ($value): void {
@@ -115,7 +115,7 @@ static function () use ($value): void {
  *
  * @psalm-assert list<string> $value
  */
- public static function assertIsList(null|array|bool|string $value, string $label): void
+ public static function assertIsList(array|bool|string|null $value, string $label): void
  {
  self::castThrowException(
  static function () use ($value): void {
@@ -145,7 +145,7 @@ static function () use ($value): void {
  *
  * @psalm-assert numeric $value
  */
- public static function numericString(null|array|bool|string $value, string $label): void
+ public static function numericString(array|bool|string|null $value, string $label): void
  {
  self::castThrowException(
  static function () use ($value, $label): void {
@@ -175,7 +175,7 @@ static function () use ($value, $label): void {
  *
  * @psalm-assert string $value
  */
- public static function integerString(null|array|bool|string $value, string $label): void
+ public static function integerString(array|bool|string|null $value, string $label): void
  {
  self::castThrowException(
  static function () use ($value, $label): void {
@@ -205,7 +205,7 @@ static function () use ($value, $label): void {
  *
  * @psalm-assert string $value
  */
- public static function string(null|array|bool|string $value, string $label): void
+ public static function string(array|bool|string|null $value, string $label): void
  {
  self::castThrowException(
  static function () use ($value, $label): void {
@@ -238,7 +238,7 @@ public static function castThrowException(callable $callable, string $label): vo
  /**
  * @param ArgumentInput|OptionInput $value
  */
- public static function castType(null|array|bool|string $value): string
+ public static function castType(array|bool|string|null $value): string
  {
  return var_export($value, true);
  }

diff --git a/src/Internal/Type/BackedEnumType.php b/src/Internal/Type/BackedEnumType.php
@@ -34,7 +34,7 @@ public function __construct(
  ) {
  }
 
- public function coerceValue(null|array|bool|string $value, string $label): BackedEnum
+ public function coerceValue(array|bool|string|null $value, string $label): BackedEnum
  {
  InputAssert::assertIsScalar($value, $label);
 
@@ -70,7 +70,7 @@ public function getPhpTypeDeclaration(): ?string
  /**
  * @return T
  */
- private function coerce(null|bool|string $value): BackedEnum
+ private function coerce(bool|string|null $value): BackedEnum
  {
  try {
  return $this->backedEnumClassName::from((int) $value);

diff --git a/src/Internal/Type/BooleanType.php b/src/Internal/Type/BooleanType.php
@@ -21,7 +21,7 @@
  */
 final class BooleanType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): bool
+ public function coerceValue(array|bool|string|null $value, string $label): bool
  {
  InputAssert::assertIsScalar($value, $label);
 

diff --git a/src/Internal/Type/FloatType.php b/src/Internal/Type/FloatType.php
@@ -20,7 +20,7 @@
  */
 final class FloatType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): float
+ public function coerceValue(array|bool|string|null $value, string $label): float
  {
  InputAssert::numericString($value, $label);
 

diff --git a/src/Internal/Type/InputType.php b/src/Internal/Type/InputType.php
@@ -26,7 +26,7 @@ interface InputType
  *
  * @return TypedValue
  */
- public function coerceValue(null|array|bool|string $value, string $label): mixed;
+ public function coerceValue(array|bool|string|null $value, string $label): mixed;
 
  /**
  * @return non-empty-list<class-string<InputType>>

diff --git a/src/Internal/Type/ListType.php b/src/Internal/Type/ListType.php
@@ -36,7 +36,7 @@ public function __construct(InputType $innerType)
  $this->innerType = $innerType;
  }
 
- public function coerceValue(null|array|bool|string $value, string $label): array
+ public function coerceValue(array|bool|string|null $value, string $label): array
  {
  InputAssert::assertIsList($value, $label);
 

diff --git a/src/Internal/Type/NaturalRangeType.php b/src/Internal/Type/NaturalRangeType.php
@@ -35,7 +35,7 @@ public function __construct(int $min, int $max)
  }
  }
 
- public function coerceValue(null|array|bool|string $value, string $label): int
+ public function coerceValue(array|bool|string|null $value, string $label): int
  {
  $intValue = (new NaturalType())->coerceValue($value, $label);
 

diff --git a/src/Internal/Type/NaturalType.php b/src/Internal/Type/NaturalType.php
@@ -25,7 +25,7 @@
  */
 final class NaturalType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): int
+ public function coerceValue(array|bool|string|null $value, string $label): int
  {
  InputAssert::integerString($value, $label);
 

diff --git a/src/Internal/Type/NonEmptyListType.php b/src/Internal/Type/NonEmptyListType.php
@@ -36,7 +36,7 @@ public function __construct(InputType $innerType)
  $this->innerType = $innerType;
  }
 
- public function coerceValue(null|array|bool|string $value, string $label): array
+ public function coerceValue(array|bool|string|null $value, string $label): array
  {
  $list = (new ListType($this->innerType))->coerceValue($value, $label);
 

diff --git a/src/Internal/Type/NonEmptyStringType.php b/src/Internal/Type/NonEmptyStringType.php
@@ -23,7 +23,7 @@
  */
 final class NonEmptyStringType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): string
+ public function coerceValue(array|bool|string|null $value, string $label): string
  {
  InputAssert::string($value, $label);
 

diff --git a/src/Internal/Type/NullOrNonEmptyStringType.php b/src/Internal/Type/NullOrNonEmptyStringType.php
@@ -18,7 +18,7 @@
  */
 final class NullOrNonEmptyStringType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): ?string
+ public function coerceValue(array|bool|string|null $value, string $label): ?string
  {
  $trimmedValue = (new StringType())->coerceValue($value, $label);
 

diff --git a/src/Internal/Type/NullableType.php b/src/Internal/Type/NullableType.php
@@ -32,7 +32,7 @@ public function __construct(InputType $innerType)
  $this->innerType = $innerType;
  }
 
- public function coerceValue(null|array|bool|string $value, string $label): mixed
+ public function coerceValue(array|bool|string|null $value, string $label): mixed
  {
  return null === $value
  ? $value

diff --git a/src/Internal/Type/PositiveIntegerType.php b/src/Internal/Type/PositiveIntegerType.php
@@ -21,7 +21,7 @@
  */
 final class PositiveIntegerType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): int
+ public function coerceValue(array|bool|string|null $value, string $label): int
  {
  $intValue = (new NaturalType())->coerceValue($value, $label);
 

diff --git a/src/Internal/Type/RawType.php b/src/Internal/Type/RawType.php
@@ -20,7 +20,7 @@
  */
 final class RawType implements InputType
 {
- public function coerceValue(null|array|bool|string $value, string $label): mixed
+ public function coerceValue(array|bool|string|null $value, string $label): mixed
  {
  /** @psalm-suppress NullableReturnStatement */
  return $value;

diff --git a/src/Internal/Type/StringChoiceType.php b/src/Internal/Type/StringChoiceType.php
@@ -34,7 +34,7 @@ public function __construct(array $choices)
  $this->choices = $choices;
  }
 
- public function coerceValue(null|array|bool|string $value, string $label): string
+ public function coerceValue(array|bool|string|null $value, string $label): string
  {
  $value = (new StringType())->coerceValue($value, $label);
 

diff --git a/src/Internal/Type/StringType.php b/src/Internal/Type/StringType.php
@@ -21,7 +21,7 @@
  */
 final class StringType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): string
+ public function coerceValue(array|bool|string|null $value, string $label): string
  {
  InputAssert::string($value, $label);
 

diff --git a/src/Internal/Type/UntrimmedStringType.php b/src/Internal/Type/UntrimmedStringType.php
@@ -20,7 +20,7 @@
  */
 final class UntrimmedStringType implements ScalarType
 {
- public function coerceValue(null|array|bool|string $value, string $label): string
+ public function coerceValue(array|bool|string|null $value, string $label): string
  {
  InputAssert::string($value, $label);
 

diff --git a/tests/IO/TypedInput.php b/tests/IO/TypedInput.php
@@ -22,29 +22,29 @@ final class TypedInput
  */
  public function __construct(
  public readonly bool|TypeException $boolean,
- public readonly null|bool|TypeException $nullableBoolean,
+ public readonly bool|TypeException|null $nullableBoolean,
  public readonly string|TypeException $string,
- public readonly null|string|TypeException $nullableString,
+ public readonly string|TypeException|null $nullableString,
  public readonly array|TypeException $stringArray,
  public readonly int|TypeException $integer,
- public readonly null|int|TypeException $nullableInteger,
+ public readonly int|TypeException|null $nullableInteger,
  public readonly array|TypeException $integerArray,
  public readonly float|TypeException $float,
- public readonly null|float|TypeException $nullableFloat,
+ public readonly float|TypeException|null $nullableFloat,
  public readonly array|TypeException $floatArray,
  ) {
  }
 
  public static function createForScalar(
  TypeException $arrayToScalarTypeException,
  bool|TypeException $boolean,
- null|bool|TypeException $nullableBoolean,
+ bool|TypeException|null $nullableBoolean,
  string|TypeException $string,
- null|string|TypeException $nullableString,
+ string|TypeException|null $nullableString,
  int|TypeException $integer,
- null|int|TypeException $nullableInteger,
+ int|TypeException|null $nullableInteger,
  float|TypeException $float,
- null|float|TypeException $nullableFloat,
+ float|TypeException|null $nullableFloat,
  ): self {
  return new self(
  $boolean,