Feature: updates to PHP 7.4 syntax (#22)

Author: Jason Adams

.github/workflows/phpstan.yml

@@ -20,7 +20,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '7.2'
+                    php-version: '7.4'
                     coverage: none
                     tools: composer:v2
 

composer.json

@@ -39,7 +39,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.2"
+            "php": "7.4"
         }
     },
     "repositories": [

phpstan.neon

@@ -3,7 +3,7 @@ includes:
 
 parameters:
     # Level 5 is a good balance between strictness and practicality
-    level: 5
+    level: 6
 
     # Paths to analyze
     paths:
@@ -20,7 +20,7 @@ parameters:
         # Add specific error patterns to ignore here if needed
 
     # PHP version (must be an integer)
-    phpVersion: 70200
+    phpVersion: 70400
 
     # Treat missing return types as mixed
     treatPhpDocTypesAsCertain: false

src/Config.php

@@ -48,7 +48,7 @@ class Config
      *
      * @param ContainerInterface $container
      */
-    public static function setServiceContainer($container)
+    public static function setServiceContainer($container): void
     {
         self::$container = $container;
     }
@@ -74,7 +74,7 @@ public static function getHookPrefix(): string
     /**
      * @since 1.0.0
      */
-    public static function setHookPrefix(string $prefix)
+    public static function setHookPrefix(string $prefix): void
     {
         self::$hookPrefix = $prefix;
     }
@@ -105,7 +105,7 @@ public static function getValidationExceptionClass(): string
      *
      * @param class-string<ValidationException> $validationExceptionClass
      */
-    public static function setValidationExceptionClass(string $validationExceptionClass)
+    public static function setValidationExceptionClass(string $validationExceptionClass): void
     {
         if (!is_a($validationExceptionClass, ValidationExceptionInterface::class, true)) {
             throw new RuntimeException(
@@ -142,7 +142,7 @@ public static function getInvalidArgumentExceptionClass(): string
      *
      * @param class-string<InvalidArgumentException> $invalidArgumentExceptionClass
      */
-    public static function setInvalidArgumentExceptionClass(string $invalidArgumentExceptionClass)
+    public static function setInvalidArgumentExceptionClass(string $invalidArgumentExceptionClass): void
     {
         if (!is_a($invalidArgumentExceptionClass, InvalidArgumentException::class, true)) {
             throw new RuntimeException(

src/Contracts/ValidatesOnFrontEnd.php

@@ -11,7 +11,7 @@ interface ValidatesOnFrontEnd
      *
      * @since 1.0.0
      *
-     * @return int|float|string|bool|array|null
+     * @return mixed
      */
     public function serializeOption();
 }

src/Contracts/ValidationRule.php

@@ -34,6 +34,11 @@ public static function fromString(?string $options = null): ValidationRule;
      * @since 1.2.0 add ExcludeValue return option
      * @since 1.0.0
      *
+     * @param mixed $value
+     * @param Closure $fail
+     * @param string $key
+     * @param array<string, mixed> $values
+     *
      * @return void|ExcludeValue|SkipValidationRules
      */
     public function __invoke($value, Closure $fail, string $key, array $values);

src/Rules/Abstracts/ConditionalRule.php

@@ -5,22 +5,22 @@
 namespace StellarWP\Validation\Rules\Abstracts;
 
 use StellarWP\FieldConditions\ComplexConditionSet;
+use StellarWP\FieldConditions\SimpleConditionSet;
 use StellarWP\FieldConditions\Contracts\Condition;
 use StellarWP\FieldConditions\Contracts\ConditionSet;
-use StellarWP\FieldConditions\SimpleConditionSet;
 use StellarWP\Validation\Config;
 use StellarWP\Validation\Contracts\ValidatesOnFrontEnd;
 use StellarWP\Validation\Contracts\ValidationRule;
 
 abstract class ConditionalRule implements ValidationRule, ValidatesOnFrontEnd
 {
     /**
-     * @var ConditionSet
+     * @var SimpleConditionSet|ComplexConditionSet
      */
-    protected $conditions;
+    protected ConditionSet $conditions;
 
     /**
-     * @param ConditionSet|Condition[] $conditions
+     * @param SimpleConditionSet|ComplexConditionSet|Condition[] $conditions
      */
     public function __construct($conditions)
     {

src/Rules/In.php

@@ -10,9 +10,9 @@
 class In implements ValidationRule, ValidatesOnFrontEnd
 {
     /**
-     * @var array
+     * @var array<mixed>
      */
-    protected $acceptedValues;
+    protected array $acceptedValues;
 
     /**
      * @since 1.2.0
@@ -24,6 +24,8 @@ public static function id(): string
 
     /**
      * @since 1.2.0
+     *
+     * @param mixed ...$acceptedValues
      */
     final public function __construct(...$acceptedValues)
     {
@@ -64,6 +66,8 @@ public function __invoke($value, Closure $fail, string $key, array $values)
 
     /**
      * @since 1.2.0
+     *
+     * @return array<mixed>
      */
     public function serializeOption(): array
     {

src/ServiceProvider.php

@@ -28,7 +28,10 @@
 
 class ServiceProvider
 {
-    private $validationRules = [
+    /**
+     * @var array<class-string>
+     */
+    private array $validationRules = [
         Required::class,
         Min::class,
         Max::class,
@@ -55,7 +58,7 @@ class ServiceProvider
     /**
      * Registers the validation rules registrar with the container
      */
-    public function register()
+    public function register(): void
     {
         Config::getServiceContainer()->singleton(ValidationRulesRegistrar::class, function () {
             $register = new ValidationRulesRegistrar();

src/ValidationRuleSet.php

@@ -15,17 +15,17 @@
 use StellarWP\Validation\Contracts\ValidationRule;
 use Traversable;
 
+/**
+ * @implements IteratorAggregate<int, ValidationRule|Closure>
+ */
 class ValidationRuleSet implements IteratorAggregate, JsonSerializable
 {
-    /**
-     * @var ValidationRulesRegistrar
-     */
-    private $register;
+    private ValidationRulesRegistrar $register;
 
     /**
      * @var array<int, ValidationRule|Closure>
      */
-    private $rules = [];
+    private array $rules = [];
 
     /**
      * @since 1.0.0
@@ -168,6 +168,8 @@ public function removeRuleWithId(string $id): self
      * Returns the validation rules.
      *
      * @since 1.0.0
+     *
+     * @return array<int, ValidationRule|Closure>
      */
     public function getRules(): array
     {