diff --git a/composer.json b/composer.json index 5ac3740e..f6b60292 100644 --- a/composer.json +++ b/composer.json @@ -38,18 +38,18 @@ "laminas/laminas-stdlib": "^3.0" }, "require-dev": { - "laminas/laminas-cache": "^3.12.0", + "laminas/laminas-cache": "^3.12.1", "laminas/laminas-cache-storage-adapter-memory": "^2.3.0", "laminas/laminas-cache-storage-deprecated-factory": "^1.2", "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-config": "^3.9.0", "laminas/laminas-eventmanager": "^3.13", "laminas/laminas-filter": "^2.34", - "laminas/laminas-validator": "^2.46", - "laminas/laminas-view": "^2.33", - "phpunit/phpunit": "^10.5.5", + "laminas/laminas-validator": "^2.49", + "laminas/laminas-view": "^2.34", + "phpunit/phpunit": "^10.5.11", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.18.0" + "vimeo/psalm": "^5.22.2" }, "conflict": { "laminas/laminas-view": "<2.20.0", diff --git a/composer.lock b/composer.lock index 30bb58be..c95d3752 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": "56e7f00e6b348add4961eea6340664c2", + "content-hash": "9129d7ae3d95b36893a4e28a7b325447", "packages": [ { "name": "laminas/laminas-servicemanager", @@ -98,16 +98,16 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.18.0", + "version": "3.19.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" + "reference": "6a192dd0882b514e45506f533b833b623b78fff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", - "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6a192dd0882b514e45506f533b833b623b78fff3", + "reference": "6a192dd0882b514e45506f533b833b623b78fff3", "shasum": "" }, "require": { @@ -118,10 +118,10 @@ }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.14", - "phpunit/phpunit": "^10.3.3", + "phpbench/phpbench": "^1.2.15", + "phpunit/phpunit": "^10.5.8", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15.0" + "vimeo/psalm": "^5.20.0" }, "type": "library", "autoload": { @@ -153,7 +153,7 @@ "type": "community_bridge" } ], - "time": "2023-09-19T10:15:21+00:00" + "time": "2024-01-19T12:39:49+00:00" }, { "name": "psr/container", @@ -877,16 +877,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -926,7 +926,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -934,20 +934,20 @@ "type": "github" } ], - "time": "2023-09-17T21:38:23+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "laminas/laminas-cache", - "version": "3.12.0", + "version": "3.12.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-cache.git", - "reference": "66cf9a209163cadc65d93483667b995c5ead1563" + "reference": "bf8bc7f92e15925991c46079c6cd727372af5a46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/66cf9a209163cadc65d93483667b995c5ead1563", - "reference": "66cf9a209163cadc65d93483667b995c5ead1563", + "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/bf8bc7f92e15925991c46079c6cd727372af5a46", + "reference": "bf8bc7f92e15925991c46079c6cd727372af5a46", "shasum": "" }, "require": { @@ -1035,7 +1035,7 @@ "type": "community_bridge" } ], - "time": "2023-11-06T18:52:54+00:00" + "time": "2024-01-19T20:42:11+00:00" }, { "name": "laminas/laminas-cache-storage-adapter-memory", @@ -1559,16 +1559,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.46.0", + "version": "2.49.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329" + "reference": "d58c2e7d3cd420554400dd8cca694fafa3b8e45f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/98330256f8d8a1357a93f6f7f1a987036aff6329", - "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/d58c2e7d3cd420554400dd8cca694fafa3b8e45f", + "reference": "d58c2e7d3cd420554400dd8cca694fafa3b8e45f", "shasum": "" }, "require": { @@ -1582,16 +1582,16 @@ }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "laminas/laminas-db": "^2.18", - "laminas/laminas-filter": "^2.33", - "laminas/laminas-i18n": "^2.24.1", - "laminas/laminas-session": "^2.17", + "laminas/laminas-db": "^2.19", + "laminas/laminas-filter": "^2.34", + "laminas/laminas-i18n": "^2.26.0", + "laminas/laminas-session": "^2.18", "laminas/laminas-uri": "^2.11.0", - "phpunit/phpunit": "^10.5.2", + "phpunit/phpunit": "^10.5.10", "psalm/plugin-phpunit": "^0.18.4", "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.17" + "vimeo/psalm": "^5.22.1" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -1639,20 +1639,20 @@ "type": "community_bridge" } ], - "time": "2024-01-03T12:43:04+00:00" + "time": "2024-02-22T16:46:06+00:00" }, { "name": "laminas/laminas-view", - "version": "2.33.0", + "version": "2.34.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-view.git", - "reference": "9b34f34eb69e839f4cbd64495c199c593565f166" + "reference": "53136a59622c8809c519b29dbbaa346aa39e834a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-view/zipball/9b34f34eb69e839f4cbd64495c199c593565f166", - "reference": "9b34f34eb69e839f4cbd64495c199c593565f166", + "url": "https://api.github.com/repos/laminas/laminas-view/zipball/53136a59622c8809c519b29dbbaa346aa39e834a", + "reference": "53136a59622c8809c519b29dbbaa346aa39e834a", "shasum": "" }, "require": { @@ -1674,24 +1674,24 @@ "zendframework/zend-view": "*" }, "require-dev": { - "laminas/laminas-authentication": "^2.15", + "laminas/laminas-authentication": "^2.16", "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-feed": "^2.22", - "laminas/laminas-filter": "^2.32", + "laminas/laminas-filter": "^2.34", "laminas/laminas-http": "^2.19", - "laminas/laminas-i18n": "^2.23.1", + "laminas/laminas-i18n": "^2.26.0", "laminas/laminas-modulemanager": "^2.15", - "laminas/laminas-mvc": "^3.6.1", - "laminas/laminas-mvc-i18n": "^1.7", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.9", - "laminas/laminas-navigation": "^2.18.1", - "laminas/laminas-paginator": "^2.17", + "laminas/laminas-mvc": "^3.7.0", + "laminas/laminas-mvc-i18n": "^1.8", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.10.1", + "laminas/laminas-navigation": "^2.19.1", + "laminas/laminas-paginator": "^2.18.1", "laminas/laminas-permissions-acl": "^2.16", "laminas/laminas-router": "^3.12.0", "laminas/laminas-uri": "^2.11", - "phpunit/phpunit": "^10.4.2", + "phpunit/phpunit": "^10.5.9", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15" + "vimeo/psalm": "^5.20" }, "suggest": { "laminas/laminas-authentication": "Laminas\\Authentication component", @@ -1739,7 +1739,7 @@ "type": "community_bridge" } ], - "time": "2024-01-03T14:59:52+00:00" + "time": "2024-01-25T11:26:39+00:00" }, { "name": "myclabs/deep-copy", @@ -1802,16 +1802,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -1822,7 +1822,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -1847,9 +1847,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "nikic/php-parser", @@ -2550,16 +2550,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.7", + "version": "10.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8" + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5c5b397a95cb0db013270a985726fcae93e61b8", - "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", "shasum": "" }, "require": { @@ -2631,7 +2631,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.7" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11" }, "funding": [ { @@ -2647,7 +2647,7 @@ "type": "tidelift" } ], - "time": "2024-01-14T16:40:30+00:00" + "time": "2024-02-25T14:05:00+00:00" }, { "name": "psalm/plugin-phpunit", @@ -3938,16 +3938,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "96be97e664c87613121d073ea39af4c74e57a7f8" + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/96be97e664c87613121d073ea39af4c74e57a7f8", - "reference": "96be97e664c87613121d073ea39af4c74e57a7f8", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab", + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab", "shasum": "" }, "require": { @@ -3985,7 +3985,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.2" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.3" }, "funding": [ { @@ -3997,20 +3997,20 @@ "type": "github" } ], - "time": "2023-11-14T14:08:51+00:00" + "time": "2024-02-07T10:39:02+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.1", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", "shasum": "" }, "require": { @@ -4077,20 +4077,20 @@ "type": "open_collective" } ], - "time": "2024-01-11T20:47:48+00:00" + "time": "2024-02-16T15:06:51+00:00" }, { "name": "symfony/console", - "version": "v6.4.2", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", - "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { @@ -4155,7 +4155,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.2" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -4171,7 +4171,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4242,16 +4242,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", "shasum": "" }, "require": { @@ -4285,7 +4285,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.0" + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" }, "funding": [ { @@ -4301,20 +4301,20 @@ "type": "tidelift" } ], - "time": "2023-07-26T17:27:13+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -4328,9 +4328,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4367,7 +4364,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -4383,20 +4380,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -4407,9 +4404,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4448,7 +4442,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -4464,20 +4458,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -4488,9 +4482,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4532,7 +4523,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -4548,20 +4539,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -4575,9 +4566,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4615,7 +4603,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -4631,7 +4619,7 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/service-contracts", @@ -4717,16 +4705,16 @@ }, { "name": "symfony/string", - "version": "v6.4.2", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { @@ -4783,7 +4771,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.2" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -4799,7 +4787,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-02-01T13:16:41+00:00" }, { "name": "theseer/tokenizer", @@ -4853,16 +4841,16 @@ }, { "name": "vimeo/psalm", - "version": "5.19.0", + "version": "5.22.2", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b" + "reference": "d768d914152dbbf3486c36398802f74e80cfde48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/06b71be009a6bd6d81b9811855d6629b9fe90e1b", - "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48", + "reference": "d768d914152dbbf3486c36398802f74e80cfde48", "shasum": "" }, "require": { @@ -4885,7 +4873,7 @@ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "nikic/php-parser": "^4.16", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", - "sebastian/diff": "^4.0 || ^5.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" @@ -4959,7 +4947,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-01-09T21:02:43+00:00" + "time": "2024-02-22T23:39:07+00:00" }, { "name": "webimpress/coding-standard", diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 5f098dca..94b2f0b0 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,8 +1,8 @@ - + - ExtensionNotLoadedException + @@ -11,7 +11,7 @@ options]]> - string + options['locale']]]> @@ -20,46 +20,46 @@ - $value + - $allowWhiteSpaceOrOptions - $allowWhiteSpaceOrOptions + + - (bool) $flag + - $value + - (int) $style - (int) $type + + - $moduleManager + - ModuleManager + - (bool) $flag + - $originalStringTable[$offsetKey] - $originalStringTable[$sizeKey] - $translationStringTable[$offsetKey] - $translationStringTable[$sizeKey] + + + + file]]> @@ -71,33 +71,33 @@ file, 4 * $num))]]> - int + - $file - $littleEndian + + - $originalStringOffset - $originalStringSize + + - $translationStringOffset - $translationStringSize + + - $originalStringOffset - $originalStringSize - $translationStringOffset - $translationStringSize + + + + - int + - $content + @@ -106,15 +106,15 @@ - $messages[array_shift($message)] + - $list + - $messages[array_shift($message)] + - is_array($messages) + @@ -125,7 +125,7 @@ - include $fromIncludePath + @@ -143,14 +143,14 @@ - validatePlugin + - $plugin - $plugin + + - validatePlugin + @@ -161,7 +161,7 @@ - LoaderPluginManagerFactory + creationOptions]]> @@ -171,34 +171,34 @@ - $options + - $container + - $id + - null + - $id + - registerRightInfixSymbol + - $currentPos - $currentToken - $string + + + - static::$parser === null + - int + - (int) $number + - new static($numPlurals, $ast) + @@ -294,23 +294,23 @@ nullDenotationGetter === null]]> - Symbol - Symbol + + - $function($this) - $function($this, $left) + + - $first - $leftDenotationGetter - $nullDenotationGetter - $second - $third + + + + + - callable - callable + + @@ -318,33 +318,26 @@ getPluralRule()]]> - getNumPlurals - getNumPlurals + + - $message === null - $message === null - is_array($options) + + + - - $messagesLoaded - - - loadMessagesFromFiles($textDomain, $locale)]]> - loadMessagesFromPatterns($textDomain, $locale)]]> - - $r - $r + + - $events - $pluginManager + + - $cacheId + @@ -352,7 +345,7 @@ - $loaderType + @@ -362,8 +355,8 @@ - array_shift($locales) - array_shift($locales) + + @@ -403,22 +396,22 @@ remote[$textDomain][]]]> - $file - $file - $last - $last - $loaderType - $pattern - $pattern - $remote + + + + + + + + - string|null + - merge - merge - merge + + + @@ -428,76 +421,76 @@ messages[$textDomain][$locale][$textDomain . "\x04" . $message]]]> - evaluate + - $cacheId + - $translation[$index] !== null + - new static() + - hasTranslator - setTranslatorEnabled + + - $this - $this + + - TranslatorServiceFactory + get('TranslatorPluginManager')]]> - $trConfig + - $config - $trConfig + + - (bool) $allowWhiteSpace - (bool) $allowWhiteSpace + + - INVALID - STRING_EMPTY + + - $filter + - is_string($value) + formatter->getTimezone()]]> - $value + getDateType()]]> getTimeType()]]> - getCalendar + @@ -507,7 +500,7 @@ - is_bool($strict) + - $locale + @@ -530,51 +523,51 @@ - static::$phone[$code] + >}|false]]> - static::$phone[$code] + - $this|string[] + - (bool) $possible + - getService - setService + + - $format - $format + + - $format[0] - $format[strlen($format) - 1] + + - $format + - $format - $format + + - $value - $value + + - (bool) $enabled + @@ -582,16 +575,16 @@ locale === null]]> - $currencyCode - $currencyPattern - $locale + + + - (bool) $showDecimals - (string) $locale + + - $pattern !== null + @@ -599,14 +592,14 @@ locale === null]]> - $locale - $timezone + + - $date + - (string) $locale + @@ -616,35 +609,35 @@ formatType]]> - $decimals - $formatStyle - $formatType - $locale + + + + - $value + - $textAttribute + - $value + - (int) $formatStyle - (int) $formatType - (string) $locale + + + - $decimals !== null + - string + - $strings[$pluralIndex] + @@ -652,118 +645,118 @@ toArray()]]> - HelperConfig + - array + - $factory - $target + + - $alias - $name + + - $factory - $target + + - \Zend\I18n\View\Helper\CurrencyFormat - \Zend\I18n\View\Helper\DateFormat - \Zend\I18n\View\Helper\NumberFormat - \Zend\I18n\View\Helper\Plural - \Zend\I18n\View\Helper\Translate - \Zend\I18n\View\Helper\TranslatePlural + + + + + + - HelperConfig + - detectProvider - localeToCountryCodeDataProvider + + - returnUnfilteredDataProvider + - returnUnfilteredDataProvider + - formattedToNumberProvider - numberToFormattedProvider - returnUnfilteredDataProvider + + + - formatNonNumberProvider - formattedToNumberProvider + + - getParam + - getParam + - getEvent + - getEvent + - addServiceManager + - addServiceManager + - assertNotNull + - evaluate - evaluate - evaluate - evaluate + + + + - evaluate - evaluate - evaluate - evaluate + + + + - evaluate - evaluate - evaluate - evaluate + + + + @@ -776,10 +769,10 @@ testFilesDir . '/translation_en.php']]> - evaluate - evaluate - evaluate - evaluate + + + + testFilesDir . '/translation_empty.php']]> @@ -789,33 +782,33 @@ - provideLoader + - $container + - completeRuleProvider - parseRuleProvider + + - $filename - $locale + + - evaluate - evaluate - evaluate - evaluate - getNumPlurals - getNumPlurals - getNumPlurals + + + + + + + @@ -833,44 +826,44 @@ ['test' => $loader]])]]> - null - null - null - null + + + + - invalidStringProvider - mixedDataProvider + + - basicProvider + - $value + - floatAndIntegerProvider - lookAlikeProvider - validationFailureProvider + + + - intDataProvider - setStrictInvalidParameterDataProvider - strictIntDataProvider + + + - constructDataProvider - numbersDataProvider + + @@ -878,39 +871,39 @@ - UKPostCodesDataProvider - liPostCode - postCodesDataProvider + + + - $currencyPattern + - currencyProvider + - dateTestsDataProvider - dateTestsDataProviderWithPattern + + - new IntlGregorianCalendar(2013, 6, 1) + - $decimals + - currencyTestsDataProvider + - pluralsTestProvider + diff --git a/src/Filter/Alnum.php b/src/Filter/Alnum.php index 84752d15..cdef4788 100644 --- a/src/Filter/Alnum.php +++ b/src/Filter/Alnum.php @@ -74,7 +74,7 @@ public function getAllowWhiteSpace() * Returns $value as string with all non-alphanumeric characters removed * * @param mixed $value - * @return ($value is scalar|list ? string|list : mixed) + * @return string|list|mixed */ public function filter($value) { diff --git a/src/Filter/Alpha.php b/src/Filter/Alpha.php index 0e579d6f..a06afffa 100644 --- a/src/Filter/Alpha.php +++ b/src/Filter/Alpha.php @@ -18,7 +18,7 @@ class Alpha extends Alnum * Returns the string $value, removing all but alphabetic characters * * @param mixed $value - * @return ($value is scalar|list ? string|list : mixed) + * @return ($value is scalar ? string : ($value is list ? list : mixed)) */ public function filter($value) { diff --git a/src/Translator/Loader/AbstractFileLoader.php b/src/Translator/Loader/AbstractFileLoader.php index 1f23d9c1..e7e4ae2d 100644 --- a/src/Translator/Loader/AbstractFileLoader.php +++ b/src/Translator/Loader/AbstractFileLoader.php @@ -71,7 +71,7 @@ protected function resolveFile($filename) protected function resolveViaIncludePath($filename) { $resolvedIncludePath = stream_resolve_include_path($filename); - if (! $resolvedIncludePath || ! is_file($resolvedIncludePath) || ! is_readable($resolvedIncludePath)) { + if ($resolvedIncludePath === false || ! is_file($resolvedIncludePath) || ! is_readable($resolvedIncludePath)) { return false; } return $resolvedIncludePath; diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.php index 6a494d8c..eb8e8ea8 100644 --- a/src/Translator/Loader/Gettext.php +++ b/src/Translator/Loader/Gettext.php @@ -50,7 +50,7 @@ class Gettext extends AbstractFileLoader public function load($locale, $filename) { $resolvedFile = $this->resolveFile($filename); - if (! $resolvedFile) { + if ($resolvedFile === false) { throw new Exception\InvalidArgumentException(sprintf( 'Could not find or open file %s for reading', $filename diff --git a/src/Translator/LoaderPluginManagerFactory.php b/src/Translator/LoaderPluginManagerFactory.php index 2711e037..ea2c8a46 100644 --- a/src/Translator/LoaderPluginManagerFactory.php +++ b/src/Translator/LoaderPluginManagerFactory.php @@ -33,7 +33,7 @@ class LoaderPluginManagerFactory implements FactoryInterface */ public function __invoke(ContainerInterface $container, $name, ?array $options = null) { - $options = $options ?: []; + $options = $options ?? []; $pluginManager = new LoaderPluginManager($container, $options); // If this is in a laminas-mvc application, the ServiceListener will inject diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php index db4ada0e..597d2395 100644 --- a/src/Translator/Translator.php +++ b/src/Translator/Translator.php @@ -345,7 +345,7 @@ public function getPluginManager() */ public function translate($message, $textDomain = 'default', $locale = null) { - $locale = $locale ?: $this->getLocale(); + $locale = $locale ?? $this->getLocale(); $translation = $this->getTranslatedMessage($message, $locale, $textDomain); if ($translation !== null && $translation !== '') { @@ -380,7 +380,7 @@ public function translatePlural( $textDomain = 'default', $locale = null ) { - $locale = $locale ?: $this->getLocale(); + $locale = $locale ?? $this->getLocale(); $translation = $this->getTranslatedMessage($singular, $locale, $textDomain); if (is_string($translation)) { @@ -492,7 +492,7 @@ public function addTranslationFile( $textDomain = 'default', $locale = null ) { - $locale = $locale ?: '*'; + $locale = $locale ?? '*'; if (! isset($this->files[$textDomain])) { $this->files[$textDomain] = []; @@ -604,12 +604,12 @@ protected function loadMessages($textDomain, $locale) } } - $messagesLoaded = false; - $messagesLoaded |= $this->loadMessagesFromRemote($textDomain, $locale); - $messagesLoaded |= $this->loadMessagesFromPatterns($textDomain, $locale); - $messagesLoaded |= $this->loadMessagesFromFiles($textDomain, $locale); + $messagesLoaded = 0; + $messagesLoaded |= (int) $this->loadMessagesFromRemote($textDomain, $locale); + $messagesLoaded |= (int) $this->loadMessagesFromPatterns($textDomain, $locale); + $messagesLoaded |= (int) $this->loadMessagesFromFiles($textDomain, $locale); - if (! $messagesLoaded) { + if ($messagesLoaded === 0) { $discoveredTextDomain = null; if ($this->isEventManagerEnabled()) { $until = static fn($r): bool => $r instanceof TextDomain; @@ -628,10 +628,9 @@ protected function loadMessages($textDomain, $locale) } $this->messages[$textDomain][$locale] = $discoveredTextDomain; - $messagesLoaded = true; } - if ($messagesLoaded && $cache !== null) { + if ($cache !== null) { $cache->setItem($cacheId, $this->messages[$textDomain][$locale]); } } @@ -754,7 +753,7 @@ protected function loadMessagesFromFiles($textDomain, $locale) */ public function getAllMessages($textDomain = 'default', $locale = null) { - $locale = $locale ?: $this->getLocale(); + $locale = $locale ?? $this->getLocale(); if (! isset($this->messages[$textDomain][$locale])) { $this->loadMessages($textDomain, $locale); diff --git a/src/Validator/IsFloat.php b/src/Validator/IsFloat.php index 6c142563..fb337f44 100644 --- a/src/Validator/IsFloat.php +++ b/src/Validator/IsFloat.php @@ -171,7 +171,11 @@ public function isValid($value) $decSeparatorPosition = $this->wrapper->strpos($value, $decSeparator); //We have separators, and they are flipped. i.e. 2.000,000 for en-US - if ($groupSeparatorPosition && $decSeparatorPosition && $groupSeparatorPosition > $decSeparatorPosition) { + if ( + $groupSeparatorPosition !== false + && $decSeparatorPosition !== false + && $groupSeparatorPosition > $decSeparatorPosition + ) { $this->error(self::NOT_FLOAT); return false; @@ -195,7 +199,8 @@ public function isValid($value) '/' ) . ']{0,3}'; - $suffix = $formatter->getTextAttribute(NumberFormatter::NEGATIVE_SUFFIX) + $suffix = $formatter->getTextAttribute(NumberFormatter::NEGATIVE_SUFFIX); + $suffix = $suffix !== false ? '[' . preg_quote( $formatter->getTextAttribute(NumberFormatter::POSITIVE_SUFFIX) @@ -238,7 +243,8 @@ public function isValid($value) // No strrpos() in wrappers yet. ICU 4.x doesn't have grouping size for // everything. ICU 52 has 3 for ALL locales. - $groupSize = $formatter->getAttribute(NumberFormatter::GROUPING_SIZE) ?: 3; + $groupSize = $formatter->getAttribute(NumberFormatter::GROUPING_SIZE); + $groupSize = $groupSize === false ? 3 : $groupSize; assert(is_int($groupSize)); $lastStringGroup = $this->wrapper->strlen($value) > $groupSize ? $this->wrapper->substr($value, 0 - $groupSize) : diff --git a/src/Validator/PostCode.php b/src/Validator/PostCode.php index 64138028..e89b13de 100644 --- a/src/Validator/PostCode.php +++ b/src/Validator/PostCode.php @@ -345,7 +345,7 @@ public function isValid($value) $service = $this->getService(); $locale = $this->getLocale(); $format = $this->getFormat(); - if ((null === $format || '' === $format) && ! empty($locale)) { + if (($format === null || $format === '') && $locale !== null) { $region = Locale::getRegion($locale); if ('' === $region) { throw new Exception\InvalidArgumentException('Locale must contain a region'); @@ -365,7 +365,7 @@ public function isValid($value) $format .= '$/'; } - if (! empty($service)) { + if ($service !== null) { if (! is_callable($service)) { throw new Exception\InvalidArgumentException('Invalid callback given'); } diff --git a/test/Filter/AlnumTest.php b/test/Filter/AlnumTest.php index 7ff41d32..99e77cf8 100644 --- a/test/Filter/AlnumTest.php +++ b/test/Filter/AlnumTest.php @@ -84,6 +84,7 @@ public function testBasic(): void foreach ($valuesExpected as $input => $expected) { $actual = $this->filter->filter($input); + self::assertIsString($actual); self::assertEquals($expected, $actual); } } @@ -128,6 +129,7 @@ public function testAllowWhiteSpace(): void foreach ($valuesExpected as $input => $expected) { $actual = $this->filter->filter($input); + self::assertIsString($actual); self::assertEquals($expected, $actual); } } @@ -145,6 +147,7 @@ public function testFilterSupportArray(): void ]; $actual = $filter->filter(array_keys($values)); + self::assertIsArray($actual); self::assertEquals(array_values($values), $actual); }