From df044f5c22d5f35a79623867cfd6c27265e3bded Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 01:56:41 +0000 Subject: [PATCH 1/3] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index d6c1549..41f3694 100644 --- a/composer.lock +++ b/composer.lock @@ -213,16 +213,16 @@ }, { "name": "laminas/laminas-form", - "version": "3.17.0", + "version": "3.19.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-form.git", - "reference": "5eadce0fce72ef4bc7bf0b4398aeb939f1f03cef" + "reference": "c6f6c68f9b7f0793a805b10309198ad455ca900e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-form/zipball/5eadce0fce72ef4bc7bf0b4398aeb939f1f03cef", - "reference": "5eadce0fce72ef4bc7bf0b4398aeb939f1f03cef", + "url": "https://api.github.com/repos/laminas/laminas-form/zipball/c6f6c68f9b7f0793a805b10309198ad455ca900e", + "reference": "c6f6c68f9b7f0793a805b10309198ad455ca900e", "shasum": "" }, "require": { @@ -306,7 +306,7 @@ "type": "community_bridge" } ], - "time": "2023-11-28T11:42:58+00:00" + "time": "2024-01-11T15:32:31+00:00" }, { "name": "laminas/laminas-hydrator", @@ -472,16 +472,16 @@ }, { "name": "laminas/laminas-inputfilter", - "version": "2.28.0", + "version": "2.29.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-inputfilter.git", - "reference": "d6f819d456d89316237d753fb9a6ac0108486f8d" + "reference": "82a76f40477c3e399863d13446a5c0187f421775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/d6f819d456d89316237d753fb9a6ac0108486f8d", - "reference": "d6f819d456d89316237d753fb9a6ac0108486f8d", + "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/82a76f40477c3e399863d13446a5c0187f421775", + "reference": "82a76f40477c3e399863d13446a5c0187f421775", "shasum": "" }, "require": { @@ -497,10 +497,10 @@ "require-dev": { "ext-json": "*", "laminas/laminas-coding-standard": "~2.5.0", - "phpunit/phpunit": "^10.4.2", + "phpunit/phpunit": "^10.5.5", "psalm/plugin-phpunit": "^0.18.4", "psr/http-message": "^2.0", - "vimeo/psalm": "^5.15", + "vimeo/psalm": "^5.18", "webmozart/assert": "^1.11" }, "suggest": { @@ -542,7 +542,7 @@ "type": "community_bridge" } ], - "time": "2023-11-02T15:54:27+00:00" + "time": "2024-01-10T11:57:06+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -2816,16 +2816,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.5", + "version": "10.5.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856" + "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856", - "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5c5b397a95cb0db013270a985726fcae93e61b8", + "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8", "shasum": "" }, "require": { @@ -2897,7 +2897,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.5" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.7" }, "funding": [ { @@ -2913,7 +2913,7 @@ "type": "tidelift" } ], - "time": "2023-12-27T15:13:52+00:00" + "time": "2024-01-14T16:40:30+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4066,16 +4066,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.0", + "version": "3.8.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" + "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", - "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", + "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", "shasum": "" }, "require": { @@ -4085,11 +4085,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -4142,7 +4142,7 @@ "type": "open_collective" } ], - "time": "2023-12-08T12:32:31+00:00" + "time": "2024-01-11T20:47:48+00:00" }, { "name": "symfony/console", @@ -4835,16 +4835,16 @@ }, { "name": "vimeo/psalm", - "version": "5.18.0", + "version": "5.19.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19" + "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19", - "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/06b71be009a6bd6d81b9811855d6629b9fe90e1b", + "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b", "shasum": "" }, "require": { @@ -4941,7 +4941,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2023-12-16T09:37:35+00:00" + "time": "2024-01-09T21:02:43+00:00" }, { "name": "webimpress/coding-standard", From 4e2591adff3c385c79baebc26463f2d313e21af7 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 15 Jan 2024 09:21:43 +0000 Subject: [PATCH 2/3] Bump dev deps, refresh lock Signed-off-by: George Steel --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 9c61b34..35ae979 100644 --- a/composer.json +++ b/composer.json @@ -50,9 +50,9 @@ "laminas/laminas-config-aggregator": "^1.14", "laminas/laminas-servicemanager": "^3.22.1", "maglnet/composer-require-checker": "^4.7.1", - "phpunit/phpunit": "^10.4.2", + "phpunit/phpunit": "^10.5.7", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15" + "vimeo/psalm": "^5.19" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 41f3694..ff5de38 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": "0107c91fde701c1581a6460d6dfc4ff5", + "content-hash": "c1246a1962f86403a55ec5b7e29046ed", "packages": [ { "name": "giggsey/libphonenumber-for-php", From 6aa22d4766a58adc3992bf8752683d8d8e7daacd Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 15 Jan 2024 09:23:52 +0000 Subject: [PATCH 3/3] Remove redundant assertions due to improved types in laminas-form Signed-off-by: George Steel --- test/Form/FormIntegrationTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/Form/FormIntegrationTest.php b/test/Form/FormIntegrationTest.php index 44c13ed..03c2781 100644 --- a/test/Form/FormIntegrationTest.php +++ b/test/Form/FormIntegrationTest.php @@ -7,6 +7,7 @@ use Laminas\Form\Element\Text; use Laminas\Form\Form; use Laminas\Form\FormElementManager; +use Laminas\Form\FormInterface; use Laminas\I18n\PhoneNumber\Form\Element\PhoneNumber; use Laminas\I18n\PhoneNumber\PhoneNumberValue; use Laminas\I18n\PhoneNumber\Test\NumberGeneratorTrait; @@ -33,9 +34,7 @@ protected function setUp(): void $formElements = $this->container->get(FormElementManager::class); /** @psalm-suppress RedundantCondition */ assert($formElements instanceof FormElementManager); - $form = $formElements->get(Form::class); - assert($form instanceof Form); - $this->form = $form; + $this->form = $formElements->get(Form::class); $this->formElements = $formElements; } @@ -228,7 +227,7 @@ public function testAllowableTypesAsAConstructorOptionCanBeUsedToLimitValidNumbe ); $form = $this->formElements->get(Form::class); - assert($form instanceof Form); + assert($form instanceof FormInterface); $form->add($element, ['name' => 'num']); $form->setData(['num' => '999']);