Fix CI (#620)

arogachev · web-flow · commit 58b6be6671e3 · 2023-08-18T17:43:50.000+06:00
* Fix CI

* Fix Composer

* Apply Rector changes (CI)

* Separate build (phpunit) workflows

* Revert concurrency

* Fix Psalm

* Apply Rector changes (CI)

* Ignore merge plan in config

* Add tests for invalid configuration

---------

Co-authored-by: arogachev &lt;arogachev@users.noreply.github.com&gt;
diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
@@ -25,7 +25,7 @@ name: backwards compatibility
 
 jobs:
   roave_bc_check:
-    uses: yiisoft/actions/.github/workflows/bc.yml@master
+    uses: yiisoft/actions/.github/workflows/bc.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       os: >-
         ['ubuntu-latest']
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -24,7 +24,7 @@ name: build
 
 jobs:
   phpbench:
-    uses: yiisoft/actions/.github/workflows/phpbench.yml@master
+    uses: yiisoft/actions/.github/workflows/phpbench.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       os: >-
         ['ubuntu-latest', 'windows-latest']
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
       php: >-
         ['8.0', '8.1', '8.2']
   phpunit-without-intl:
-    uses: yiisoft/actions/.github/workflows/phpunit.yml@master
+    uses: yiisoft/actions/.github/workflows/phpunit.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       phpunitConfig: phpunit-without-intl.xml
       extensions: :intl
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -26,7 +26,7 @@ name: Composer require checker
 
 jobs:
   composer-require-checker:
-    uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master
+    uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       os: >-
         ['ubuntu-latest']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -22,7 +22,7 @@ name: mutation test
 
 jobs:
   mutation:
-    uses: yiisoft/actions/.github/workflows/roave-infection.yml@master
+    uses: yiisoft/actions/.github/workflows/roave-infection.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       min-covered-msi: 100
       os: >-
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -13,7 +13,7 @@ name: rector
 
 jobs:
   rector:
-    uses: yiisoft/actions/.github/workflows/rector.yml@master
+    uses: yiisoft/actions/.github/workflows/rector.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       os: >-
         ['ubuntu-latest']
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -24,7 +24,7 @@ name: static analysis
 
 jobs:
   psalm:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    uses: yiisoft/actions/.github/workflows/psalm.yml@48ade4ccb74825ff7f725afc17591572ecbe71c5
     with:
       os: >-
         ['ubuntu-latest']
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ phpunit.phar
 /phpunit.xml
 # phpunit cache
 .phpunit.result.cache
+
+/config/.merge-plan.php
diff --git a/composer.json b/composer.json
@@ -80,7 +80,8 @@
         "sort-packages": true,
         "allow-plugins": {
             "infection/extension-installer": true,
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "yiisoft/config": true
         }
     },
     "scripts": {
diff --git a/rector.php b/rector.php
@@ -4,7 +4,6 @@
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
-use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
 use Rector\Set\ValueObject\LevelSetList;
 
@@ -24,6 +23,5 @@
 
     $rectorConfig->skip([
         ClosureToArrowFunctionRector::class,
-        AddDefaultValueForUndefinedVariableRector::class,
     ]);
 };
diff --git a/src/Rule/AbstractNumber.php b/src/Rule/AbstractNumber.php
@@ -5,6 +5,7 @@
 namespace Yiisoft\Validator\Rule;
 
 use Closure;
+use InvalidArgumentException;
 use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -47,6 +48,12 @@ abstract class AbstractNumber implements
      */
     protected const DEFAULT_GREATER_THAN_MAX_MESSAGE = 'Value must be no greater than {max}.';
 
+    /**
+     * @var string The regular expression for matching numbers.
+     * @psalm-var non-empty-string
+     */
+    private string $pattern;
+
     /**
      * @param float|int|null $min Lower limit of the number. Defaults to `null`, meaning no lower limit. See
      * {@see $lessThanMinMessage} for the customized message used when the number is too small.
@@ -78,8 +85,7 @@ abstract class AbstractNumber implements
      * - `{attribute}`: the translated label of the attribute being validated.
      * - `{max}`: maximum value.
      * - `{value}`: actual value.
-     * @param string $pattern The regular expression for matching numbers. It defaults to a pattern that matches
-     * floating numbers with optional exponential part (e.g. -1.23e-10).
+     * @param string $pattern The regular expression for matching numbers.
      * @param bool|callable|null $skipOnEmpty Whether to skip this rule if the value validated is empty. See
      * {@see SkipOnEmptyInterface}.
      * @param bool $skipOnError Whether to skip this rule if any of the previous rules gave an error. See
@@ -95,11 +101,16 @@ public function __construct(
         private string $notNumberMessage,
         private string $lessThanMinMessage,
         private string $greaterThanMaxMessage,
-        private string $pattern,
+        string $pattern,
         private mixed $skipOnEmpty,
         private bool $skipOnError,
         private Closure|null $when,
     ) {
+        if ($pattern === '') {
+            throw new InvalidArgumentException('Pattern can\'t be empty.');
+        }
+
+        $this->pattern = $pattern;
     }
 
     /**
@@ -178,6 +189,7 @@ public function getGreaterThanMaxMessage(): string
      * The regular expression for matching numbers.
      *
      * @return string The regular expression.
+     * @psalm-return non-empty-string
      *
      * @see $pattern
      */
