Use arg names from rule constants in definitions

orisai · Jan 1, 2025 · e014ee2 · e014ee2
1 parent e9631c9
commit e014ee2
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 44 deletions.
diff --git a/src/Rules/ArrayEnumRule.php b/src/Rules/ArrayEnumRule.php
@@ -24,7 +24,7 @@
 final class ArrayEnumRule implements Rule
 {
 
-	private const
+	public const
 		Cases = 'cases',
 		UseKeys = 'useKeys',
 		AllowUnknown = 'allowUnknown';

diff --git a/src/Rules/ArrayEnumValue.php b/src/Rules/ArrayEnumValue.php
@@ -40,9 +40,9 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'cases' => $this->cases,
-			'useKeys' => $this->useKeys,
-			'allowUnknown' => $this->allowUnknown,
+			ArrayEnumRule::Cases => $this->cases,
+			ArrayEnumRule::UseKeys => $this->useKeys,
+			ArrayEnumRule::AllowUnknown => $this->allowUnknown,
 		];
 	}
 

diff --git a/src/Rules/ArrayOf.php b/src/Rules/ArrayOf.php
@@ -38,7 +38,7 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		$args = parent::getArgs();
-		$args['key'] = $this->key;
+		$args[ArrayOfRule::KeyRule] = $this->key;
 
 		return $args;
 	}

diff --git a/src/Rules/ArrayOfRule.php b/src/Rules/ArrayOfRule.php
@@ -26,7 +26,6 @@
 final class ArrayOfRule extends MultiValueRule
 {
 
-	/** @internal */
 	public const KeyRule = 'key';
 
 	public function resolveArgs(array $args, ArgsFieldContext $context): ArrayOfArgs

diff --git a/src/Rules/ArrayShape.php b/src/Rules/ArrayShape.php
@@ -35,7 +35,7 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'fields' => $this->fields,
+			ArrayShapeRule::Fields => $this->fields,
 		];
 	}
 

diff --git a/src/Rules/ArrayShapeRule.php b/src/Rules/ArrayShapeRule.php
@@ -26,7 +26,6 @@
 final class ArrayShapeRule implements Rule
 {
 
-	/** @internal */
 	public const Fields = 'fields';
 
 	public function resolveArgs(array $args, ArgsFieldContext $context): ArrayShapeArgs

diff --git a/src/Rules/BackedEnumRule.php b/src/Rules/BackedEnumRule.php
@@ -24,7 +24,7 @@
 final class BackedEnumRule implements Rule
 {
 
-	private const
+	public const
 		ClassName = 'class',
 		AllowUnknown = 'allowUnknown';
 

diff --git a/src/Rules/BackedEnumValue.php b/src/Rules/BackedEnumValue.php
@@ -31,8 +31,8 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'class' => $this->class,
-			'allowUnknown' => $this->allowUnknown,
+			BackedEnumRule::ClassName => $this->class,
+			BackedEnumRule::AllowUnknown => $this->allowUnknown,
 		];
 	}
 

diff --git a/src/Rules/BoolRule.php b/src/Rules/BoolRule.php
@@ -21,7 +21,7 @@
 final class BoolRule implements Rule
 {
 
-	private const CastBoolLike = 'castBoolLike';
+	public const CastBoolLike = 'castBoolLike';
 
 	private const CastMap = [
 		'true' => true,

diff --git a/src/Rules/BoolValue.php b/src/Rules/BoolValue.php
@@ -30,7 +30,7 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'castBoolLike' => $this->castBoolLike,
+			BoolRule::CastBoolLike => $this->castBoolLike,
 		];
 	}
 

diff --git a/src/Rules/CompoundDefinition.php b/src/Rules/CompoundDefinition.php
@@ -35,7 +35,7 @@ private function definitionsToRules(array $definitions): array
 	public function getArgs(): array
 	{
 		return [
-			'rules' => $this->rules,
+			CompoundRule::Rules => $this->rules,
 		];
 	}
 

diff --git a/src/Rules/CompoundRule.php b/src/Rules/CompoundRule.php
@@ -18,7 +18,6 @@
 abstract class CompoundRule implements Rule
 {
 
-	/** @internal */
 	public const Rules = 'rules';
 
 	public function resolveArgs(array $args, ArgsFieldContext $context): CompoundArgs

diff --git a/src/Rules/DateTimeRule.php b/src/Rules/DateTimeRule.php
@@ -33,7 +33,6 @@
 final class DateTimeRule implements Rule
 {
 
-	/** @internal */
 	public const
 		Format = 'format',
 		ClassName = 'class';

diff --git a/src/Rules/DateTimeValue.php b/src/Rules/DateTimeValue.php
@@ -42,8 +42,8 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'class' => $this->class,
-			'format' => $this->format,
+			DateTimeRule::ClassName => $this->class,
+			DateTimeRule::Format => $this->format,
 		];
 	}
 

