Fix PHP 8.1 deprecations in tests

phpstan · Oct 30, 2021 · 50a7141 · 50a7141
1 parent 1a43385
commit 50a7141
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 30 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2562,7 +2562,7 @@ private function calculateFromScalars(Expr $node, ConstantScalarType $leftType,
 		}
 
 		if ($node instanceof Node\Expr\BinaryOp\Mod || $node instanceof Node\Expr\AssignOp\Mod) {
-			return $this->getTypeFromValue($leftNumberValue % $rightNumberValue);
+			return $this->getTypeFromValue(((int) $leftNumberValue) % ((int) $rightNumberValue));
 		}
 
 		if ($node instanceof Expr\BinaryOp\ShiftLeft || $node instanceof Expr\AssignOp\ShiftLeft) {

diff --git a/src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php b/src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php
@@ -144,7 +144,7 @@ public function locateIdentifier(Reflector $reflector, Identifier $identifier):
 				null,
 				null
 			);
-			$reflection->populateValue(constant($constantName));
+			$reflection->populateValue(@constant($constantName));
 
 			return $reflection;
 		}

diff --git a/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php b/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
@@ -78,7 +78,7 @@ public function enterNode(\PhpParser\Node $node): ?int
 			$constantName = $nameNode->value;
 
 			if (defined($constantName)) {
-				$constantValue = constant($constantName);
+				$constantValue = @constant($constantName);
 				$node->getArgs()[1]->value = BuilderHelpers::normalizeValue($constantValue);
 			}
 

diff --git a/src/Reflection/Runtime/RuntimeReflectionProvider.php b/src/Reflection/Runtime/RuntimeReflectionProvider.php
@@ -350,7 +350,7 @@ public function getConstant(\PhpParser\Node\Name $nameNode, ?Scope $scope): Glob
 
 		return $this->cachedConstants[$constantName] = new RuntimeConstantReflection(
 			$constantName,
-			ConstantTypeHelper::getTypeFromValue(constant($constantName)),
+			ConstantTypeHelper::getTypeFromValue(@constant($constantName)),
 			null
 		);
 	}

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -309,8 +309,12 @@ public static function castToArrayKeyType(Type $offsetType): Type
 			}
 
 			if ($offsetType instanceof ConstantScalarType) {
+				$keyValue = $offsetType->getValue();
+				if (is_float($keyValue)) {
+					$keyValue = (int) $keyValue;
+				}
 				/** @var int|string $offsetValue */
-				$offsetValue = key([$offsetType->getValue() => null]);
+				$offsetValue = key([$keyValue => null]);
 				return is_int($offsetValue) ? new ConstantIntegerType($offsetValue) : new ConstantStringType($offsetValue);
 			}
 

diff --git a/tests/PHPStan/Analyser/data/array-accessable.php b/tests/PHPStan/Analyser/data/array-accessable.php
@@ -34,6 +34,7 @@ public function returnSelfWithIterableInt(): self
 
 	}
 
+	#[\ReturnTypeWillChange]
 	public function offsetExists($offset)
 	{
 
@@ -44,11 +45,13 @@ public function offsetGet($offset): int
 
 	}
 
+	#[\ReturnTypeWillChange]
 	public function offsetSet($offset, $value)
 	{
 
 	}
 
