PHPStan 2

Author: Alkarex

autoload.php

@@ -22,7 +22,7 @@
 	}
 
 	$relative_class = substr($class, $len);
-	$file = $base_dir . str_replace('\\', DIRECTORY_SEPARATOR, $relative_class) . '.php';
+	$file = $base_dir . str_replace('\\', DIRECTORY_SEPARATOR, $relative_class ?: '_') . '.php';
 
 	if (file_exists($file)) {
 		require $file;

composer.json

@@ -32,9 +32,9 @@
 		"ext-simplexml": "*",
 		"ext-tokenizer": "*",
 		"ext-xmlwriter": "*",
-		"phpstan/phpstan": "^1.12",
-		"phpstan/phpstan-strict-rules": "^1.6",
-		"squizlabs/php_codesniffer": "^3.10"
+		"phpstan/phpstan": "^2",
+		"phpstan/phpstan-strict-rules": "2",
+		"squizlabs/php_codesniffer": "^3"
 	},
 	"scripts": {
 		"php-lint": "find . -type d -name 'vendor' -prune -o -name '*.php' -print0 | xargs -0 -n1 -P4 php -l 1>/dev/null",

composer.lock

@@ -1,27 +1,26 @@
 parameters:
-	level: 9
-	treatPhpDocTypesAsCertain: false
+	phpVersion:
+		min: 70400	# PHP 7.4
+		max: 80499	# PHP 8.4
+	level: 10	# https://phpstan.org/user-guide/rule-levels
 	fileExtensions:
 		- php
 	paths:
 		- src/
 	excludePaths:
 		analyseAndScan:
 			- vendor/
+	checkBenevolentUnionTypes: true
+	checkImplicitMixed: false	# TODO pass
+	checkMissingOverrideMethodAttribute: true
+	checkTooWideReturnTypesInProtectedAndPublicMethods: true
+	reportAnyTypeWideningInVarTag: true
+	treatPhpDocTypesAsCertain: false
 	strictRules:
-		allRules: false
-		booleansInConditions: true
-		closureUsesThis: true
-		disallowedConstructs: false
+		disallowedEmpty: false
 		disallowedLooseComparison: false
-		matchingInheritedMethodNames: true
-		noVariableVariables: true
-		numericOperandsInArithmeticOperators: true
-		overwriteVariablesWithLoop: true
-		requireParentConstructorCall: true
-		strictCalls: true
-		switchConditionsMatchingType: true
-		uselessCast: true
+		disallowedShortTernary: false
+		strictArrayFilter: false	# TODO pas
 	exceptions:
 		check:
 			missingCheckedExceptionInThrows: true

phpstan.dist.neon

@@ -255,7 +255,7 @@ public static function excelDateToDateTime(float $excelDateTime, int $workbookDa
 		try {
 			return $excelBaseDate->add(new \DateInterval($iso8601));
 		} catch (\Exception $ex) {
-			throw new \InvalidArgumentException('Invalid date!', $ex->getCode(), $ex);
+			throw new \InvalidArgumentException('Invalid date!', is_int($ex->getCode()) ? $ex->getCode() : 0, $ex);
 		}
 	}
 
@@ -347,7 +347,11 @@ public function setFullCalcOnLoad(int $sheetNumber, bool $value): void
 						throw new XlsxFastEditorXmlException("Error creating XML fragment for setFullCalcOnLoad!", $dex->code, $dex);
 					}
 					if ($sheetCalcPr !== false && $sheetData->parentNode !== null) {
-						$sheetData->parentNode->insertBefore($sheetCalcPr, $sheetData->nextSibling);
+						if ($sheetData->nextSibling === null) {
+							$sheetData->parentNode->appendChild($sheetCalcPr);
+						} else {
+							$sheetData->parentNode->insertBefore($sheetCalcPr, $sheetData->nextSibling);
+						}
 					}
 				}
 			}
@@ -943,7 +947,7 @@ public function writeHyperlink(int $sheetNumber, string $cellName, string $value
 	}
 
 	/**
-	 * Write a formulat in the given worksheet at the given cell location, without changing the type/style of the cell.
+	 * Write a formula in the given worksheet at the given cell location, without changing the type/style of the cell.
 	 * Auto-creates the cell if it does not already exists.
 	 * Removes the formulas of the cell, if any.
 	 *

src/XlsxFastEditor.php

@@ -278,7 +278,7 @@ private function initCellValue(): \DOMElement
 	}
 
 	/**
-	 * Write a formulat, without changing the type/style of the cell.
+	 * Write a formula, without changing the type/style of the cell.
 	 * Removes the formulas of the cell, if any.
 	 * @throws XlsxFastEditorXmlException
 	 */
@@ -308,9 +308,13 @@ public function writeFormula(string $value): void
 		}
 		try {
 			$f = $dom->createElement('f', $value);
+			if (!($f instanceof \DOMElement)) {
+				throw new XlsxFastEditorXmlException("Error creating DOMElement of formula for cell {$this->name()}!");
+			}
 		} catch (\DOMException $dex) {
-			throw new XlsxFastEditorXmlException("Error creating formulat for cell {$this->name()}!", $dex->code, $dex);
+			throw new XlsxFastEditorXmlException("Error creating formula for cell {$this->name()}!", $dex->code, $dex);
 		}
+
 		$this->c->appendChild($f);
 
 		$this->editor->_clearCalcChain();