diff --git a/src/Rules/FloatRule.php b/src/Rules/FloatRule.php
@@ -23,7 +23,6 @@
 final class FloatRule implements Rule
 {
 
-	/** @internal */
 	public const
 		Min = 'min',
 		Max = 'max',

diff --git a/src/Rules/FloatValue.php b/src/Rules/FloatValue.php
@@ -44,10 +44,10 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'min' => $this->min,
-			'max' => $this->max,
-			'unsigned' => $this->unsigned,
-			'castNumericString' => $this->castNumericString,
+			FloatRule::Min => $this->min,
+			FloatRule::Max => $this->max,
+			FloatRule::Unsigned => $this->unsigned,
+			FloatRule::CastNumericString => $this->castNumericString,
 		];
 	}
 

diff --git a/src/Rules/InstanceOfRule.php b/src/Rules/InstanceOfRule.php
@@ -21,7 +21,7 @@
 final class InstanceOfRule implements Rule
 {
 
-	private const Type = 'type';
+	public const Type = 'type';
 
 	public function resolveArgs(array $args, ArgsFieldContext $context): InstanceOfArgs
 	{

diff --git a/src/Rules/InstanceOfValue.php b/src/Rules/InstanceOfValue.php
@@ -34,7 +34,7 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'type' => $this->type,
+			InstanceOfRule::Type => $this->type,
 		];
 	}
 

diff --git a/src/Rules/IntRule.php b/src/Rules/IntRule.php
@@ -22,7 +22,6 @@
 final class IntRule implements Rule
 {
 
-	/** @internal */
 	public const
 		Min = 'min',
 		Max = 'max',

diff --git a/src/Rules/IntValue.php b/src/Rules/IntValue.php
@@ -44,10 +44,10 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'min' => $this->min,
-			'max' => $this->max,
-			'unsigned' => $this->unsigned,
-			'castNumericString' => $this->castNumericString,
+			IntRule::Min => $this->min,
+			IntRule::Max => $this->max,
+			IntRule::Unsigned => $this->unsigned,
+			IntRule::CastNumericString => $this->castNumericString,
 		];
 	}
 

diff --git a/src/Rules/MappedObjectRule.php b/src/Rules/MappedObjectRule.php
@@ -25,7 +25,7 @@
 final class MappedObjectRule implements Rule
 {
 
-	private const ClassName = 'class';
+	public const ClassName = 'class';
 
 	/** @var array<string, null> */
 	private array $alreadyResolved = [];

diff --git a/src/Rules/MappedObjectValue.php b/src/Rules/MappedObjectValue.php
@@ -35,7 +35,7 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'class' => $this->class,
+			MappedObjectRule::ClassName => $this->class,
 		];
 	}
 

diff --git a/src/Rules/MultiValueDefinition.php b/src/Rules/MultiValueDefinition.php
@@ -31,10 +31,10 @@ public function __construct(
 	public function getArgs(): array
 	{
 		return [
-			'item' => $this->item,
-			'minItems' => $this->minItems,
-			'maxItems' => $this->maxItems,
-			'mergeDefaults' => $this->mergeDefaults,
+			MultiValueRule::ItemRule => $this->item,
+			MultiValueRule::MinItems => $this->minItems,
+			MultiValueRule::MaxItems => $this->maxItems,
+			MultiValueRule::MergeDefaults => $this->mergeDefaults,
 		];
 	}
 

diff --git a/src/Rules/MultiValueRule.php b/src/Rules/MultiValueRule.php
@@ -9,7 +9,6 @@
 abstract class MultiValueRule implements Rule
 {
 
-	/** @internal */
 	public const
 		ItemRule = 'item',
 		MinItems = 'minItems',

diff --git a/src/Rules/NullRule.php b/src/Rules/NullRule.php
@@ -19,7 +19,7 @@
 final class NullRule implements Rule
 {
 
-	private const CastEmptyString = 'castEmptyString';
+	public const CastEmptyString = 'castEmptyString';
 
 	public function resolveArgs(array $args, ArgsFieldContext $context): NullArgs
 	{

diff --git a/src/Rules/NullValue.php b/src/Rules/NullValue.php
@@ -30,7 +30,7 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'castEmptyString' => $this->castEmptyString,
+			NullRule::CastEmptyString => $this->castEmptyString,
 		];
 	}
 

diff --git a/src/Rules/StringRule.php b/src/Rules/StringRule.php
@@ -20,7 +20,6 @@
 final class StringRule implements Rule
 {
 
-	/** @internal */
 	public const
 		Pattern = 'pattern',
 		MinLength = 'minLength',

diff --git a/src/Rules/StringValue.php b/src/Rules/StringValue.php
@@ -44,10 +44,10 @@ public function getType(): string
 	public function getArgs(): array
 	{
 		return [
-			'pattern' => $this->pattern,
-			'minLength' => $this->minLength,
-			'maxLength' => $this->maxLength,
-			'notEmpty' => $this->notEmpty,
+			StringRule::Pattern => $this->pattern,
+			StringRule::MinLength => $this->minLength,
+			StringRule::MaxLength => $this->maxLength,
+			StringRule::NotEmpty => $this->notEmpty,
 		];
 	}