From b669d48f2f3b2fab2f8bf3e4c9d47ea352e58719 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Sat, 11 Mar 2017 12:13:37 +0900 Subject: [PATCH] Un-deprecate `getCalculatedValue()` Those were deprecated a long time ago in 59932b0cac4aec4ba13b17f9f36b0b939bc083c4 but their replacement seems to have never been added. 5 years later the best solution is to un-deprecate them and if someday their replacement are actually added, then we can re-deprecate them properly. Closes #22 --- src/PhpSpreadsheet/Cell.php | 6 ++---- src/PhpSpreadsheet/Reader/Xlsx.php | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/PhpSpreadsheet/Cell.php b/src/PhpSpreadsheet/Cell.php index 889739a3..c035bcef 100644 --- a/src/PhpSpreadsheet/Cell.php +++ b/src/PhpSpreadsheet/Cell.php @@ -259,8 +259,6 @@ class Cell /** * Get calculated cell value. * - * @deprecated Since version 1.7.8 for planned changes to cell for array formula handling - * * @param bool $resetLog Whether the calculation engine logger should be reset or not * * @throws Exception @@ -1037,7 +1035,7 @@ class Cell } /** - * @deprecated Since version 1.7.8 for planned changes to cell for array formula handling + * Set the formula attributes. * * @param mixed $pAttributes */ @@ -1049,7 +1047,7 @@ class Cell } /** - * @deprecated Since version 1.7.8 for planned changes to cell for array formula handling + * Get the formula attributes. */ public function getFormulaAttributes() { diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php index 26edd1a1..5d582e25 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx.php +++ b/src/PhpSpreadsheet/Reader/Xlsx.php @@ -899,7 +899,6 @@ class Xlsx extends BaseReader implements IReader // Formula $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToBoolean'); if (isset($c->f['t'])) { - $att = []; $att = $c->f; $docSheet->getCell($r)->setFormulaAttributes($att); }