diff --git a/src/Rule/Email.php b/src/Rule/Email.php
@@ -6,6 +6,7 @@
 
 use Attribute;
 use Closure;
+use InvalidArgumentException;
 use RuntimeException;
 use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
@@ -31,6 +32,24 @@ final class Email implements RuleWithOptionsInterface, SkipOnErrorInterface, Whe
     use SkipOnErrorTrait;
     use WhenTrait;
 
+    /**
+     * @var string The regular expression used to validate the value. See
+     * {@link https://www.regular-expressions.info/email.html}.
+     * @psalm-var non-empty-string
+     */
+    private string $pattern;
+    /**
+     * @var string The regular expression used to validate email addresses with the name part. This property is used
+     * only when {@see $allowName} is `true`.
+     * @psalm-var non-empty-string
+     */
+    private string $fullPattern;
+    /**
+     * @var string The regular expression used to validate complex emails when {@see $enableIdn} is `true`.
+     * @psalm-var non-empty-string
+     */
+    private string $idnEmailPattern;
+
     /**
      * @param string $pattern The regular expression used to validate the value. See {@link https://www.regular-expressions.info/email.html}.
      * @param string $fullPattern The regular expression used to validate email addresses with the name part.
@@ -67,9 +86,9 @@ final class Email implements RuleWithOptionsInterface, SkipOnErrorInterface, Whe
      * not installed or not enabled.
      */
     public function __construct(
-        private string $pattern = '/^[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/',
-        private string $fullPattern = '/^[^@]*<[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?>$/',
-        private string $idnEmailPattern = '/^([a-zA-Z0-9._%+-]+)@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|\d{1,3})(\]?)$/',
+        string $pattern = '/^[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/',
+        string $fullPattern = '/^[^@]*<[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?>$/',
+        string $idnEmailPattern = '/^([a-zA-Z0-9._%+-]+)@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|\d{1,3})(\]?)$/',
         private bool $allowName = false,
         private bool $checkDns = false,
         private bool $enableIdn = false,
@@ -79,6 +98,24 @@ public function __construct(
         private bool $skipOnError = false,
         private Closure|null $when = null,
     ) {
+        if ($pattern === '') {
+            throw new InvalidArgumentException('Pattern can\'t be empty.');
+        }
+
+        $this->pattern = $pattern;
+
+        if ($fullPattern === '') {
+            throw new InvalidArgumentException('Full pattern can\'t be empty.');
+        }
+
+        $this->fullPattern = $fullPattern;
+
+        if ($idnEmailPattern === '') {
+            throw new InvalidArgumentException('IDN e-mail pattern can\'t be empty.');
+        }
+
+        $this->idnEmailPattern = $idnEmailPattern;
+
         if ($enableIdn && !function_exists('idn_to_ascii')) {
             // Tested via separate CI configuration (see ".github/workflows/build.yml").
             // @codeCoverageIgnoreStart
@@ -96,6 +133,7 @@ public function getName(): string
      * Get the regular expression used to validate the value.
      *
      * @return string The regular expression.
+     * @psalm-return non-empty-string
      *
      * @see $pattern
      */
@@ -108,6 +146,7 @@ public function getPattern(): string
      * Get the regular expression used to validate email addresses with the name part.
      *
      * @return string The regular expression.
+     * @psalm-return non-empty-string
      *
      * @see $fullPattern
      */
@@ -120,6 +159,7 @@ public function getFullPattern(): string
      * Get the regular expression used to validate complex emails when {@see $enableIdn} is `true`.
      *
      * @return string The regular expression.
+     * @psalm-return non-empty-string
      *
      * @see $idnEmailPattern
      */
diff --git a/src/Rule/IpHandler.php b/src/Rule/IpHandler.php
@@ -75,6 +75,7 @@ public function validate(mixed $value, object $rule, ValidationContext $context)
      * Used to get the Regexp pattern for initial IP address parsing.
      *
      * @return string Regular expression pattern.
+     * @psalm-return non-empty-string
      */
     private static function getIpParsePattern(): string
     {
diff --git a/src/Rule/Regex.php b/src/Rule/Regex.php
@@ -6,6 +6,7 @@
 
 use Attribute;
 use Closure;
+use InvalidArgumentException;
 use JetBrains\PhpStorm\Language;
 use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
@@ -31,6 +32,12 @@ final class Regex implements RuleWithOptionsInterface, SkipOnErrorInterface, Whe
     use SkipOnErrorTrait;
     use WhenTrait;
 
+    /**
+     * @var string The regular expression to be matched with.
+     * @psalm-var non-empty-string
+     */
+    private string $pattern;
+
     /**
      * @param string $pattern The regular expression to be matched with.
      * @param bool $not Whether to invert the validation logic. Defaults to `false`. If set to `true`, the regular
@@ -58,14 +65,19 @@ final class Regex implements RuleWithOptionsInterface, SkipOnErrorInterface, Whe
      */
     public function __construct(
         #[Language('RegExp')]
-        private string $pattern,
+        string $pattern,
         private bool $not = false,
         private string $incorrectInputMessage = 'The value must be a string.',
         private string $message = 'Value is invalid.',
         private mixed $skipOnEmpty = null,
         private bool $skipOnError = false,
         private Closure|null $when = null,
     ) {
+        if ($pattern === '') {
+            throw new InvalidArgumentException('Pattern can\'t be empty.');
+        }
+
+        $this->pattern = $pattern;
     }
 
     public function getName(): string
@@ -77,6 +89,7 @@ public function getName(): string
      * Get the regular expression to be matched with.
      *
      * @return string The regular expression.
+     * @psalm-return non-empty-string
      *
      * @see $pattern
      */
diff --git a/src/Rule/Url.php b/src/Rule/Url.php
@@ -6,6 +6,7 @@
 
 use Attribute;
 use Closure;
+use InvalidArgumentException;
 use RuntimeException;
 use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
@@ -34,6 +35,12 @@ final class Url implements RuleWithOptionsInterface, SkipOnErrorInterface, WhenI
     use SkipOnErrorTrait;
     use WhenTrait;
 
+    /**
+     * @var string The regular expression used to validate the value.
+     * @psalm-var non-empty-string
+     */
+    private string $pattern;
+
     /**
      * @param string $pattern The regular expression used to validate the value.
      * The pattern may contain a `{schemes}` token that will be replaced
@@ -69,7 +76,7 @@ final class Url implements RuleWithOptionsInterface, SkipOnErrorInterface, WhenI
      * @throws RuntimeException If intl extension is not enabled and {@see $enableIdn} is true.
      */
     public function __construct(
-        private string $pattern = '/^{schemes}:\/\/(([a-zA-Z0-9][a-zA-Z0-9_-]*)(\.[a-zA-Z0-9][a-zA-Z0-9_-]*)+)(?::\d{1,5})?([?\/#].*$|$)/',
+        string $pattern = '/^{schemes}:\/\/(([a-zA-Z0-9][a-zA-Z0-9_-]*)(\.[a-zA-Z0-9][a-zA-Z0-9_-]*)+)(?::\d{1,5})?([?\/#].*$|$)/',
         private array $validSchemes = ['http', 'https'],
         private bool $enableIdn = false,
         private string $incorrectInputMessage = 'The value must be a string.',
@@ -78,6 +85,16 @@ public function __construct(
         private bool $skipOnError = false,
         private Closure|null $when = null,
     ) {
+        $pattern = $this->preparePattern($pattern);
+        if ($pattern === '') {
+            throw new InvalidArgumentException('Pattern can\'t be empty.');
+        }
+
+        /**
+         * @psalm-var non-empty-string $pattern
+         */
+        $this->pattern = $pattern;
+
         if ($enableIdn && !function_exists('idn_to_ascii')) {
             // Tested via separate CI configuration (see ".github/workflows/build.yml").
             // @codeCoverageIgnoreStart
@@ -95,10 +112,13 @@ public function getName(): string
      * Get ready to use regular expression pattern applied for URL validation.
      *
      * @return string Regular expression pattern applied for URL validation.
+     * @psalm-return non-empty-string
+     *
+     * @see $pattern
      */
     public function getPattern(): string
     {
-        return str_replace('{schemes}', '((?i)' . implode('|', $this->validSchemes) . ')', $this->pattern);
+        return $this->pattern;
     }
 
     /**
@@ -177,4 +197,9 @@ public function getHandler(): string
     {
         return UrlHandler::class;
     }
+
+    private function preparePattern(string $pattern): string
+    {
+        return str_replace('{schemes}', '((?i)' . implode('|', $this->validSchemes) . ')', $pattern);
+    }
 }
diff --git a/tests/Rule/EmailTest.php b/tests/Rule/EmailTest.php
diff --git a/tests/Rule/NumberTest.php b/tests/Rule/NumberTest.php
diff --git a/tests/Rule/RegexTest.php b/tests/Rule/RegexTest.php
diff --git a/tests/Rule/UrlTest.php b/tests/Rule/UrlTest.php
