phpstan fixes

calcDaysIntervalNamedIndex for force using named index and returning only named index
calcDaysIntervalNumIndex for force using numeric index and returning only numeric index

4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php

@@ -1068,8 +1068,32 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 				return_named:$return_named,
 				include_end_date:$include_end_date,
 				exclude_start_date:$exclude_start_date
-			)
+			),
+			'call calcDaysInterval'
 		);
+		if ($return_named) {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Combined\DateTime::calcDaysIntervalNamedIndex(
+					$input_a,
+					$input_b,
+					include_end_date:$include_end_date,
+					exclude_start_date:$exclude_start_date
+				),
+				'call calcDaysIntervalNamedIndex'
+			);
+		} else {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Combined\DateTime::calcDaysIntervalNumIndex(
+					$input_a,
+					$input_b,
+					include_end_date:$include_end_date,
+					exclude_start_date:$exclude_start_date
+				),
+				'call calcDaysIntervalNamedIndex'
+			);
+		}
 	}
 
 	/**

www/admin/class_test.datetime.php

@@ -473,7 +473,10 @@ function intervalStringFormatDeprecated(
 		// print "-> V: $value | $part, $time_name | I: " . is_int($value) . " | F: " . is_float($value)
 		// 	. " | " . ($value != 0 ? 'Not zero' : 'ZERO') . "<br>";
 		// var_dump($skip_last_zero);
-		if ($value != 0 || $skip_zero === false || $skip_last_zero === false) {
+		if (
+			is_numeric($value) &&
+			($value != 0 || $skip_zero === false || $skip_last_zero === false)
+		) {
 			if ($part == 'f') {
 				if ($truncate_nanoseconds === true) {
 					$value = round($value, 3);

www/admin/class_test.db.php

@@ -76,41 +76,41 @@ $db->dbResetEncoding();
 
 // empty calls, none of the below should fail
 //
-$db->dbGetCursor();
+$foo = $db->dbGetCursor();
 //
-$db->dbGetCursorExt();
+$foo = $db->dbGetCursorExt();
 //
-$db->dbGetCursorPos('SELECT foo', ['bar']);
+$foo = $db->dbGetCursorPos('SELECT foo', ['bar']);
 //
-$db->dbGetCursorNumRows('SELECT foo', ['bar']);
+$foo = $db->dbGetCursorNumRows('SELECT foo', ['bar']);
 //
-$db->dbGetInsertPKName();
+$foo = $db->dbGetInsertPKName();
 //
-$db->dbGetInsertPK();
+$foo = $db->dbGetInsertPK();
 //
-$db->dbGetReturningExt();
-$db->dbGetReturningExt('foo');
-$db->dbGetReturningExt('foo', 0);
-$db->dbGetReturningExt(pos:0);
+$foo = $db->dbGetReturningExt();
+$foo = $db->dbGetReturningExt('foo');
+$foo = $db->dbGetReturningExt('foo', 0);
+$foo = $db->dbGetReturningExt(pos:0);
 //
-$db->dbGetReturningArray();
+$foo = $db->dbGetReturningArray();
 //
-$db->dbGetNumRows();
+$foo = $db->dbGetNumRows();
 //
-$db->dbGetNumFields();
+$foo = $db->dbGetNumFields();
 //
-$db->dbGetFieldNames();
+$foo = $db->dbGetFieldNames();
 //
-$db->dbGetFieldTypes();
+$foo = $db->dbGetFieldTypes();
 //
-$db->dbGetFieldNameTypes();
+$foo = $db->dbGetFieldNameTypes();
 //
-$db->dbGetFieldName(0);
+$foo = $db->dbGetFieldName(0);
 //
-$db->dbGetFieldType(0);
-$db->dbGetFieldType('foo');
+$foo = $db->dbGetFieldType(0);
+$foo = $db->dbGetFieldType('foo');
 //
-$db->dbGetPrepareCursorValue('foo', 'bar');
+$foo = $db->dbGetPrepareCursorValue('foo', 'bar');
 
 // TEST CACHE READS
 

www/admin/class_test.session.php

@@ -86,8 +86,10 @@ if (!isset($_SESSION['counter'])) {
 $_SESSION['counter']++;
 print "[READ] A " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 $_SESSION[$var] = $value;
+/** @phpstan-ignore-next-line nullCoalesce.offset */
 print "[READ] B " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 print "[READ] Confirm " . $var . " is " . $value . ": "
+/** @phpstan-ignore-next-line equal.alwaysTrue, nullCoalesce.offset */
 	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
 
 // test set wrappers methods

www/lib/CoreLibs/Combined/DateTime.php

@@ -714,6 +714,66 @@ class DateTime
 		}
 	}
 
+	/**
+	 * wrapper for calcDaysInterval with numeric return only
+	 *
+	 * @param  string $start_date   valid start date (y/m/d)
+	 * @param  string $end_date     valid end date (y/m/d)
+	 * @param  bool   $include_end_date [default=true] include end date in calc
+	 * @param  bool   $exclude_start_date [default=false] include end date in calc
+	 * @return array{0:int,1:int,2:int,3:bool}
+	 */
+	public static function calcDaysIntervalNumIndex(
+		string $start_date,
+		string $end_date,
+		bool $include_end_date = true,
+		bool $exclude_start_date = false
+	): array {
+		$values = self::calcDaysInterval(
+			$start_date,
+			$end_date,
+			false,
+			$include_end_date,
+			$exclude_start_date
+		);
+		return [
+			$values[0] ?? 0,
+			$values[1] ?? 0,
+			$values[2] ?? 0,
+			$values[3] ?? false,
+		];
+	}
+
+	/**
+	 * wrapper for calcDaysInterval with named return only
+	 *
+	 * @param  string $start_date   valid start date (y/m/d)
+	 * @param  string $end_date     valid end date (y/m/d)
+	 * @param  bool   $include_end_date [default=true] include end date in calc
+	 * @param  bool   $exclude_start_date [default=false] include end date in calc
+	 * @return array{overall:int,weekday:int,weekend:int,reverse:bool}
+	 */
+	public static function calcDaysIntervalNamedIndex(
+		string $start_date,
+		string $end_date,
+		bool $include_end_date = true,
+		bool $exclude_start_date = false
+	): array {
+		$values = self::calcDaysInterval(
+			$start_date,
+			$end_date,
+			true,
+			$include_end_date,
+			$exclude_start_date
+		);
+		return [
+			'overall' => $values['overall'] ?? 0,
+			'weekday' => $values['weekday'] ?? 0,
+			'weekend' => $values['weekend'] ?? 0,
+			'reverse' => $values['reverse'] ?? false,
+		];
+	}
+
 	/**
 	 * check if a weekend day (sat/sun) is in the given date range
 	 * Can have time too, but is not needed

www/lib/CoreLibs/Output/ProgressBar.php

@@ -418,9 +418,7 @@ class ProgressBar
 		// if this is percent, we ignore anything, it is auto positioned
 		if ($this->label[$name]['type'] != 'percent') {
 			foreach (['top', 'left', 'width', 'height'] as $pos_name) {
-				if ($$pos_name !== false) {
-					$this->label[$name][$pos_name] = intval($$pos_name);
-				}
+				$this->label[$name][$pos_name] = intval($$pos_name);
 			}
 
 			if ($align != '') {