cleanup

Author: Brajk19

src/Attribute/RouteParamValue/AbstractValues.php

@@ -6,10 +6,15 @@
 
 abstract class AbstractValues implements ValuesInterface
 {
+    /**
+     * @return non-empty-list<?scalar>
+     */
+    abstract protected function getValues(): array;
+
     /**
      * {@inheritDoc}
      */
-    public function toArray(): array
+    final public function toArray(): array
     {
         return [
             'type' => static::type(),

src/Attribute/RouteParamValue/CompoundValues.php

@@ -6,13 +6,14 @@
 
 use Sofascore\PurgatoryBundle\Attribute\PurgeOn;
 use Sofascore\PurgatoryBundle\Exception\InvalidArgumentException;
+use Sofascore\PurgatoryBundle\Exception\RuntimeException;
 
-final class CompoundValues extends AbstractValues
+final class CompoundValues implements ValuesInterface
 {
     /**
      * @var non-empty-list<ValuesInterface>
      */
-    private readonly array $values;
+    public readonly array $values;
 
     /**
      * @param string|non-empty-list<string>|ValuesInterface $value
@@ -38,14 +39,6 @@ public function __construct(
         $this->values = $normalized;
     }
 
-    /**
-     * @return list<ValuesInterface>
-     */
-    public function getValues(): array
-    {
-        return $this->values;
-    }
-
     /**
      * {@inheritDoc}
      */

src/Attribute/RouteParamValue/DynamicValues.php

@@ -10,15 +10,15 @@ final class DynamicValues extends AbstractValues
      * @param string $alias Alias defined in {@see AsRouteParamService} attribute
      */
     public function __construct(
-        private readonly string $alias,
-        private readonly ?string $arg = null,
+        public readonly string $alias,
+        public readonly ?string $arg = null,
     ) {
     }
 
     /**
-     * @return list<?string>
+     * @return non-empty-list<?string>
      */
-    public function getValues(): array
+    protected function getValues(): array
     {
         return [$this->alias, $this->arg];
     }

src/Attribute/RouteParamValue/EnumValues.php

@@ -12,17 +12,17 @@ final class EnumValues extends AbstractValues
      * @param class-string<\BackedEnum> $enum
      */
     public function __construct(
-        private readonly string $enum,
+        public readonly string $enum,
     ) {
         if (!is_a($this->enum, \BackedEnum::class, true)) {
             throw new InvalidArgumentException('The argument must be a backed enum.');
         }
     }
 
     /**
-     * @return list<class-string<\BackedEnum>>
+     * @return non-empty-list<class-string<\BackedEnum>>
      */
-    public function getValues(): array
+    protected function getValues(): array
     {
         return [$this->enum];
     }

src/Attribute/RouteParamValue/ExpressionValues.php

@@ -9,7 +9,7 @@
 
 final class ExpressionValues extends AbstractValues
 {
-    private readonly Expression $expression;
+    public readonly Expression $expression;
 
     public function __construct(
         string|Expression $expression,
@@ -18,19 +18,11 @@ public function __construct(
     }
 
     /**
-     * @return list<Expression>
+     * @return non-empty-list<string>
      */
-    public function getValues(): array
+    protected function getValues(): array
     {
-        return [$this->expression];
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'type' => self::type(),
-            'values' => [(string) $this->expression],
-        ];
+        return [(string) $this->expression];
     }
 
     public static function type(): string

src/Attribute/RouteParamValue/PropertyValues.php

@@ -7,7 +7,7 @@
 final class PropertyValues extends AbstractValues
 {
     /** @var non-empty-list<string> */
-    private readonly array $properties;
+    public readonly array $properties;
 
     public function __construct(
         string $property,
@@ -19,7 +19,7 @@ public function __construct(
     /**
      * @return non-empty-list<string>
      */
-    public function getValues(): array
+    protected function getValues(): array
     {
         return $this->properties;
     }

src/Attribute/RouteParamValue/RawValues.php

@@ -7,7 +7,7 @@
 final class RawValues extends AbstractValues
 {
     /** @var non-empty-list<?scalar> */
-    private readonly array $values;
+    public readonly array $values;
 
     public function __construct(
         int|float|string|bool|null $value,
@@ -19,7 +19,7 @@ public function __construct(
     /**
      * @return non-empty-list<?scalar>
      */
-    public function getValues(): array
+    protected function getValues(): array
     {
         return $this->values;
     }

src/Attribute/RouteParamValue/ValuesInterface.php

@@ -6,11 +6,6 @@
 
 interface ValuesInterface
 {
-    /**
-     * @return list<mixed>
-     */
-    public function getValues(): array;
-
     /**
      * @return array{type: string, values: list<mixed>}
      */

src/Cache/PropertyResolver/InverseValuesBuilder/CompoundInverseValuesBuilder.php

@@ -30,7 +30,7 @@ public function build(ValuesInterface $values, string $associationClass, string
                 fn (ValuesInterface $values): ValuesInterface => $this->getInverseValuesBuilderFor($values)
                     ?->build($values, $associationClass, $associationTarget)
                     ?? $values,
-                $values->getValues(),
+                $values->values,
             ),
         );
     }

src/Cache/PropertyResolver/InverseValuesBuilder/DynamicInverseValuesBuilder.php

@@ -19,8 +19,8 @@ public static function for(): string
 
     public function build(ValuesInterface $values, string $associationClass, string $associationTarget): ValuesInterface
     {
-        /** @var string $alias */
-        [$alias, $arg] = $values->getValues();
+        $alias = $values->alias;
+        $arg = $values->arg;
 
         return new DynamicValues(
             alias: $alias,