Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Classes/PHPExcel/Calculation/Functions.php
#	Classes/PHPExcel/Worksheet.php
#	Classes/PHPExcel/Worksheet/CellIterator.php

Classes/PHPExcel/Calculation/Functions.php

@@ -518,15 +518,14 @@ class PHPExcel_Calculation_Functions
     }
 
 
-    /**
+	/**
-     * VERSION
+	 * VERSION
-     *
+	 *
-     * @return    string    Version information
+	 * @return	string	Version information
-     */
+	 */
-    public static function VERSION()
+	public static function VERSION() {
-    {
+		return 'PHPExcel 1.8.2, 2018-11-22';
-        return 'PHPExcel ##VERSION##, ##DATE##';
+	}	//	function VERSION()
-    }
 
 
     /**

Classes/PHPExcel/Reader/Abstract.php

@@ -269,6 +269,18 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      */
     public function securityScan($xml)
     {
+        $pattern = '/encoding="(.*?)"/';
+        $result = preg_match($pattern, $xml, $matches);
+        if ($result) {
+            $charset = $matches[1];
+        } else {
+            $charset = 'UTF-8';
+        }
+
+        if ($charset !== 'UTF-8') {
+            $xml = mb_convert_encoding($xml, 'UTF-8', $charset);
+        }
+
         $pattern = '/\\0?' . implode('\\0?', str_split('<!DOCTYPE')) . '\\0?/';
         if (preg_match($pattern, $xml)) {
             throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');

Classes/PHPExcel/Shared/OLE.php

@@ -285,7 +285,7 @@ class PHPExcel_Shared_OLE
                     $pps = new PHPExcel_Shared_OLE_PPS_File($name);
                     break;
                 default:
-                    continue 2;
+                    continue;
             }
             fseek($fh, 1, SEEK_CUR);
             $pps->Type    = $type;

Classes/PHPExcel/Worksheet/CellIterator.php

@@ -70,7 +70,7 @@ abstract class PHPExcel_Worksheet_CellIterator
      * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
      *
      * @throws PHPExcel_Exception
-     */
+	 */
     abstract protected function adjustForExistingOnlyRange();
 
     /**

README.md

@@ -1,9 +1,49 @@
-# PHPExcel - DEAD
+# PHPExcel - OpenXML - Read, Write and Create spreadsheet documents in PHP - Spreadsheet engine
+PHPExcel is a library written in pure PHP and providing a set of classes that allow you to write to and read from different spreadsheet file formats, like Excel (BIFF) .xls, Excel 2007 (OfficeOpenXML) .xlsx, CSV, Libre/OpenOffice Calc .ods, Gnumeric, PDF, HTML, ... This project is built around Microsoft's OpenXML standard and PHP.
 
-PHPExcel last version, 1.8.1, was released in 2015. The project was officially deprecated in 2017 and permanently archived in 2019.
+Master: [![Build Status](https://travis-ci.org/PHPOffice/PHPExcel.png?branch=master)](http://travis-ci.org/PHPOffice/PHPExcel)
+
+Develop: [![Build Status](https://travis-ci.org/PHPOffice/PHPExcel.png?branch=develop)](http://travis-ci.org/PHPOffice/PHPExcel)
+
+[![Join the chat at https://gitter.im/PHPOffice/PHPExcel](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPExcel)
+
+## File Formats supported
+
+### Reading
+ * BIFF 5-8 (.xls) Excel 95 and above
+ * Office Open XML (.xlsx) Excel 2007 and above
+ * SpreadsheetML (.xml) Excel 2003
+ * Open Document Format/OASIS (.ods)
+ * Gnumeric
+ * HTML
+ * SYLK
+ * CSV
+
+### Writing
+ * BIFF 8 (.xls) Excel 95 and above
+ * Office Open XML (.xlsx) Excel 2007 and above
+ * HTML
+ * CSV
+ * PDF (using either the tcPDF, DomPDF or mPDF libraries, which need to be installed separately)
+
+
+## Requirements
+ * PHP version 5.2.0 or higher
+ * PHP extension php_zip enabled (required if you need PHPExcel to handle .xlsx .ods or .gnumeric files)
+ * PHP extension php_xml enabled
+ * PHP extension php_gd2 enabled (optional, but required for exact column width autocalculation)
+
+
+## Want to contribute?
+
+If you would like to contribute, here are some notes and guidlines:
+ - All new development happens on the 1.8 branch, so it is always the most up-to-date
+ - The master branch only contains tagged releases
+ - If you are going to be submitting a pull request, please fork from 1.8, and submit your pull request back to that 1.8 branch
+ - Wherever possible, code changes should conform as closely as possible to PSR-2 standards
+ - [Helpful article about forking](https://help.github.com/articles/fork-a-repo/ "Forking a Github repository")
+ - [Helpful article about pull requests](https://help.github.com/articles/using-pull-requests/ "Pull Requests")
 
-The project has not be maintained for years and must not be used anymore. **All users must migrate** to its direct successor [PhpSpreadsheet](https://github.com/PHPOffice/PhpSpreadsheet), or another alternative.
 
 ## License
-
 PHPExcel is licensed under [LGPL (GNU LESSER GENERAL PUBLIC LICENSE)](https://github.com/PHPOffice/PHPExcel/blob/master/license.md)

changelog.txt

@@ -23,7 +23,8 @@
 **************************************************************************************
 
 
-Planned for 1.8.2
+2018-11-22 (v1.8.2):
+- Security  (MBaker)                            - Fix and improve XXE security scanning for XML-based Readers
 - Bugfix:   (MBaker)                            - Fix to getCell() method when cell reference includes a worksheet reference
 - Bugfix:   (ncrypthic)       Work Item GH-570  - Ignore inlineStr type if formula element exists
 - Bugfix:   (hernst42)        Work Item GH-709  - Fixed missing renames of writeRelationShip (from _writeRelationShip)