From 66570a6b7b49f98e05dd5dec2501d022031f458f Mon Sep 17 00:00:00 2001 From: James Leslie Date: Tue, 10 Oct 2017 09:28:37 -0700 Subject: [PATCH] 1.8.1.1 - Defaulting zoom scale rather than throwing exception --- Classes/PHPExcel/Worksheet/SheetView.php | 4 ++-- composer.json | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Classes/PHPExcel/Worksheet/SheetView.php b/Classes/PHPExcel/Worksheet/SheetView.php index 8ced835dd..db16a8167 100644 --- a/Classes/PHPExcel/Worksheet/SheetView.php +++ b/Classes/PHPExcel/Worksheet/SheetView.php @@ -105,7 +105,7 @@ public function setZoomScale($pValue = 100) { if (($pValue >= 1) || is_null($pValue)) { $this->_zoomScale = $pValue; } else { - throw new PHPExcel_Exception("Scale must be greater than or equal to 1."); + $this->_zoomScale = 100; } return $this; } @@ -132,7 +132,7 @@ public function setZoomScaleNormal($pValue = 100) { if (($pValue >= 1) || is_null($pValue)) { $this->_zoomScaleNormal = $pValue; } else { - throw new PHPExcel_Exception("Scale must be greater than or equal to 1."); + $this->_zoomScaleNormal = 100; } return $this; } diff --git a/composer.json b/composer.json index ff18cb842..9ba0ae7ca 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "phpoffice/phpexcel", "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", "keywords": ["PHP","Excel","OpenXML","xlsx","xls","spreadsheet"], - "homepage": "http://phpexcel.codeplex.com", + "homepage": "http://github.com/eventfarm/phpexcel", "type": "library", "license": "LGPL", "authors": [ @@ -19,6 +19,9 @@ }, { "name": "Erik Tilt" + }, + { + "name": "James Leslie" } ], "require": {