Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![License](https://poser.pugx.org/php-standard-library/phpstan-extension/license)](https://packagist.org/packages/php-standard-library/phpstan-extension)

* [PHPStan](https://phpstan.org/)
* [PSL](https://github.com/azjezz/psl)
* [PSL](https://github.com/php-standard-library/php-standard-library)

## Description

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
"phpstan/phpstan": "^2.0"
},
"conflict": {
"azjezz/psl": "<1.6||>=6.0"
Comment thread
veewee marked this conversation as resolved.
"azjezz/psl": "*",
"php-standard-library/php-standard-library": "<1.6||>=7.0"
},
"require-dev": {
"azjezz/psl": "^1.6||^2.0||^3.0||^4.0||^5.0",
"php-standard-library/php-standard-library": "^1.6||^2.0||^3.0||^4.0||^5.0||^6.0",
"composer/semver": "^3.3",
"nikic/php-parser": "^4.14.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
Expand Down
4 changes: 2 additions & 2 deletions tests/Option/PslTypeSpecifyingExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public function testFileAsserts(
...$args
): void
{
if (!InstalledVersions::satisfies(new VersionParser(), 'azjezz/psl', '>=2.2.0')) {
Assert::markTestSkipped(sprintf('Option component is not available in current azjezz/psl installed version'));
if (!InstalledVersions::satisfies(new VersionParser(), 'php-standard-library/php-standard-library', '>=2.2.0')) {
Comment thread
veewee marked this conversation as resolved.
Assert::markTestSkipped(sprintf('Option component is not available in current php-standard-library/php-standard-library installed version'));
}

$this->assertFileAsserts($assertType, $file, ...$args);
Expand Down
2 changes: 1 addition & 1 deletion tests/Type/PslTypeSpecifyingExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function dataFileAsserts(): iterable
yield from $this->gatherAssertTypes(__DIR__ . '/data/nullishAssert.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/nullishMatches.php');
}
if (InstalledVersions::satisfies(new VersionParser(), 'azjezz/psl', '<2.0.0')) {
if (InstalledVersions::satisfies(new VersionParser(), 'php-standard-library/php-standard-library', '<2.0.0')) {
Comment thread
veewee marked this conversation as resolved.
yield from $this->gatherAssertTypes(__DIR__ . '/data/complexTypev1.php');
} else {
yield from $this->gatherAssertTypes(__DIR__ . '/data/complexTypev2.php');
Expand Down
Loading