From 2b41bdbf4eb44b7d76f875f04509318265517b1f Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 5 Oct 2016 14:06:39 +0900 Subject: [PATCH] Loosen type checking to allow both use-cases Previously it crashed when loading an file containing conditional formatting FIX #21 --- src/PhpSpreadsheet/Reader/Excel2007.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PhpSpreadsheet/Reader/Excel2007.php b/src/PhpSpreadsheet/Reader/Excel2007.php index cbfc340c..a86f1abc 100644 --- a/src/PhpSpreadsheet/Reader/Excel2007.php +++ b/src/PhpSpreadsheet/Reader/Excel2007.php @@ -1875,9 +1875,9 @@ class Excel2007 extends BaseReader implements IReader /** * @param \PhpOffice\PhpSpreadsheet\Style $docStyle - * @param \stdClass $style + * @param \stdClass|\SimpleXMLElement $style */ - private static function readStyle($docStyle, \stdClass $style) + private static function readStyle(\PhpOffice\PhpSpreadsheet\Style $docStyle, $style) { $docStyle->getNumberFormat()->setFormatCode($style->numFmt);