From 26770178249241191b66c5618671417bc0ffaeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ruz=CC=8Cevic=CC=81?= <ivan.ruzevic@infinum.com>
Date: Wed, 5 Jun 2024 08:57:13 +0200
Subject: [PATCH] release

---
 composer.json                 | 16 ++++++++--------
 phpcs.xml.dist                |  4 ++--
 phpstan.neon.dist             |  2 +-
 src/Blocks/AbstractBlocks.php |  4 ++--
 src/Cli/CliHelpers.php        |  2 +-
 src/Db/ExportCli.php          |  2 +-
 src/Db/ImportCli.php          |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index f191bea4d..7cd3eb865 100644
--- a/composer.json
+++ b/composer.json
@@ -29,17 +29,17 @@
 		"ext-json": "*",
 		"ext-libxml": "*",
 		"php-di/invoker": "^2.3.4",
-		"php-di/php-di": "^7"
+		"php-di/php-di": "^7.0.6"
 	},
 	"require-dev": {
-		"captainhook/captainhook": "^5.10",
-		"dealerdirect/phpcodesniffer-composer-installer": "^v1.0.0",
-		"infinum/eightshift-coding-standards": "2.0.0-beta",
-		"php-parallel-lint/php-parallel-lint": "^1.3",
-		"php-stubs/wordpress-stubs": "^6.3",
+		"captainhook/captainhook": "^5.23.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "v1.0.0",
+		"infinum/eightshift-coding-standards": "^3.0.0",
+		"php-parallel-lint/php-parallel-lint": "^v1.4.0",
+		"php-stubs/wordpress-stubs": "^v6.5.3",
 		"roave/security-advisories": "dev-master",
-		"szepeviktor/phpstan-wordpress": "^1.3",
-		"wp-cli/wp-cli": "^2.9"
+		"szepeviktor/phpstan-wordpress": "^v1.3.4",
+		"wp-cli/wp-cli": "^v2.10.0"
 	},
 	"autoload": {
 		"psr-4": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 3a0b5c964..0d541e2bc 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -67,7 +67,7 @@
 		<exclude-pattern>*/src/Init/plugin/</exclude-pattern>
 	</rule>
 
-	<rule ref="Eightshift.Security.ComponentsEscape.OutputNotEscaped">
+	<rule ref="Eightshift.Security.HelpersEscape.OutputNotEscaped">
 		<exclude-pattern>*/src/*/*Example.php</exclude-pattern>
 		<exclude-pattern>*/src/Init/theme/</exclude-pattern>
 		<exclude-pattern>*/src/Init/plugin/</exclude-pattern>
@@ -90,7 +90,7 @@
 	</rule>
 
 	<!-- Ignore unescaped exceptions. All Eightshift exceptions are escaped. -->
-	<rule ref="Eightshift.Security.ComponentsEscape.ExceptionNotEscaped">
+	<rule ref="Eightshift.Security.HelpersEscape.ExceptionNotEscaped">
 		<severity>0</severity>
 	</rule>
 
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 4c5b702d3..db3d37a04 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -17,4 +17,4 @@ parameters:
 	ignoreErrors:
 		# Ignore errors about reflection class variable being undefined. Errors are caught.
 		- '/^Variable \$reflectionClass might not be defined\.$/'
-	checkGenericClassInNonGenericObjectType: false
+		- identifier: missingType.generics
diff --git a/src/Blocks/AbstractBlocks.php b/src/Blocks/AbstractBlocks.php
index d547b80a3..88dcf1eea 100644
--- a/src/Blocks/AbstractBlocks.php
+++ b/src/Blocks/AbstractBlocks.php
@@ -202,7 +202,7 @@ public function render(array $attributes, string $innerBlockContent): string
 
 		// Get block wrapper view path.
 		if (Helpers::getConfigUseWrapper()) {
-			return Helpers::render( // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
+			return Helpers::render(
 				'wrapper',
 				$attributes,
 				'wrapper',
@@ -212,7 +212,7 @@ public function render(array $attributes, string $innerBlockContent): string
 			);
 		}
 
-		return $blockOutpout; // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
+		return $blockOutpout;
 	}
 
 	/**
diff --git a/src/Cli/CliHelpers.php b/src/Cli/CliHelpers.php
index 6ff874b49..13f350b87 100644
--- a/src/Cli/CliHelpers.php
+++ b/src/Cli/CliHelpers.php
@@ -43,7 +43,7 @@ public static function cliError(string $errorMessage): void
 			// @codeCoverageIgnoreStart
 			// Cannot test the exit.
 		} catch (ExitException $e) {
-			exit("{$e->getCode()}: {$e->getMessage()}"); // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
+			exit("{$e->getCode()}: {$e->getMessage()}"); // phpcs:ignore Eightshift.Security.HelpersEscape.OutputNotEscaped
 			// @codeCoverageIgnoreEnd
 		}
 	}
diff --git a/src/Db/ExportCli.php b/src/Db/ExportCli.php
index 1b2531d54..7cbdfc024 100644
--- a/src/Db/ExportCli.php
+++ b/src/Db/ExportCli.php
@@ -95,7 +95,7 @@ public function __invoke(array $args, array $assocArgs)
 				Helpers::getProjectPaths('projectRoot')
 			);
 		} catch (ExitException $e) {
-			exit("{$e->getCode()}: {$e->getMessage()}"); // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
+			exit("{$e->getCode()}: {$e->getMessage()}"); // phpcs:ignore Eightshift.Security.HelpersEscape.OutputNotEscaped
 		}
 	}
 }
diff --git a/src/Db/ImportCli.php b/src/Db/ImportCli.php
index a7fa0c8ed..862a8d99c 100644
--- a/src/Db/ImportCli.php
+++ b/src/Db/ImportCli.php
@@ -134,7 +134,7 @@ public function __invoke(array $args, array $assocArgs)
 				)
 			);
 		} catch (ExitException $e) {
-			exit("{$e->getCode()}: {$e->getMessage()}"); // phpcs:ignore Eightshift.Security.ComponentsEscape.OutputNotEscaped
+			exit("{$e->getCode()}: {$e->getMessage()}"); // phpcs:ignore Eightshift.Security.HelpersEscape.OutputNotEscaped
 		}
 	}
 }