Update to PHPStan 2.0

composer.json

@@ -81,10 +81,10 @@
 	"require-dev": {
 		"fig-r/psr2r-sniffer": "2.1.1",
 		"overtrue/phplint": "9.5.5",
-		"phpstan/phpstan": "1.12.5",
+		"phpstan/phpstan": "2.0.3",
 		"phpunit/phpunit": "11.5.0",
 		"phpunit/php-code-coverage": "11.0.8",
-		"rector/rector": "0.15.13",
+		"rector/rector": "2.0.0",
 		"squizlabs/php_codesniffer": "3.11.2"
 	}
 }

phpstan.neon.dist

@@ -10,9 +10,6 @@ parameters:
     # Stricter analysis
     polluteScopeWithLoopInitialAssignments: false
     polluteScopeWithAlwaysIterableForeach: false
-    checkAlwaysTrueCheckTypeFunctionCall: true
-    checkAlwaysTrueInstanceof: true
-    checkAlwaysTrueStrictComparison: true
     checkExplicitMixedMissingReturn: true
     checkFunctionNameCase: true
     checkInternalClassCaseSensitivity: true

src/lib/Default/alliance_pick.inc.php

@@ -36,6 +36,10 @@
 		}
 	}
 
+	if (count($teams) === 0) {
+		throw new Exception('No draft leaders have been selected yet.');
+	}
+
 	// Determine the smallest team alliance size.
 	$minSize = min(array_map(fn(array $i): int => $i['Size'], $teams));
 

src/lib/Smr/AbstractPlayer.php

@@ -2051,6 +2051,9 @@ public function getBounties(): array {
 		return $this->bounties;
 	}
 
+	/**
+	 * @phpstan-assert-if-false array{} $this->getBounties()
+	 */
 	public function hasBounties(): bool {
 		return count($this->getBounties()) > 0;
 	}

src/lib/Smr/Chess/Board.php

@@ -11,7 +11,7 @@ class Board {
 
 	/** @var array<value-of<Colour>, array<Castling>> */
 	private array $canCastle;
-	/** @var array{X: int, Y: int}> */
+	/** @var array{X: int, Y: int} */
 	private array $enPassantPawn;
 	/** @var array<int, array<int, ?ChessPiece>> */
 	private array $board;
@@ -190,7 +190,7 @@ public function canCastle(Colour $colour, Castling $type): bool {
 	}
 
 	/**
-	 * @return array{'X': int, 'Y': int}
+	 * @return array{X: int, Y: int}
 	 */
 	public function getEnPassantPawn(): array {
 		return $this->enPassantPawn;

src/lib/Smr/Chess/ChessPiece.php

@@ -43,7 +43,7 @@ public function isAttacking(Board $board, int $x, int $y): bool {
 	}
 
 	/**
-	 * @return array<array{int, int}>>
+	 * @return array<array{int, int}>
 	 */
 	public function getPossibleMoves(Board $board, bool $attackingCheck = false): array {
 		$moves = [];
@@ -139,7 +139,7 @@ public function getPossibleMoves(Board $board, bool $attackingCheck = false): ar
 	}
 
 	/**
-	 * @param array{int, int} $moves
+	 * @param list<array{int, int}> $moves
 	 */
 	private function addMove(int $toX, int $toY, Board $board, array &$moves, bool $attackingCheck = true): bool {
 		if ($board->isValidCoord($toX, $toY)) {

src/lib/Smr/Globals.php

@@ -320,7 +320,7 @@ public static function getBuyShipNameHREF(): string {
 	}
 
 	/**
-	 * @return array<string, int>
+	 * @return array{text: int, html: int, logo: int}
 	 */
 	public static function getBuyShipNameCosts(): array {
 		return [

src/lib/Smr/Port.php

@@ -1331,7 +1331,7 @@ public function update(): void {
 	}
 
 	/**
-	 * @param array<AbstractPlayer> $targetPlayers
+	 * @param non-empty-array<int, AbstractPlayer> $targetPlayers
 	 * @return PortCombatResults
 	 */
 	public function shootPlayers(array $targetPlayers): array {

src/lib/Smr/Routes/Route.php

@@ -30,7 +30,7 @@ abstract public function containsPort(int $sectorID): bool;
 	/**
 	 * Recurse through the Route tree to get an ordered list.
 	 *
-	 * @return array<OneWayRoute>
+	 * @return non-empty-list<OneWayRoute>
 	 */
 	abstract public function getOneWayRoutes(): array;
 

src/lib/Smr/Routes/RouteIterator.php

@@ -11,6 +11,7 @@
  */
 class RouteIterator {
 
+	/** @var InfiniteIterator<int, OneWayRoute, ArrayIterator<int, OneWayRoute>> */
 	private InfiniteIterator $routeIterator;
 
 	private TransactionType $transaction = TransactionType::Buy;

test/SmrTest/lib/BarDrinkTest.php

@@ -46,7 +46,7 @@ public function test_isSpecial(): void {
 	public function test_getSpecialMessage(): void {
 		// every special drink has a special message
 		foreach (BarDrink::getSpecial() as $drink) {
-			self::assertIsString(BarDrink::getSpecialMessage($drink));
+			self::assertNotEmpty(BarDrink::getSpecialMessage($drink));
 		}
 	}