Merge remote-tracking branch 'origin/2.1.x' into 2.2.x

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -380,6 +380,9 @@ jobs:
           - script: |
               cd e2e/bug-11819
               ../../bin/phpstan
+          - script: |
+              cd e2e/bug-14305
+              ../../bin/phpstan
           - script: |
               cd e2e/composer-and-phpstan-version-config
               composer install --ignore-platform-reqs

.github/workflows/merge-maintained-branch.yml

@@ -20,10 +20,13 @@ jobs:
 
       - name: "Checkout"
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-      - name: "Merge branch"
-        uses: everlytic/branch-merge@c4a244dc23143f824ae6c022a10732566cb8e973 # 1.1.5
         with:
-          github_token: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
-          source_ref: ${{ github.ref }}
-          target_branch: '2.2.x'
-          commit_message_template: 'Merge branch {source_ref} into {target_branch}'
+          fetch-depth: 0
+          ref: '2.2.x'
+          token: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
+      - name: "Merge branch"
+        run: |
+          git config user.name "phpstan-bot"
+          git config user.email "bot@phpstan.org"
+          git merge --strategy=ort origin/${{ github.ref_name }} -m "Merge branch ${{ github.ref_name }} into 2.2.x"
+          git push

bin/phpstan

@@ -26,13 +26,14 @@ use Symfony\Component\Console\Helper\ProgressBar;
 
 	$devOrPharLoader = require_once __DIR__ . '/../vendor/autoload.php';
 	require_once __DIR__ . '/../preload.php';
-	$composerJsonPath = ComposerHelper::getComposerJsonPath(getcwd());
-	$composer = ComposerHelper::getComposerConfig(getcwd());
+	$cwd = getcwd();
+	$composerJsonPath = ComposerHelper::getComposerJsonPath($cwd);
+	$composer = ComposerHelper::getComposerConfig($cwd);
 
 	if ($composer !== null) {
-		$vendorDirectory = ComposerHelper::getVendorDirFromComposerConfig(getcwd(), $composer);
+		$vendorDirectory = ComposerHelper::getVendorDirFromComposerConfig($cwd, $composer);
 	} else {
-		$vendorDirectory = getcwd() . '/vendor';
+		$vendorDirectory = $cwd . '/vendor';
 	}
 	$devOrPharLoader->unregister();
 

e2e/bug-14305/phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+	level: 5
+	paths:
+		- test.php

e2e/bug-14305/test.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug14305;
+
+define('BUG14305_XDOC_GMETA_EMTY', 0);
+define('BUG14305_XDOC_GMETA_NUPATH', 7);
+define('BUG14305_XDOC_GMETAS', [
+	'empty'         => 0,
+	'nupath'        => 7,
+]);
+
+$row = ['id' => 0];
+
+foreach ([BUG14305_XDOC_GMETA_EMTY, BUG14305_XDOC_GMETA_NUPATH] as $meta)
+	$row[array_search($meta, BUG14305_XDOC_GMETAS)] = '';

phpstan-baseline.neon

@@ -966,7 +966,7 @@ parameters:
 		-
 			rawMessage: PHPDoc tag @var with type float|int is not subtype of native type int.
 			identifier: varTag.nativeType
-			count: 2
+			count: 3
 			path: src/Type/Constant/ConstantArrayTypeBuilder.php
 
 		-

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -291,6 +291,23 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 						$this->keyTypes[] = $scalarType;
 						$this->valueTypes[] = $valueType;
 						$this->optionalKeys[] = count($this->keyTypes) - 1;
+
+						if (!($scalarType instanceof ConstantIntegerType)) {
+							continue;
+						}
+
+						$max = max($this->nextAutoIndexes);
+						$offsetValue = $scalarType->getValue();
+						if ($offsetValue < $max) {
+							continue;
+						}
+
+						/** @var int|float $newAutoIndex */
+						$newAutoIndex = $offsetValue + 1;
+						if (is_float($newAutoIndex)) {
+							$newAutoIndex = $max;
+						}
+						$this->nextAutoIndexes[] = $newAutoIndex;
 					}
 
 					$this->isList = TrinaryLogic::createNo();