dave/PHPExcel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more PHP 8 changes

Browse Source
This commit is contained in:
Dave Umrysh 2022-12-21 07:13:25 -07:00
parent c643d2702c
commit 29eca5f71f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PHPExcel/Calculation.php
View File

@ -2955,7 +2955,7 @@ class PHPExcel_Calculation {
// echo 'Element is a Variable, Constant, String, Number or Boolean<br />'; // echo 'Element is a Variable, Constant, String, Number or Boolean<br />';
// If the last entry on the stack was a : operator, then we may have a row or column range reference // If the last entry on the stack was a : operator, then we may have a row or column range reference
$testPrevOp = $stack->last(1); $testPrevOp = $stack->last(1);
if ($testPrevOp['value'] == ':') { if (isset($testPrevOp['value']) && $testPrevOp['value'] == ':') {
$startRowColRef = $output[count($output)-1]['value']; $startRowColRef = $output[count($output)-1]['value'];
$rangeWS1 = ''; $rangeWS1 = '';
if (strpos('!',$startRowColRef) !== FALSE) { if (strpos('!',$startRowColRef) !== FALSE) {

4
PHPExcel/ReferenceHelper.php
View File

@ -889,9 +889,9 @@ class PHPExcel_ReferenceHelper
list($newColumn, $newRow) = PHPExcel_Cell::coordinateFromString( $pCellReference ); list($newColumn, $newRow) = PHPExcel_Cell::coordinateFromString( $pCellReference );
// Verify which parts should be updated // Verify which parts should be updated
$updateColumn = (($newColumn{0} != '$') && ($beforeColumn{0} != '$') && $updateColumn = (($newColumn[0] != '$') && ($beforeColumn[0] != '$') &&
PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)); PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn));
$updateRow = (($newRow{0} != '$') && ($beforeRow{0} != '$') && $updateRow = (($newRow[0] != '$') && ($beforeRow[0] != '$') &&
$newRow >= $beforeRow); $newRow >= $beforeRow);
// Create new column reference // Create new column reference