+	#[\ReturnTypeWillChange]
 	public function offsetUnset($offset)
 	{
 

diff --git a/tests/PHPStan/Analyser/data/bug-4715.php b/tests/PHPStan/Analyser/data/bug-4715.php
@@ -19,7 +19,7 @@ class ArrayCollection implements Collection
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getIterator()
+	public function getIterator(): \Traversable
 	{
 		return new \ArrayIterator([]);
 	}

diff --git a/tests/PHPStan/Command/ErrorFormatter/GithubErrorFormatterTest.php b/tests/PHPStan/Command/ErrorFormatter/GithubErrorFormatterTest.php
@@ -162,6 +162,9 @@ public function testFormatErrors(
 		string $expected
 	): void
 	{
+		if (PHP_VERSION_ID >= 80100) {
+			self::markTestSkipped('Skipped on PHP 8.1 because of different result');
+		}
 		$relativePathHelper = new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH, [], '/');
 		$formatter = new GithubErrorFormatter(
 			$relativePathHelper,

diff --git a/tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php b/tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php
@@ -150,6 +150,9 @@ public function testFormatErrors(
 		string $expected
 	): void
 	{
+		if (PHP_VERSION_ID >= 80100) {
+			self::markTestSkipped('Skipped on PHP 8.1 because of different result');
+		}
 		$formatter = new TableErrorFormatter(new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH, [], '/'), false, null);
 
 		$this->assertSame($exitCode, $formatter->formatErrors(

diff --git a/tests/PHPStan/Rules/Arrays/data/offset-access-assignment-to-scalar.php b/tests/PHPStan/Rules/Arrays/data/offset-access-assignment-to-scalar.php
@@ -90,7 +90,7 @@ class ObjectWithOffsetAccess implements \ArrayAccess
 	 * @param string $offset
 	 * @return bool
 	 */
-	public function offsetExists($offset)
+	public function offsetExists($offset): bool
 	{
 		return true;
 	}
@@ -99,6 +99,7 @@ public function offsetExists($offset)
 	 * @param string $offset
 	 * @return int
 	 */
+	#[\ReturnTypeWillChange]
 	public function offsetGet($offset)
 	{
 		return 0;
@@ -109,15 +110,15 @@ public function offsetGet($offset)
 	 * @param int $value
 	 * @return void
 	 */
-	public function offsetSet($offset, $value)
+	public function offsetSet($offset, $value): void
 	{
 	}
 
 	/**
 	 * @param string $offset
 	 * @return void
 	 */
-	public function offsetUnset($offset)
+	public function offsetUnset($offset): void
 	{
 	}
 

diff --git a/tests/PHPStan/Rules/Classes/data/bug-4030.php b/tests/PHPStan/Rules/Classes/data/bug-4030.php
@@ -9,7 +9,7 @@ public function __construct(\Traversable $iterator)
 
 	}
 
-	public function accept()
+	public function accept(): bool
 	{
 		return true;
 	}

diff --git a/tests/PHPStan/Rules/Functions/data/bug-2268.php b/tests/PHPStan/Rules/Functions/data/bug-2268.php
@@ -7,7 +7,7 @@ abstract class Message implements \ArrayAccess
 	/**
 	 * @param string $value
 	 */
-	abstract public function offsetSet($key, $value);
+	abstract public function offsetSet($key, $value): void;
 }
 
 

diff --git a/tests/PHPStan/Rules/Generics/data/cross-check-interfaces.php b/tests/PHPStan/Rules/Generics/data/cross-check-interfaces.php
@@ -18,7 +18,7 @@ interface ItemListInterface extends \Traversable
  */
 final class ItemList implements \IteratorAggregate, ItemListInterface
 {
-	public function getIterator()
+	public function getIterator(): \Traversable
 	{
 		return new \ArrayIterator([]);
 	}
@@ -29,7 +29,7 @@ public function getIterator()
  */
 final class ItemList2 implements \IteratorAggregate, ItemListInterface
 {
-	public function getIterator()
+	public function getIterator(): \Traversable
 	{
 		return new \ArrayIterator([]);
 	}

diff --git a/tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php b/tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php
@@ -211,7 +211,7 @@ public function testBug3997(): void
 		$this->analyse([__DIR__ . '/data/bug-3997.php'], [
 			[
 				'Return type (string) of method Bug3997\Ipsum::count() should be compatible with return type (int) of method Countable::count()',
-				59,
+				63,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -374,23 +374,23 @@ public function testBug3997(): void
 		$this->analyse([__DIR__ . '/data/bug-3997.php'], [
 			[
 				'Method Bug3997\Foo::count() should return int but returns string.',
-				12,
+				13,
 			],
 			[
 				'Method Bug3997\Bar::count() should return int but returns string.',
-				22,
+				24,
 			],
 			[
 				'Method Bug3997\Baz::count() should return int but returns string.',
-				35,
+				38,
 			],
 			[
 				'Method Bug3997\Lorem::count() should return int but returns string.',
-				48,
+				52,
 			],
 			[
 				'Method Bug3997\Dolor::count() should return int<0, max> but returns -1.',
-				72,
+				78,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Methods/data/bug-3034.php b/tests/PHPStan/Rules/Methods/data/bug-3034.php
@@ -15,7 +15,7 @@ class HelloWorld implements \IteratorAggregate
 	/**
 	 * @return \ArrayIterator<int, array{name: string, value: string}>
 	 */
-	public function getIterator()
+	public function getIterator(): \Traversable
 	{
 		return new \ArrayIterator($this->list);
 	}

diff --git a/tests/PHPStan/Rules/Methods/data/bug-3478.php b/tests/PHPStan/Rules/Methods/data/bug-3478.php
@@ -4,6 +4,7 @@
 
 class ExtendedDocument extends \DOMDocument
 {
+	#[\ReturnTypeWillChange]
 	public function saveHTML(\DOMNode $node = null)
 	{
 		return parent::saveHTML($node);

diff --git a/tests/PHPStan/Rules/Methods/data/bug-3997.php b/tests/PHPStan/Rules/Methods/data/bug-3997.php
@@ -7,6 +7,7 @@
 class Foo implements Countable
 {
 
+	#[\ReturnTypeWillChange]
 	public function count()
 	{
 		return 'foo';
@@ -17,6 +18,7 @@ public function count()
 class Bar implements Countable
 {
 
+	#[\ReturnTypeWillChange]
 	public function count(): int
 	{
 		return 'foo';
@@ -30,6 +32,7 @@ class Baz implements Countable
 	/**
 	 * @return int
 	 */
+	#[\ReturnTypeWillChange]
 	public function count(): int
 	{
 		return 'foo';
@@ -43,6 +46,7 @@ class Lorem implements Countable
 	/**
 	 * @return int
 	 */
+	#[\ReturnTypeWillChange]
 	public function count()
 	{
 		return 'foo';
@@ -56,6 +60,7 @@ class Ipsum implements Countable
 	/**
 	 * @return string
 	 */
+	#[\ReturnTypeWillChange]
 	public function count()
 	{
 		return 'foo';
@@ -67,6 +72,7 @@ class Dolor implements  Countable
 {
 
 	/** @return positive-int|0 */
+	#[\ReturnTypeWillChange]
 	public function count(): int
 	{
 		return -1;

diff --git a/tests/PHPStan/Rules/Methods/data/bug-4084.php b/tests/PHPStan/Rules/Methods/data/bug-4084.php
@@ -8,10 +8,10 @@ class Handler implements \SessionUpdateTimestampHandlerInterface
 	 * @param string $sessionId
 	 * @param string $data
 	 */
-	public function updateTimestamp($sessionId, $data) { return true; }
+	public function updateTimestamp($sessionId, $data): bool { return true; }
 
 	/**
 	 * @param string $sessionId The session id
 	 */
-	public function validateId($sessionId) { return true; }
+	public function validateId($sessionId): bool { return true; }
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-4854.php b/tests/PHPStan/Rules/Methods/data/bug-4854.php
@@ -23,7 +23,7 @@ abstract class AbstractDomainsAvailability implements DomainsAvailabilityInterfa
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getIterator()
+	public function getIterator(): \Traversable
 	{
 		return new \ArrayIterator($this->domains);
 	}
@@ -43,7 +43,7 @@ public function offsetSet($offset, $value): void
 	/**
 	 * {@inheritdoc}
 	 */
-	public function offsetExists($offset)
+	public function offsetExists($offset): bool
 	{
 		return isset($this->domains[$offset]);
 	}

diff --git a/tests/PHPStan/Rules/Methods/data/bug-5436.php b/tests/PHPStan/Rules/Methods/data/bug-5436.php
@@ -4,6 +4,7 @@
 
 final class PDO extends \PDO
 {
+	#[\ReturnTypeWillChange]
 	public function query(string $query, ?int $fetchMode = null, ...$fetchModeArgs)
 	{
 		return parent::query($query, $fetchMode, ...$fetchModeArgs);

diff --git a/tests/PHPStan/Rules/Methods/data/calling-method-with-phpDocs-implicit-inheritance.php b/tests/PHPStan/Rules/Methods/data/calling-method-with-phpDocs-implicit-inheritance.php
@@ -135,9 +135,9 @@ function (TestArrayObject2 $arrayObject2): void {
 class TestArrayObject3 extends \ArrayObject
 {
 
-	public function append($someValue)
+	public function append($someValue): void
 	{
-		return parent::append($someValue);
+		parent::append($someValue);
 	}
 
 }

diff --git a/tests/PHPStan/Rules/Properties/data/properties-assigned-types.php b/tests/PHPStan/Rules/Properties/data/properties-assigned-types.php
@@ -155,7 +155,7 @@ interface SomeInterface
 class Collection implements \IteratorAggregate
 {
 
-	public function getIterator()
+	public function getIterator(): \Traversable
 	{
 		return new \ArrayIterator([]);
 	}

diff --git a/tests/PHPStan/Type/UnionTypeTest.php b/tests/PHPStan/Type/UnionTypeTest.php
@@ -308,7 +308,7 @@ public function dataIsSuperTypeOf(): \Iterator
 
 		yield [
 			$unionTypeB,
-			new ObjectType('Foo'),
+			new ObjectType(\stdClass::class),
 			TrinaryLogic::createNo(),
 		];
 
@@ -503,7 +503,7 @@ public function dataIsSubTypeOf(): \Iterator
 
 		yield [
 			$unionTypeB,
-			new ObjectType('Foo'),
+			new ObjectType(\stdClass::class),
 			TrinaryLogic::createNo(),
 		];
 	}

diff --git a/tests/PHPStan/Type/data/cyclic-phpdocs.php b/tests/PHPStan/Type/data/cyclic-phpdocs.php
@@ -5,5 +5,6 @@
 interface Foo extends \IteratorAggregate
 {
 	/** @return iterable<Foo> | Foo */
+	#[\ReturnTypeWillChange]
 	public function getIterator();
 }
diff --git a/tests/PHPStan/Type/data/dependent-phpdocs.php b/tests/PHPStan/Type/data/dependent-phpdocs.php
@@ -8,5 +8,5 @@ interface Foo extends \IteratorAggregate
 	public function addPages($pages);
 
 	/** non-empty */
-	public function getIterator();
+	public function getIterator(): \Traversable;
 }