From 72bd9e088ff1c17dc5b7df31fa19a91e877d0715 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:27:00 +0100 Subject: [PATCH 1/2] Update symfony/stopwatch requirement from ~2.5 || ~5.0 to ~2.5 || ~5.0 || ~7.0 in /src/Common (#1238) Update symfony/stopwatch requirement from ~2.5 || ~5.0 to ~2.5 || ~5.0 || ~7.0 --- updated-dependencies: - dependency-name: symfony/stopwatch dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fd4348f..122e72e 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require-dev": { "nyholm/nsa": "^1.1", "phpunit/phpunit": "^9.5", - "symfony/stopwatch": "~2.5 || ~5.0" + "symfony/stopwatch": "~2.5 || ~5.0 || ~7.0" }, "suggest": { "symfony/stopwatch": "If you want to use the TimedGeocoder" From 43f8145c74d3a3808c51e233fba60b68bd033d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Nork=C5=ABnas?= Date: Sat, 7 Jun 2025 11:08:41 +0300 Subject: [PATCH 2/2] Resolve some deprecations and remove igorw/get-in dependency (#1257) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove `igorw/get-in` dependency to simplify code * Fix phpunit deprecation * Simplify phpunit's `->will($this->returnValue())` with `->willReturn()` * Simplify phpunit's `->will($this->returnCallback())` with `->willReturnCallback()` * Fix deprecated mock builder `setMethds` with `createPartialMock` * Remove deprecated phpstan `checkGenericClassInNonGenericObjectType` option * Bump phpunit to 9.6 --------- Co-authored-by: Jonathan Beliƫn --- Tests/TimedGeocoderTest.php | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/TimedGeocoderTest.php b/Tests/TimedGeocoderTest.php index ca8b130..4a735a0 100644 --- a/Tests/TimedGeocoderTest.php +++ b/Tests/TimedGeocoderTest.php @@ -47,7 +47,7 @@ public function testGeocode(): void { $this->delegate->expects($this->once()) ->method('geocodeQuery') - ->will($this->returnValue(new AddressCollection([]))); + ->willReturn(new AddressCollection([])); $this->geocoder->geocode('foo'); @@ -74,7 +74,7 @@ public function testReverse(): void { $this->delegate->expects($this->once()) ->method('reverseQuery') - ->will($this->returnValue(new AddressCollection([]))); + ->willReturn(new AddressCollection([])); $this->geocoder->reverse(0, 0); diff --git a/composer.json b/composer.json index 122e72e..d67a506 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "nyholm/nsa": "^1.1", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6.11", "symfony/stopwatch": "~2.5 || ~5.0 || ~7.0" }, "suggest": {