Tried to fix travis configuration

.travis.yml

@@ -7,21 +7,23 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7
+  - nightly
   - hhvm
- 
+
 matrix:
   allow_failures:
     - php: hhvm
 
+sudo: false
+
 before_script:
-  ## Packages
-  - sudo apt-get -qq update > /dev/null
   ## Composer
   ##@todo Remove when support of 5.2 will be dropped
-  - phpenv global 5.3
+  - if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then phpenv global 5.3; fi;
   - composer self-update
   - composer install --prefer-source --dev
-  - phpenv global "$TRAVIS_PHP_VERSION"
+  - if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then phpenv global "$TRAVIS_PHP_VERSION"; fi;
 
 script:
   ## PHP_CodeSniffer

Classes/PHPExcel.php

@@ -242,7 +242,7 @@ public function getRibbonXMLData($What = 'all') //we need some constants here...
     {
         $ReturnData = null;
         $What = strtolower($What);
-        switch ($What){
+        switch ($What) {
             case 'all':
                 $ReturnData = $this->ribbonXMLData;
                 break;
@@ -286,7 +286,7 @@ public function getRibbonBinObjects($What = 'all')
     {
         $ReturnData = null;
         $What = strtolower($What);
-        switch($What) {
+        switch ($What) {
             case 'all':
                 return $this->ribbonBinObjects;
                 break;

Classes/PHPExcel/Calculation/DateTime.php

@@ -1286,7 +1286,7 @@ public static function MONTHOFYEAR($dateValue = 1)
     {
         $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
 
-        if ($dateValue === null) {
+        if (!$dateValue) {
             $dateValue = 1;
         } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();

Classes/PHPExcel/Style/NumberFormat.php

@@ -264,7 +264,7 @@ private static function fillBuiltInFormatCodes()
         //      40: "#,##0.00_);[Red](#,##0.00)"
         //      47: "mm:ss.0"
         //      KOR fmt 55: "yyyy/mm/dd"
- 
+
         // Built-in format codes
         if (is_null(self::$builtInFormats)) {
             self::$builtInFormats = array();
@@ -444,11 +444,13 @@ public function getHashCode()
             'h'  => 'g'
         );
 
-    private static function setLowercaseCallback($matches) {
+    private static function setLowercaseCallback($matches)
+    {
         return mb_strtolower($matches[0]);
     }
 
-    private static function escapeQuotesCallback($matches) {
+    private static function escapeQuotesCallback($matches)
+    {
         return '\\' . implode('\\', str_split($matches[1]));
     }
 
@@ -689,6 +691,8 @@ public static function toFormattedString($value = '0', $format = PHPExcel_Style_
                     // scale number
                     $value = $value / $scale;
 
+                    $decimalsFormat = strstr($format, '.');
+                    $optionalDecimalsCount = strlen($decimalsFormat) - strlen(rtrim($decimalsFormat, '#'));
                     // Strip #
                     $format = preg_replace('/\\#/', '0', $format);
 
@@ -723,6 +727,11 @@ public static function toFormattedString($value = '0', $format = PHPExcel_Style_
                             }
                         }
                     }
+
+                    while ($optionalDecimalsCount > 0 && substr($value, -1) === '0') {
+                        $value = substr($value, 0, -1);
+                        $optionalDecimalsCount--;
+                    }
                 }
                 if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
                     //  Currency or Accounting

Classes/PHPExcel/Writer/Excel2007/ContentTypes.php

@@ -145,7 +145,7 @@ public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = f
                 $mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
             }
 
-            if (!isset( $aMediaContentTypes[$extension])) {
+            if (!isset($aMediaContentTypes[$extension])) {
                 $aMediaContentTypes[$extension] = $mimeType;
 
                 $this->writeDefaultContentType($objWriter, $extension, $mimeType);
@@ -164,7 +164,7 @@ public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = f
         for ($i = 0; $i < $sheetCount; ++$i) {
             if (count($pPHPExcel->getSheet()->getHeaderFooter()->getImages()) > 0) {
                 foreach ($pPHPExcel->getSheet()->getHeaderFooter()->getImages() as $image) {
-                    if (!isset( $aMediaContentTypes[strtolower($image->getExtension())])) {
+                    if (!isset($aMediaContentTypes[strtolower($image->getExtension())])) {
                         $aMediaContentTypes[strtolower($image->getExtension())] = $this->getImageMimeType($image->getPath());
 
                         $this->writeDefaultContentType($objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]);

Classes/PHPExcel/Writer/Excel5/Worksheet.php

@@ -3231,7 +3231,8 @@ private function writeCFRule(PHPExcel_Style_Conditional $conditional)
                     $dataBlockFont .= pack('C', 0x21);
                     $fontUnderline = 0;
                     break;
-                default: $dataBlockFont .= pack('C', 0x00);
+                default:
+                    $dataBlockFont .= pack('C', 0x00);
                     $fontUnderline = 1;
                     break;
             }

unitTests/Classes/PHPExcel/Reader/XEEValidatorTest.php

@@ -26,9 +26,9 @@ public function testInvalidXML($filename)
 
     public function providerInvalidXML()
     {
-        $tests = [];
+        $tests = array();
         foreach (glob('rawTestData/Reader/XEETestInvalid*.xml') as $file) {
-            $tests[] = [realpath($file), true];
+            $tests[] = array(realpath($file), true);
         }
         return $tests;
     }
@@ -47,7 +47,7 @@ public function providerValidXML()
     {
         $tests = array();
         foreach (glob('rawTestData/Reader/XEETestValid*.xml') as $file) {
-            $tests[] = [realpath($file), file_get_contents($file)];
+            $tests[] = array(realpath($file), file_get_contents($file));
         }
         return $tests;
     }

unitTests/rawTestData/Calculation/DateTime/DATEVALUE.data

@@ -23,7 +23,7 @@
 "31-12-2008",			39813		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
 "8/22/2008",			39682		//	MS Excel success or failure dependent on country settings
 "22/8/2008",			39682		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
-"22/8/08",			39682
+"22/8/08",			39682		//	MS Excel reads 22-08-2008 (dependent on country settings?) PHPExcel currently reads 08-08-2022 - FIX NEEDED?
 "22-AUG-2008",			39682
 "2008/02/23",			39501
 "6-7-2008",			39635
@@ -35,11 +35,11 @@
 "22 August 98",			36029
 "1st March 2007",		39142		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
 "The 1st day of March 2007",	"#VALUE!"
-"1 Jan",			41275
-"31/12",			41639
-"12/31",			11658		//	Excel reads as 1st December 1931, not 31st December in current year
-"5-JUL",			41460
-"5 Jul",			41460
+"1 Jan",			42005		//	dependent on "current" year! more dynamic provider logic needed?
+"31/12",			42369		//	dependent on "current" year! more dynamic provider logic needed?
+"12/31",			11658		//	Excel reads as 1st December 1931, not 31st December in current year - FIX NEEDED?
+"5-JUL",			42190		//	dependent on "current" year! more dynamic provider logic needed?
+"5 Jul",			42190		//	dependent on "current" year! more dynamic provider logic needed?
 "12/2008",			39783
 "10/32",			11963
 11,				"#VALUE!"

unitTests/rawTestData/Calculation/DateTime/HOUR.data

@@ -5,8 +5,8 @@
 "11-Nov-1918 11:11",	11
 "11:59 PM",		23
 "23:59:59",		23
-3600,			2
--3600,			0
-7200,			3
-65535,			19
+3600,			2		//	FIXME: timeValue is treated as days from start of excel time (1900) - so this ever delivers 0, testing 01:00 has to deliver 3600 / 24 * 60 * 60
+-3600,			0		//	FIXME: function not allows this. returns "#NUM!"
+7200,			3		//	FIXME: timeValue is treated as days from start of excel time (1900) - so this ever delivers 0, testing 02:00 has to deliver 7200 / 24 * 60 * 60
+65535,			19		//	FIXME: timeValue is treated as days from start of excel time (1900) - so this ever delivers 0, ...
 "1 O'Clock",		"#VALUE!"

unitTests/rawTestData/Calculation/DateTime/TIMEVALUE.data

@@ -9,5 +9,5 @@
 "9:44:55 pm",		0.90619213
 12,			"#VALUE!"
 "13:01",		0.542361111
-"33:45",		0.40625
+"33:45",		0.40625		//	date_parse("33:45") delivers error "unexpected character" - MS Excel parses "01.01.1900  09:45:00" and so 0.40625 - FIX NEEDED?
 "13:01PM",		"#VALUE!"

unitTests/rawTestData/Calculation/DateTime/WEEKDAY.data

@@ -17,7 +17,7 @@
 "1977-8-1",	2,	1
 "1977-8-1",	3,	0
 "1900-2-5",	2,	7
-"1900-2-1",		1
+"1900-2-1",		4
 38093,			6
 38093,		2,	5
 38093,		3,	4

unitTests/rawTestData/Style/NumberFormat.data

@@ -8,7 +8,7 @@
 0.1,		"0.0",									"0.1"
 0.1,		"0",									"0"
 5.5555,		"0.###",								"5.556"
-5.5555,		"0.0##",								"5.556"	
+5.5555,		"0.0##",								"5.556"
 5.5555,		"0.00#",								"5.556"
 5.5555,		"0.000",								"5.556"
 5.5555,		"0.0000",								"5.5555"
@@ -35,3 +35,15 @@
 -123456789,	'0000:00:00',							"-12345:67:89"
 1234567.89,	'0000:00.00',							"12345:67.89"
 -1234567.89,'0000:00.00',							"-12345:67.89"
+12345.6789,	'"#,##0.##"',							'"12,345.68"'		// test case from above
+12345.6,	'"#,##0.00"',							'"12,345.60"'		// 0 means: show decimal
+12345.6,	'"#,##0.##"',							'"12,345.6"'		// # means: "cut off zeros"
+12345,		'"#,##0.00"',							'"12,345.00"'		// 0 means: show decimal
+12345,		'"#,##0.##"',							'"12,345."'			// # means: "cut off zeros" (decimal separator can not be made optional by excel)
+12345.6789,	'"#,##0.0#"',							'"12,345.68"'		// first not optional, second optional
+12345.6,	'"#,##0.0#"',							'"12,345.6"'		// first not optional, second optional
+12345,		'"#,##0.0#"',							'"12,345.0"'		// first not optional, second optional
+12345.6789,	'"#,##0.000#"',							'"12,345.6789"'
+12345.6,	'"#,##0.000#"',							'"12,345.600"'
+12345.6789,	'"#,##0.0#0#"',							'"12,345.6789"'		// treated like .000#
+12345.6,	'"#,##0.0#0#"',							'"12,345.600"'		// treated like .000#