diff --git a/composer.lock b/composer.lock
index 1d1e846e..75591c53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c10f21b01db899d9f7f49c4c08869a0c",
+ "content-hash": "dd63fffe59f6f41b7e195b18b10dc733",
"packages": [
{
"name": "brick/varexporter",
@@ -201,6 +201,59 @@
],
"time": "2024-01-19T12:39:49+00:00"
},
+ {
+ "name": "laminas/laminas-translator",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-translator.git",
+ "reference": "86d176c01a96b0ef205192b776cb69e8d4ca06b1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-translator/zipball/86d176c01a96b0ef205192b776cb69e8d4ca06b1",
+ "reference": "86d176c01a96b0ef205192b776cb69e8d4ca06b1",
+ "shasum": ""
+ },
+ "require": {
+ "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~2.5.0",
+ "vimeo/psalm": "^5.24.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Translator\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Interfaces for the Translator component of laminas-i18n",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "i18n",
+ "laminas"
+ ],
+ "support": {
+ "chat": "https://laminas.dev/chat",
+ "docs": "https://docs.laminas.dev/laminas-i18n/",
+ "forum": "https://discourse.laminas.dev",
+ "issues": "https://github.com/laminas/laminas-translator/issues",
+ "rss": "https://github.com/laminas/laminas-translator/releases.atom",
+ "source": "https://github.com/laminas/laminas-translator"
+ },
+ "funding": [
+ {
+ "url": "https://funding.communitybridge.org/projects/laminas-project",
+ "type": "community_bridge"
+ }
+ ],
+ "time": "2024-06-18T15:09:24+00:00"
+ },
{
"name": "nikic/php-parser",
"version": "v4.19.1",
@@ -1146,77 +1199,6 @@
],
"time": "2023-01-05T15:53:40+00:00"
},
- {
- "name": "laminas/laminas-i18n",
- "version": "dev-relax-sm-constraint",
- "source": {
- "type": "git",
- "url": "https://github.com/laminas/laminas-i18n.git",
- "reference": "b14f1fbe09a7d37e0ce075e2b12d8ea67dc9026b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/b14f1fbe09a7d37e0ce075e2b12d8ea67dc9026b",
- "reference": "b14f1fbe09a7d37e0ce075e2b12d8ea67dc9026b",
- "shasum": ""
- },
- "require": {
- "ext-intl": "*",
- "laminas/laminas-servicemanager": "^4.0",
- "laminas/laminas-stdlib": "^3.0",
- "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "conflict": {
- "laminas/laminas-view": "<2.20.0",
- "zendframework/zend-i18n": "*"
- },
- "suggest": {
- "laminas/laminas-cache": "You should install this package to cache the translations",
- "laminas/laminas-config": "You should install this package to use the INI translation format",
- "laminas/laminas-eventmanager": "You should install this package to use the events in the translator",
- "laminas/laminas-filter": "You should install this package to use the provided filters",
- "laminas/laminas-i18n-resources": "This package provides validator and captcha translations",
- "laminas/laminas-validator": "You should install this package to use the provided validators",
- "laminas/laminas-view": "You should install this package to use the provided view helpers"
- },
- "type": "library",
- "extra": {
- "laminas": {
- "component": "Laminas\\I18n",
- "config-provider": "Laminas\\I18n\\ConfigProvider"
- }
- },
- "autoload": {
- "psr-4": {
- "Laminas\\I18n\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Provide translations for your application, and filter and validate internationalized values",
- "homepage": "https://laminas.dev",
- "keywords": [
- "i18n",
- "laminas"
- ],
- "support": {
- "chat": "https://laminas.dev/chat",
- "docs": "https://docs.laminas.dev/laminas-i18n/",
- "forum": "https://discourse.laminas.dev",
- "issues": "https://github.com/laminas/laminas-i18n/issues",
- "rss": "https://github.com/laminas/laminas-i18n/releases.atom",
- "source": "https://github.com/laminas/laminas-i18n"
- },
- "funding": [
- {
- "url": "https://funding.communitybridge.org/projects/laminas-project",
- "type": "community_bridge"
- }
- ],
- "time": "2024-06-17T16:18:54+00:00"
- },
{
"name": "myclabs/deep-copy",
"version": "1.12.0",
@@ -1657,16 +1639,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "10.1.14",
+ "version": "10.1.15",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+ "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
- "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
+ "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
"shasum": ""
},
"require": {
@@ -1723,7 +1705,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15"
},
"funding": [
{
@@ -1731,7 +1713,7 @@
"type": "github"
}
],
- "time": "2024-03-12T15:33:41+00:00"
+ "time": "2024-06-29T08:25:15+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -3421,16 +3403,16 @@
},
{
"name": "symfony/console",
- "version": "v6.4.8",
+ "version": "v6.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91"
+ "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91",
- "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91",
+ "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
+ "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
"shasum": ""
},
"require": {
@@ -3495,7 +3477,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.4.8"
+ "source": "https://github.com/symfony/console/tree/v6.4.9"
},
"funding": [
{
@@ -3511,7 +3493,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-06-28T09:49:33+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3582,16 +3564,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v6.4.8",
+ "version": "v6.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3"
+ "reference": "b51ef8059159330b74a4d52f68e671033c0fe463"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3",
- "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/b51ef8059159330b74a4d52f68e671033c0fe463",
+ "reference": "b51ef8059159330b74a4d52f68e671033c0fe463",
"shasum": ""
},
"require": {
@@ -3628,7 +3610,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v6.4.8"
+ "source": "https://github.com/symfony/filesystem/tree/v6.4.9"
},
"funding": [
{
@@ -3644,7 +3626,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-06-28T09:49:33+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -4049,16 +4031,16 @@
},
{
"name": "symfony/string",
- "version": "v6.4.8",
+ "version": "v6.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
+ "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
- "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+ "url": "https://api.github.com/repos/symfony/string/zipball/76792dbd99690a5ebef8050d9206c60c59e681d7",
+ "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7",
"shasum": ""
},
"require": {
@@ -4115,7 +4097,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.4.8"
+ "source": "https://github.com/symfony/string/tree/v6.4.9"
},
"funding": [
{
@@ -4131,7 +4113,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-06-28T09:25:38+00:00"
},
{
"name": "theseer/tokenizer",
@@ -4409,9 +4391,7 @@
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": {
- "laminas/laminas-i18n": 20
- },
+ "stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 9b6262ef..bb956a92 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -119,7 +119,6 @@
cardLength[$type]]]>
options['type']]]>
options['type']]]>
-
options['type'][]]]>
@@ -373,9 +372,6 @@
-
-
-
@@ -1061,19 +1057,10 @@
-
-
-
-
-
-
-
-
-
@@ -1130,20 +1117,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
maxDepth]]>
@@ -1249,17 +1222,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -1304,10 +1266,6 @@
-
-
-
-
@@ -1317,10 +1275,6 @@
-
-
-
-
@@ -1391,9 +1345,6 @@
-
-
-
@@ -1407,9 +1358,6 @@
1]]]>
-
-
-
@@ -1710,9 +1658,6 @@
-
-
-
@@ -1735,9 +1680,6 @@
-
-
-
@@ -1804,17 +1746,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -1919,12 +1850,6 @@
-
-
-
-
-
-
diff --git a/src/ValidatorPluginManager.php b/src/ValidatorPluginManager.php
index 1dc6c308..16909e94 100644
--- a/src/ValidatorPluginManager.php
+++ b/src/ValidatorPluginManager.php
@@ -246,7 +246,7 @@ protected function injectTranslator(ContainerInterface $container, object $valid
if ($container->has('MvcTranslator')) {
$translator = $container->get('MvcTranslator');
- assert($translator instanceof Translator\TranslatorInterface);
+ assert($translator instanceof TranslatorInterface);
$validator->setTranslator($translator);
return;