Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix PHP 8 tests running with wrong --php-version=/phpVersion= if not explicitly specified #10776

Merged
merged 4 commits into from Mar 3, 2024
Merged

fix PHP 8 tests running with wrong --php-version=/phpVersion= if not explicitly specified #10776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
963feb9
fix PHP 8 tests running with wrong --php-version=/phpVersion= if not …
kkmuffme Mar 2, 2024
0975c15
set previous default setting for failing test temporarily
kkmuffme Mar 2, 2024
64a3272
Allow the test fixed in vimeo/psalm#10778
weirdan Mar 3, 2024
87e2af4
Use `PHP_VERSION_ID` instead of `version_compare()`
weirdan Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/CoreStubsTest.php
View file
Open in desktop
Expand Up @@ -192,7 +192,7 @@ function foo(string $foo): string
'$c3===' => 'bool',
],
];
yield 'PHP8 str_* function assert non-empty-string' => [
yield 'PHP80-str_* function assert non-empty-string' => [
'code' => '<?php
/** @return non-empty-string */
function after_str_contains(): string
Expand Down Expand Up @@ -258,7 +258,7 @@ function after_stripos(): string
'$e===' => 'non-empty-string',
],
];
yield "PHP8 str_* function doesn't subtract string after assertion" => [
yield "PHP80-str_* function doesn't subtract string after assertion" => [
'code' => '<?php
/** @return false|string */
function after_str_contains()
Expand Down
15 changes: 11 additions & 4 deletions tests/Traits/InvalidCodeAnalysisTestTrait.php
View file
Open in desktop
Expand Up @@ -11,10 +11,9 @@
use function strpos;
use function strtoupper;
use function substr;
use function version_compare;

use const PHP_OS;
use const PHP_VERSION;
use const PHP_VERSION_ID;

/**
* @psalm-type DeprecatedDataProviderArrayNotation = array{
Expand Down Expand Up @@ -49,17 +48,25 @@ public function testInvalidCode(
string $code,
string $error_message,
array $error_levels = [],
string $php_version = '7.4'
?string $php_version = null
): void {
$test_name = $this->getTestName();
if (strpos($test_name, 'PHP80-') !== false) {
if (version_compare(PHP_VERSION, '8.0.0', '<')) {
if (PHP_VERSION_ID < 8_00_00) {
$this->markTestSkipped('Test case requires PHP 8.0.');
}

if ($php_version === null) {
$php_version = '8.0';
}
} elseif (strpos($test_name, 'SKIPPED-') !== false) {
$this->markTestSkipped('Skipped due to a bug.');
}

if ($php_version === null) {
$php_version = '7.4';
}

// sanity check - do we have a PHP tag?
if (strpos($code, '<?php') === false) {
$this->fail('Test case must have a <?php tag');
Expand Down
21 changes: 16 additions & 5 deletions tests/Traits/ValidCodeAnalysisTestTrait.php
View file
Open in desktop
Expand Up @@ -10,10 +10,9 @@
use function strpos;
use function strtoupper;
use function substr;
use function version_compare;

use const PHP_OS;
use const PHP_VERSION;
use const PHP_VERSION_ID;

trait ValidCodeAnalysisTestTrait
{
Expand All @@ -40,21 +39,33 @@ public function testValidCode(
string $code,
array $assertions = [],
array $ignored_issues = [],
string $php_version = '7.4'
?string $php_version = null
): void {
$test_name = $this->getTestName();
if (strpos($test_name, 'PHP80-') !== false) {
if (version_compare(PHP_VERSION, '8.0.0', '<')) {
if (PHP_VERSION_ID < 8_00_00) {
$this->markTestSkipped('Test case requires PHP 8.0.');
}

if ($php_version === null) {
$php_version = '8.0';
}
} elseif (strpos($test_name, 'PHP81-') !== false) {
if (version_compare(PHP_VERSION, '8.1.0', '<')) {
if (PHP_VERSION_ID < 8_01_00) {
$this->markTestSkipped('Test case requires PHP 8.1.');
}

if ($php_version === null) {
$php_version = '8.1';
}
} elseif (strpos($test_name, 'SKIPPED-') !== false) {
$this->markTestSkipped('Skipped due to a bug.');
}

if ($php_version === null) {
$php_version = '7.4';
}

// sanity check - do we have a PHP tag?
if (strpos($code, '<?php') === false) {
$this->fail('Test case must have a <?php tag');
Expand Down