From da9d96a5aeeba7ff8fee0e4e6f78c5f91830c6df Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Mon, 12 Aug 2024 08:10:42 +0200 Subject: [PATCH 1/2] Update dependencies --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 396e0af22a1..708d8212186 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "phpunit/php-timer": "^6.0.0", "sebastian/cli-parser": "^2.0.1", "sebastian/code-unit": "^2.0.0", - "sebastian/comparator": "^5.0.1", + "sebastian/comparator": "^5.0.2", "sebastian/diff": "^5.1.1", "sebastian/environment": "^6.1.0", "sebastian/exporter": "^5.1.2", diff --git a/composer.lock b/composer.lock index 1df84a47a56..b523a8cb4d9 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": "653cb3ffbd6ee51c5f1dd7dc9e560c00", + "content-hash": "9ed18efde2d64b100c617b290b183726", "packages": [ { "name": "myclabs/deep-copy", @@ -733,16 +733,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.1", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", + "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", "shasum": "" }, "require": { @@ -753,7 +753,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^10.4" }, "type": "library", "extra": { @@ -798,7 +798,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2" }, "funding": [ { @@ -806,7 +806,7 @@ "type": "github" } ], - "time": "2023-08-14T13:18:12+00:00" + "time": "2024-08-12T06:03:08+00:00" }, { "name": "sebastian/complexity", From c2d9a774ed8fe222629cf407ddbc48f925fb4b64 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Mon, 12 Aug 2024 08:29:38 +0200 Subject: [PATCH 2/2] Update tests after sebastian/comparator update (previous version was hiding problems with wrong expectations) --- .../Equality/IsEqualCanonicalizingTest.php | 4 ++-- tests/unit/Metadata/Api/CodeCoverageTest.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/unit/Framework/Constraint/Equality/IsEqualCanonicalizingTest.php b/tests/unit/Framework/Constraint/Equality/IsEqualCanonicalizingTest.php index 72ba288bb35..500a772bffb 100644 --- a/tests/unit/Framework/Constraint/Equality/IsEqualCanonicalizingTest.php +++ b/tests/unit/Framework/Constraint/Equality/IsEqualCanonicalizingTest.php @@ -192,8 +192,8 @@ public static function provider(): array +++ Actual @@ @@ stdClass Object ( -- 0 => 'bar' -+ 0 => 'foo' +- 'foo' => 'bar' ++ 'bar' => 'foo' ) EOT, diff --git a/tests/unit/Metadata/Api/CodeCoverageTest.php b/tests/unit/Metadata/Api/CodeCoverageTest.php index 202462c9dd5..38a0dd13c4b 100644 --- a/tests/unit/Metadata/Api/CodeCoverageTest.php +++ b/tests/unit/Metadata/Api/CodeCoverageTest.php @@ -96,7 +96,7 @@ public static function linesToBeCoveredProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(29, 46), + TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46), ], NamespaceCoverageClassTest::class, 'testSomething', @@ -104,7 +104,7 @@ public static function linesToBeCoveredProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35), + TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35), ], NamespaceCoverageMethodTest::class, 'testSomething', @@ -112,7 +112,7 @@ public static function linesToBeCoveredProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)), + TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)), ], NamespaceCoverageCoversClassTest::class, 'testSomething', @@ -120,7 +120,7 @@ public static function linesToBeCoveredProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35), + TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35), ], NamespaceCoverageCoversClassPublicTest::class, 'testSomething', @@ -237,7 +237,7 @@ public static function linesToBeUsedProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(29, 46), + TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46), ], NamespaceCoverageClassTest::class, 'testSomething', @@ -245,7 +245,7 @@ public static function linesToBeUsedProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35), + TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35), ], NamespaceCoverageMethodTest::class, 'testSomething', @@ -253,7 +253,7 @@ public static function linesToBeUsedProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)), + TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)), ], NamespaceCoverageCoversClassTest::class, 'testSomething', @@ -261,7 +261,7 @@ public static function linesToBeUsedProvider(): array [ [ - TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35), + TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35), ], NamespaceCoverageCoversClassPublicTest::class, 'testSomething',