Commulative update (Pass options, php7 and more)

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 test
-materials
+materials
+.idea

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v.0.5.12  2016-03-18
+
+- Added a fix for recognising dates in XLS files created by LibreOffice
+
 ### v.0.5.11  2015-04-30
 
 - Added a special case for cells formatted as text in XLSX. Previously leading zeros would get truncated if a text cell contained only numbers.
@@ -50,10 +54,10 @@ Currently only decimal number values are converted to PHP's floats.
 
 ### v.0.5.1  2013-06-27
 
-- Fixed file type choice when using mime-types (previously there were problems with  
+- Fixed file type choice when using mime-types (previously there were problems with
 XLSX and ODS mime-types) (Thanks to [incratec](https://github.com/incratec))
 
-- Fixed an error in XLSX iterator where `current()` would advance the iterator forward  
+- Fixed an error in XLSX iterator where `current()` would advance the iterator forward
 with each call. (Thanks to [osuwariboy](https://github.com/osuwariboy))
 
 ### v.0.5.0  2013-06-17
@@ -62,19 +66,19 @@ with each call. (Thanks to [osuwariboy](https://github.com/osuwariboy))
 	- The `Sheets()` method lets you retrieve a list of all sheets present in the file.
 	- `ChangeSheet($Index)` method changes the sheet in the reader to the one specified.
 
-- Previously temporary files that were extracted, were deleted after the SpreadsheetReader  
-was destroyed but the empty directories remained. Now those are cleaned up as well.  
+- Previously temporary files that were extracted, were deleted after the SpreadsheetReader
+was destroyed but the empty directories remained. Now those are cleaned up as well.
 
 ### v.0.4.3  2013-06-14
 
-- Bugfix for shared string caching in XLSX files. When the shared string count was larger  
-than the caching limit, instead of them being read from file, empty strings were returned.  
+- Bugfix for shared string caching in XLSX files. When the shared string count was larger
+than the caching limit, instead of them being read from file, empty strings were returned.
 
 ### v.0.4.2  2013-06-02
 
-- XLS file reading relies on the external Spreadsheet_Excel_Reader class which, by default,  
-reads additional information about cells like fonts, styles, etc. Now that is disabled  
-to save some memory since the style data is unnecessary anyway.  
+- XLS file reading relies on the external Spreadsheet_Excel_Reader class which, by default,
+reads additional information about cells like fonts, styles, etc. Now that is disabled
+to save some memory since the style data is unnecessary anyway.
 (Thanks to [ChALkeR](https://github.com/ChALkeR) for the tip.)
 
-Martins Pilsetnieks  <pilsetnieks@gmail.com>
+Martins Pilsetnieks  <pilsetnieks@gmail.com>

README.md

@@ -57,6 +57,15 @@ Example:
 If a sheet is changed to the same that is currently open, the position in the file still reverts to the beginning, so as to conform
 to the same behavior as when changed to a different sheet.
 
+Passing options:
+
+	<?php
+		$Options = array(
+			'TempDir' => "/tmp"
+        );
+		$Reader = new SpreadsheetReader('example.xlsx', false, false, $Options);
+	?>
+
 ### Testing
 
 From the command line:

SpreadsheetReader.php

@@ -13,7 +13,7 @@ class SpreadsheetReader implements SeekableIterator, Countable
 		const TYPE_ODS = 'ODS';
 
 		private $Options = array(
-			'Delimiter' => '',
+			'Delimiter' => ';',
 			'Enclosure' => '"'
 		);
 
@@ -37,7 +37,7 @@ class SpreadsheetReader implements SeekableIterator, Countable
 		 * @param string Original filename (in case of an uploaded file), used to determine file type, optional
 		 * @param string MIME type from an upload, used to determine file type, optional
 		 */
-		public function __construct($Filepath, $OriginalFilename = false, $MimeType = false)
+		public function __construct($Filepath, $OriginalFilename = false, $MimeType = false, $Options = array())
 		{
 			if (!is_readable($Filepath))
 			{
@@ -158,12 +158,15 @@ public function __construct($Filepath, $OriginalFilename = false, $MimeType = fa
 				}
 			}
 
+			// Get options before creating handle
+			$this -> Options = array_merge($this -> Options, $Options);
+
 			// 2. Create handle
 			switch ($this -> Type)
 			{
 				case self::TYPE_XLSX:
 					self::Load(self::TYPE_XLSX);
-					$this -> Handle = new SpreadsheetReader_XLSX($Filepath);
+					$this -> Handle = new SpreadsheetReader_XLSX($Filepath, $this -> Options);
 					break;
 				case self::TYPE_CSV:
 					self::Load(self::TYPE_CSV);

SpreadsheetReader_CSV.php

@@ -11,7 +11,8 @@ class SpreadsheetReader_CSV implements Iterator, Countable
 		 */
 		private $Options = array(
 			'Delimiter' => ';',
-			'Enclosure' => '"'
+			'Enclosure' => '"',
+			'Encoding' => 'auto'
 		);
 
 		private $Encoding = 'UTF-8';
@@ -49,6 +50,43 @@ public function __construct($Filepath, array $Options = null)
 			$this -> Options = array_merge($this -> Options, $Options);
 			$this -> Handle = fopen($Filepath, 'r');
 
+			if( $this -> Options['Encoding'] == "auto" )
+			{
+				$this -> AutoDetectEncoding();
+			}
+			else{
+				$this -> Encoding = $this -> Options['Encoding'];
+			}
+
+			// Checking for the delimiter if it should be determined automatically
+			if (!$this -> Options['Delimiter'])
+			{
+				// fgetcsv needs single-byte separators
+				$Semicolon = ';';
+				$Tab = "\t";
+				$Comma = ',';
+
+				// Reading the first row and checking if a specific separator character
+				// has more columns than others (it means that most likely that is the delimiter).
+				$SemicolonCount = count(fgetcsv($this -> Handle, null, $Semicolon));
+				fseek($this -> Handle, $this -> BOMLength);
+				$TabCount = count(fgetcsv($this -> Handle, null, $Tab));
+				fseek($this -> Handle, $this -> BOMLength);
+				$CommaCount = count(fgetcsv($this -> Handle, null, $Comma));
+				fseek($this -> Handle, $this -> BOMLength);
+
+				$Delimiter = $Semicolon;
+				if ($TabCount > $SemicolonCount || $CommaCount > $SemicolonCount)
+				{
+					$Delimiter = $CommaCount > $TabCount ? $Comma : $Tab;
+				}
+
+				$this -> Options['Delimiter'] = $Delimiter;
+			}
+		}
+
+		private function AutoDetectEncoding()
+		{
 			// Checking the file for byte-order mark to determine encoding
 			$BOM16 = bin2hex(fread($this -> Handle, 2));
 			if ($BOM16 == 'fffe')
@@ -95,32 +133,6 @@ public function __construct($Filepath, array $Options = null)
 			{
 				fseek($this -> Handle, $this -> BOMLength);
 			}
-
-			// Checking for the delimiter if it should be determined automatically
-			if (!$this -> Options['Delimiter'])
-			{
-				// fgetcsv needs single-byte separators
-				$Semicolon = ';';
-				$Tab = "\t";
-				$Comma = ',';
-
-				// Reading the first row and checking if a specific separator character
-				// has more columns than others (it means that most likely that is the delimiter).
-				$SemicolonCount = count(fgetcsv($this -> Handle, null, $Semicolon));
-				fseek($this -> Handle, $this -> BOMLength);
-				$TabCount = count(fgetcsv($this -> Handle, null, $Tab));
-				fseek($this -> Handle, $this -> BOMLength);
-				$CommaCount = count(fgetcsv($this -> Handle, null, $Comma));
-				fseek($this -> Handle, $this -> BOMLength);
-
-				$Delimiter = $Semicolon;
-				if ($TabCount > $SemicolonCount || $CommaCount > $SemicolonCount)
-				{
-					$Delimiter = $CommaCount > $TabCount ? $Comma : $Tab;
-				}
-
-				$this -> Options['Delimiter'] = $Delimiter;
-			}
 		}
 
 		/**

SpreadsheetReader_XLSX.php

@@ -20,7 +20,7 @@ class SpreadsheetReader_XLSX implements Iterator, Countable
 		 *	With large shared string caches there are huge performance gains, however a lot of memory could be used which
 		 *	can be a problem, especially on shared hosting.
 		 */
-		const SHARED_STRING_CACHE_LIMIT = 50000;
+		const SHARED_STRING_CACHE_LIMIT = null;
 
 		private $Options = array(
 			'TempDir' => '',
@@ -370,17 +370,29 @@ public function Sheets()
 				$this -> Sheets = array();
 				foreach ($this -> WorkbookXML -> sheets -> sheet as $Index => $Sheet)
 				{
-					$Attributes = $Sheet -> attributes('r', true);
-					foreach ($Attributes as $Name => $Value)
+					$AttributesWithPrefix = $Sheet -> attributes('r', true);
+					$Attributes = $Sheet -> attributes();
+
+					$rId = 0;
+					$sheetId = 0;
+
+					foreach ($AttributesWithPrefix as $Name => $Value)
 					{
 						if ($Name == 'id')
 						{
-							$SheetID = (int)str_replace('rId', '', (string)$Value);
+							$rId = (int)str_replace('rId', '', (string)$Value);
+							break;
+						}
+					}
+					foreach ($Attributes as $Name => $Value)
+					{
+						if ($Name == 'sheetId') {
+							$sheetId = (int)$Value;
 							break;
 						}
 					}
 
-					$this -> Sheets[$SheetID] = (string)$Sheet['name'];
+					$this -> Sheets[min($rId, $sheetId)] = (string)$Sheet['name'];
 				}
 				ksort($this -> Sheets);
 			}
@@ -453,7 +465,7 @@ private function PrepareSharedStringCache()
 					case 't':
 						if ($this -> SharedStrings -> nodeType == XMLReader::END_ELEMENT)
 						{
-							continue;
+							break;
 						}
 						$CacheValue .= $this -> SharedStrings -> readString();
 						break;
@@ -556,7 +568,7 @@ private function GetSharedString($Index)
 							$this -> SharedStrings -> next('si');
 							$this -> SSForwarded = true;
 							$this -> SharedStringIndex++;
-							continue;
+							break;
 						}
 						else
 						{
@@ -578,7 +590,7 @@ private function GetSharedString($Index)
 						case 't':
 							if ($this -> SharedStrings -> nodeType == XMLReader::END_ELEMENT)
 							{
-								continue;
+								break;
 							}
 							$Value .= $this -> SharedStrings -> readString();
 							break;
@@ -891,7 +903,7 @@ private function FormatValue($Value, $Index)
 						// Scaling
 						$Value = $Value / $Format['Scale'];
 
-						if (!empty($Format['MinWidth']) && $Format['Decimals'])
+						if (!empty($Format['MinWidth']))
 						{
 							if ($Format['Thousands'])
 							{
@@ -910,7 +922,7 @@ private function FormatValue($Value, $Index)
 					// Currency/Accounting
 					if ($Format['Currency'])
 					{
-						$Value = preg_replace('', $Format['Currency'], $Value);
+						$Value = preg_replace('/\[.+\]/', $Format['Currency'], $Value);
 					}
 				}
 
@@ -929,7 +941,7 @@ private function FormatValue($Value, $Index)
 		public function GeneralFormat($Value)
 		{
 			// Numeric format
-			if (is_numeric($Value))
+			if (is_numeric($Value) && $Value[0] != 0)
 			{
 				$Value = (float)$Value;
 			}
@@ -1046,7 +1058,7 @@ public function next()
 							// If it is a closing tag, skip it
 							if ($this -> Worksheet -> nodeType == XMLReader::END_ELEMENT)
 							{
-								continue;
+								break;
 							}
 
 							$StyleId = (int)$this -> Worksheet -> getAttribute('s');
@@ -1080,7 +1092,7 @@ public function next()
 						case 'is':
 							if ($this -> Worksheet -> nodeType == XMLReader::END_ELEMENT)
 							{
-								continue;
+								break;
 							}
 
 							$Value = $this -> Worksheet -> readString();
@@ -1099,6 +1111,14 @@ public function next()
 							{
 								$Value = $this -> GeneralFormat($Value);
 							}
+							elseif ($Value)
+							{
+								$Value = $this -> GeneralFormat($Value);
+							}
+							elseif ($Value)
+							{
+								$Value = $this -> GeneralFormat($Value);
+							}
 
 							$this -> CurrentRow[$Index] = $Value;
 							break;

composer.json

@@ -3,8 +3,6 @@
 	"description": "Spreadsheet reader library for Excel, OpenOffice and structured text files",
 	"keywords": ["spreadsheet", "xls", "xlsx", "ods", "csv", "excel", "openoffice"],
 	"homepage": "https://github.com/nuovo/spreadsheet-reader",
-	"version": "0.5.11",
-	"time": "2015-04-30",
 	"type": "library",
 	"license": ["MIT"],
 	"authors": [