diff --git a/composer.lock b/composer.lock index 04ff0c5..ec6ae72 100644 --- a/composer.lock +++ b/composer.lock @@ -1496,20 +1496,20 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.7", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + "reference": "72115ab2bf1e40af1f9b238938d493ba7f3221e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/72115ab2bf1e40af1f9b238938d493ba7f3221e7", + "reference": "72115ab2bf1e40af1f9b238938d493ba7f3221e7", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -1550,34 +1550,33 @@ "type": "github" } ], - "time": "2024-10-18T11:12:07+00:00" + "time": "2024-11-11T07:06:55+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "1.4.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11" + "reference": "3cc855474263ad6220dfa49167cbea34ca1dd300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f3ea021866f4263f07ca3636bf22c64be9610c11", - "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/3cc855474263ad6220dfa49167cbea34ca1dd300", + "reference": "3cc855474263ad6220dfa49167cbea34ca1dd300", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.11" + "php": "^7.4 || ^8.0", + "phpstan/phpstan": "^2.0" }, "conflict": { "phpunit/phpunit": "<7.0" }, "require-dev": { - "nikic/php-parser": "^4.13.0", "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-strict-rules": "^1.5.1", - "phpunit/phpunit": "^9.5" + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6" }, "type": "phpstan-extension", "extra": { @@ -1600,9 +1599,9 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.0" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.0" }, - "time": "2024-04-20T06:39:00+00:00" + "time": "2024-10-14T03:16:27+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4269,7 +4268,6 @@ "friendsofphp/php-cs-fixer": 0, "phpstan/extension-installer": 0, "phpstan/phpstan": 0, - "phpstan/phpstan-phpunit": 0, "phpunit/phpunit": 0 }, "prefer-stable": false, diff --git a/src/Differ/DiffCollector.php b/src/Differ/DiffCollector.php index 57f0973..cacee46 100644 --- a/src/Differ/DiffCollector.php +++ b/src/Differ/DiffCollector.php @@ -80,7 +80,7 @@ public function getPhpDiffs(bool $includeNonAstChanged = true): array /** * Get the non-PHP diffs. * - * @return array the array of non-PHP diffs + * @return list the array of non-PHP diffs */ public function getNonPhpDiffs(): array { diff --git a/tests/unit/Differ/DiffFactoryTest.php b/tests/unit/Differ/DiffFactoryTest.php index 5504759..943e9b5 100644 --- a/tests/unit/Differ/DiffFactoryTest.php +++ b/tests/unit/Differ/DiffFactoryTest.php @@ -7,7 +7,6 @@ use O0h\PhpAstCheckDiff\Differ\DiffFactory; use O0h\PhpAstCheckDiff\Differ\Port\AstHasherInterface; use O0h\PhpAstCheckDiff\Differ\Port\GitInterface; -use O0h\PhpAstCheckDiff\Value\Diff; use O0h\PhpAstCheckDiff\Value\GitStatus; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; @@ -28,7 +27,6 @@ public function testCreateForNonPhp(): void $diff = $subject->createForNonPhp($path, $status); - $this->assertInstanceOf(Diff::class, $diff); $this->assertSame($path, $diff->path); $this->assertSame($status, $diff->status); }