Skip to content
Closed
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
32 changes: 11 additions & 21 deletions src/Analyser/MutatingScope.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,17 @@
use function array_values;
use function count;
use function explode;
use function function_exists;
use function get_class;
use function implode;
use function in_array;
use function is_array;
use function is_bool;
use function is_numeric;
use function is_string;
use function ltrim;
use function md5;
use function restore_error_handler;
use function set_error_handler;
use function sprintf;
use function str_increment;
use function str_starts_with;
use function strlen;
use function strtolower;
Expand Down Expand Up @@ -1737,33 +1736,24 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
$varScalars = $varType->getConstantScalarValues();

if (count($varScalars) > 0) {
$newTypes = [];
$newValues = [];

// silence string incrementing deprecation warnings
set_error_handler(static fn (): bool => true);
foreach ($varScalars as $varValue) {
// until PHP 8.5 it was valid to increment/decrement an empty string.
// see https://github.com/php/php-src/issues/19597
if ($node instanceof Expr\PreInc) {
if ($varValue === '') {
$varValue = '1';
} elseif (
is_string($varValue)
&& !is_numeric($varValue)
&& function_exists('str_increment')
) {
$varValue = str_increment($varValue);
} elseif (!is_bool($varValue)) {
if (!is_bool($varValue)) {
++$varValue;
}
} else {
if ($varValue === '') {
$varValue = -1;
} elseif (is_numeric($varValue)) {
--$varValue;
}
--$varValue; // @phpstan-ignore preDec.nonNumeric
}

$newTypes[] = $this->getTypeFromValue($varValue);
$newValues[] = $varValue;
}
restore_error_handler();

$newTypes = array_map(fn ($value): Type => $this->getTypeFromValue($value), $newValues);
return TypeCombinator::union(...$newTypes);
} elseif ($varType->isString()->yes()) {
if ($varType->isLiteralString()->yes()) {
Expand Down
23 changes: 23 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13481.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace bug13481;

use function PHPStan\Testing\assertType;
use function str_increment;

function bug13481() {
$s = 'ab c1';
assertType("*ERROR*", str_increment($s));

++$s;
assertType("'ab c2'", $s);
}

function bug13481b() {
$s = '%';
assertType("*ERROR*", str_increment($s));

++$s;
assertType("'%'", $s);
}

Loading