diff --git a/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/CircleCiConfigTest.php index 11b2490e4..d7e668206 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/CircleCiConfigTest.php @@ -43,7 +43,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -215,7 +217,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/web/modules/custom/sw_demo/js/-sw_demo.test.js b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/web/modules/custom/sw_demo/js/-sw_demo.test.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/web/modules/custom/sw_demo/js/-sw_demo.test.js b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/web/modules/custom/sw_demo/js/-sw_demo.test.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php index a5d166802..9341a1bf1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php @@ -44,7 +44,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -216,7 +218,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpmd_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpmd_circleci/tests/phpunit/CircleCiConfigTest.php index 1fe86e9ad..803963d64 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpmd_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpmd_circleci/tests/phpunit/CircleCiConfigTest.php @@ -47,7 +47,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -219,7 +221,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/CircleCiConfigTest.php index 416620280..eac87bae7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** diff --git a/composer.json b/composer.json index 0db563bc1..2023df050 100644 --- a/composer.json +++ b/composer.json @@ -29,15 +29,15 @@ "drupal/seckit": "^2.0.3", "drupal/shield": "^1.8", "drupal/stage_file_proxy": "^3.1.6", - "drupal/testmode": "^2.6", + "drupal/testmode": "^2.6.1", "drupal/xmlsitemap": "^2.0", - "drush/drush": "^13.7.1", + "drush/drush": "^13.7.2", "oomphinc/composer-installers-extender": "^2.0.1", "webflo/drupal-finder": "^1.3.1" }, "require-dev": { "behat/behat": "^3.30.0", - "dantleech/gherkin-lint": "^0.2.3", + "dantleech/gherkin-lint": "^0.2.4", "dealerdirect/phpcodesniffer-composer-installer": "^1.2.0", "drevops/behat-format-progress-fail": "^1.4", "drevops/behat-screenshot": "^2.2", @@ -48,17 +48,17 @@ "ergebnis/composer-normalize": "^2.50.0", "lullabot/mink-selenium2-driver": "^1.7.4", "lullabot/php-webdriver": "^2.0.7", - "mglaman/phpstan-drupal": "^2.0.12", + "mglaman/phpstan-drupal": "^2.0.13", "mikey179/vfsstream": "^1.6.12", "palantirnet/drupal-rector": "^0.21.1", "phpcompatibility/php-compatibility": "^10.0@alpha", "phpmd/phpmd": "^2.15", "phpspec/prophecy-phpunit": "^2.5", "phpstan/extension-installer": "^1.4.3", - "phpstan/phpstan": "^2.1.44", + "phpstan/phpstan": "^2.1.46", "phpunit/phpunit": "^11.5.55", "pyrech/composer-changelogs": "^2.2", - "rector/rector": "^2.3.9", + "rector/rector": "^2.4.0", "vincentlanglet/twig-cs-fixer": "^3.14" }, "conflict": { diff --git a/tests/phpunit/CircleCiConfigTest.php b/tests/phpunit/CircleCiConfigTest.php index 22dc50ce6..e73262d14 100644 --- a/tests/phpunit/CircleCiConfigTest.php +++ b/tests/phpunit/CircleCiConfigTest.php @@ -48,7 +48,9 @@ protected function setUp(): void { */ #[DataProvider('dataProviderDeployBranchRegex')] public function testDeployBranchRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][3]['deploy']['filters']['branches']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /** @@ -220,7 +222,9 @@ public static function dataProviderDeployBranchRegex(): \Iterator { */ #[DataProvider('dataProviderDeployTagRegex')] public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only'], $branch)); + $pattern = $this->config['workflows']['commit']['jobs'][4]['deploy-tags']['filters']['tags']['only']; + $result = preg_match($pattern, $branch); + $this->assertEquals($expected, $result); } /**