← All changes | libraries/vendor/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php +6 -4 3.3.2 → 3.4 View file →

		@@ -203,10 +203,11 @@
203	203	$reference = str_replace("\u{a0}", ' ', $this->reference);
204	204	/** @var string $reference */
205	205	$reference = str_replace('[' . self::ITEM_SPECIFIER_THIS_ROW . '],', '', $reference);
206	206
207		- foreach ($this->columns as $columnId => $columnName) {
208		- $columnName = str_replace("\u{a0}", ' ', $columnName); //* @phpstan-ignore-line
	207	+ foreach ($this->columns as $columnId => $columnNamex) {
	208	+ /** @var string $columnNamex */
	209	+ $columnName = str_replace("\u{a0}", ' ', $columnNamex);
209	210	$reference = $this->adjustRowReference($columnName, $reference, $cell, $columnId);
210	211	}
211	212
212	213	return $this->validateParsedReference(trim($reference, '[]@, '));
		@@ -347,10 +348,11 @@
347	348
348	349	private function getColumnsForColumnReference(string $reference, int $startRow, int $endRow): string
349	350	{
350	351	$columnsSelected = false;
351		- foreach ($this->columns as $columnId => $columnName) {
352		- $columnName = str_replace("\u{a0}", ' ', $columnName ?? ''); //* @phpstan-ignore-line
	352	+ foreach ($this->columns as $columnId => $columnNamex) {
	353	+ /** @var ?string $columnNamex */
	354	+ $columnName = str_replace("\u{a0}", ' ', $columnNamex ?? '');
353	355	$cellFrom = "{$columnId}{$startRow}";
354	356	$cellTo = "{$columnId}{$endRow}";
355	357	$cellReference = ($cellFrom === $cellTo) ? $cellFrom : "{$cellFrom}:{$cellTo}";
356	358	$pattern = '/\[' . preg_quote($columnName, '/') . '\]/mui';