PHPOffice / PhpSpreadsheet

tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php

Indentation +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
             ->getMock();
         // Configure the stub.
         $this->cellStub->expects($this->any())
-             ->method('setValueExplicit')
-             ->will($this->returnValue(true));
+                ->method('setValueExplicit')
+                ->will($this->returnValue(true));
 
     }
 

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     public function testDataTypeForValue()
     {
         list($args, $expectedResult) = func_get_args();
-        $result = call_user_func_array(array(DefaultValueBinder::class,'dataTypeForValue'), $args);
+        $result = call_user_func_array(array(DefaultValueBinder::class, 'dataTypeForValue'), $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -81,7 +81,7 @@ 
         $objRichText->createText('Hello World');
 
         $expectedResult = DataType::TYPE_INLINE;
-        $result = call_user_func(array(DefaultValueBinder::class,'dataTypeForValue'), $objRichText);
+        $result = call_user_func(array(DefaultValueBinder::class, 'dataTypeForValue'), $objRichText);
         $this->assertEquals($expectedResult, $result);
     }
 }

tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php

Indentation +11 added lines, -11 removed lines

@@ -45,22 +45,22 @@
             ->disableOriginalConstructor()
             ->getMock();
         $cache->expects($this->any())
-                 ->method('getParent')
-                 ->will($this->returnValue($sheet));
+                    ->method('getParent')
+                    ->will($this->returnValue($sheet));
 
         $sheet->expects($this->once())
-                 ->method('getStyle')
-                 ->will($this->returnSelf());
+                    ->method('getStyle')
+                    ->will($this->returnSelf());
         $sheet->expects($this->once())
-                 ->method('getNumberFormat')
-                 ->will($this->returnSelf());
+                    ->method('getNumberFormat')
+                    ->will($this->returnSelf());
         $sheet->expects($this->once())
-                 ->method('setFormatCode')
-                 ->with($format)
-                 ->will($this->returnSelf());
+                    ->method('setFormatCode')
+                    ->with($format)
+                    ->will($this->returnSelf());
         $sheet->expects($this->any())
-                 ->method('getCellCacheController')
-                 ->will($this->returnValue($cache));
+                    ->method('getCellCacheController')
+                    ->will($this->returnValue($cache));
 
         \PHPExcel\Shared\StringHelper::setCurrencyCode($currencyCode);
         \PHPExcel\Shared\StringHelper::setDecimalSeparator($decimalSeparator);

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $sheet = $this->getMock(
             '\\PHPExcel\\Worksheet',
-            array('getStyle', 'getNumberFormat', 'setFormatCode','getCellCacheController')
+            array('getStyle', 'getNumberFormat', 'setFormatCode', 'getCellCacheController')
         );
         $cache = $this->getMockBuilder('\\PHPExcel\\CachedObjectStorage\\Memory')
             ->disableOriginalConstructor()

tests/PhpSpreadsheet/Cell/DataTypeTest.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     public function testGetErrorCodes()
     {
-        $result = call_user_func(array(DataType::class,'getErrorCodes'));
+        $result = call_user_func(array(DataType::class, 'getErrorCodes'));
         $this->assertInternalType('array', $result);
         $this->assertGreaterThan(0, count($result));
         $this->assertArrayHasKey('#NULL!', $result);

tests/PhpSpreadsheet/SettingsTest.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
      */
     public function testGetXMLSettings()
     {
-        $result = call_user_func(array('PHPExcel\\Settings','getLibXmlLoaderOptions'));
+        $result = call_user_func(array('PHPExcel\\Settings', 'getLibXmlLoaderOptions'));
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR) & $result));
     }
 
@@ -21,8 +21,8 @@ 
      */
     public function testSetXMLSettings()
     {
-        call_user_func_array(array('PHPExcel\\Settings','setLibXmlLoaderOptions'), [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]);
-        $result = call_user_func(array('PHPExcel\\Settings','getLibXmlLoaderOptions'));
+        call_user_func_array(array('PHPExcel\\Settings', 'setLibXmlLoaderOptions'), [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]);
+        $result = call_user_func(array('PHPExcel\\Settings', 'getLibXmlLoaderOptions'));
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result));
     }
 

tests/PhpSpreadsheet/ReferenceHelperTest.php

Spacing +22 added lines, -22 removed lines

@@ -14,19 +14,19 @@ 
     public function testColumnSort()
     {
         $columnBase = $columnExpectedResult = [
-            'A','B','Z',
-            'AA','AB','AZ',
-            'BA','BB','BZ',
-            'ZA','ZB','ZZ',
-            'AAA','AAB','AAZ',
-            'ABA','ABB','ABZ',
-            'AZA','AZB','AZZ',
-            'BAA','BAB','BAZ',
-            'BBA','BBB','BBZ',
-            'BZA','BZB','BZZ'
+            'A', 'B', 'Z',
+            'AA', 'AB', 'AZ',
+            'BA', 'BB', 'BZ',
+            'ZA', 'ZB', 'ZZ',
+            'AAA', 'AAB', 'AAZ',
+            'ABA', 'ABB', 'ABZ',
+            'AZA', 'AZB', 'AZZ',
+            'BAA', 'BAB', 'BAZ',
+            'BBA', 'BBB', 'BBZ',
+            'BZA', 'BZB', 'BZZ'
         ];
         shuffle($columnBase);
-        usort($columnBase, array(ReferenceHelper::class,'columnSort'));
+        usort($columnBase, array(ReferenceHelper::class, 'columnSort'));
         foreach ($columnBase as $key => $value) {
             $this->assertEquals($columnExpectedResult[$key], $value);
         }
@@ -35,20 +35,20 @@ 
     public function testColumnReverseSort()
     {
         $columnBase = $columnExpectedResult = [
-            'A','B','Z',
-            'AA','AB','AZ',
-            'BA','BB','BZ',
-            'ZA','ZB','ZZ',
-            'AAA','AAB','AAZ',
-            'ABA','ABB','ABZ',
-            'AZA','AZB','AZZ',
-            'BAA','BAB','BAZ',
-            'BBA','BBB','BBZ',
-            'BZA','BZB','BZZ'
+            'A', 'B', 'Z',
+            'AA', 'AB', 'AZ',
+            'BA', 'BB', 'BZ',
+            'ZA', 'ZB', 'ZZ',
+            'AAA', 'AAB', 'AAZ',
+            'ABA', 'ABB', 'ABZ',
+            'AZA', 'AZB', 'AZZ',
+            'BAA', 'BAB', 'BAZ',
+            'BBA', 'BBB', 'BBZ',
+            'BZA', 'BZB', 'BZZ'
         ];
         shuffle($columnBase);
         $columnExpectedResult = array_reverse($columnExpectedResult);
-        usort($columnBase, array(ReferenceHelper::class,'columnReverseSort'));
+        usort($columnBase, array(ReferenceHelper::class, 'columnReverseSort'));
         foreach ($columnBase as $key => $value) {
             $this->assertEquals($columnExpectedResult[$key], $value);
         }

tests/PhpSpreadsheet/Style/NumberFormatTest.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(NumberFormat::class,'toFormattedString'), $args);
+        $result = call_user_func_array(array(NumberFormat::class, 'toFormattedString'), $args);
         $this->assertEquals($expectedResult, $result);
     }
 

src/PhpSpreadsheet/Shared/Date.php

Doc Comments +7 added lines, -9 removed lines

@@ -112,7 +112,7 @@ 
     /**
      * Set the Default timezone to use for dates
      *
-     * @param     string|\DateTimeZone    $timezone    The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions
+     * @param     string|\DateTimeZone    $timeZone    The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions
      * @return    boolean                              Success or failure
      * @throws    \Exception
      */
@@ -141,7 +141,7 @@ 
     /**
      * Validate a timezone
      *
-     * @param     string|\DateTimeZone    $timezone    The timezone to validate, either as a timezone string or object
+     * @param     string|\DateTimeZone    $timeZone    The timezone to validate, either as a timezone string or object
      * @return    \DateTimeZone                        The timezone as a timezone object
      * @throws    \Exception
      */
@@ -158,8 +158,7 @@ 
     /**
      * Convert a MS serialized datetime value from Excel to a PHP Date/Time object
      *
-     * @param     integer|float    $dateValue        MS Excel serialized date/time value
-     * @param     \DateTimeZone|string|null          $timezone            The timezone to assume for the Excel timestamp,
+     * @param     \DateTimeZone|string|null          $timeZone            The timezone to assume for the Excel timestamp,
      *                                                                        if you don't want to treat it as a UTC value
      *                                                                    Use the default (UST) unless you absolutely need a conversion
      * @return    \DateTime                          PHP date/time object
@@ -196,8 +195,7 @@ 
     /**
      * Convert a MS serialized datetime value from Excel to a unix timestamp
      *
-     * @param     integer|float    $dateValue        MS Excel serialized date/time value
-     * @param     \DateTimeZone|string|null          $timezone            The timezone to assume for the Excel timestamp,
+     * @param     \DateTimeZone|string|null          $timeZone            The timezone to assume for the Excel timestamp,
      *                                                                        if you don't want to treat it as a UTC value
      *                                                                    Use the default (UST) unless you absolutely need a conversion
      * @return    integer                            Unix timetamp for this date/time
@@ -212,7 +210,7 @@ 
     /**
      *    Convert a date from PHP to an MS Excel serialized date/time value
      *
-     *    @param    mixed            $dateValue            PHP serialized date/time or date object
+     *    @param    integer            $dateValue            PHP serialized date/time or date object
      *    @return   float|boolean    Excel date/time value
      *                                  or boolean FALSE on failure
      */
@@ -250,7 +248,7 @@ 
     /**
      *    Convert a Unix timestamp to an MS Excel serialized date/time value
      *
-     *    @param    \DateTimeInterface    $dateValue            PHP DateTime object
+     *    @param    integer    $dateValue            PHP DateTime object
      *    @return   float                 MS Excel serialized date/time value
      */
     public static function timestampToExcel($dateValue = 0)
@@ -270,7 +268,7 @@ 
      * @param    integer    $hours
      * @param    integer    $minutes
      * @param    integer    $seconds
-     * @return   integer    Excel date/time value
+     * @return   double    Excel date/time value
      */
     public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0)
     {

Spacing +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 class Date
 {
     /** constants */
-    const CALENDAR_WINDOWS_1900 = 1900;        //    Base date of 1st Jan 1900 = 1.0
-    const CALENDAR_MAC_1904 = 1904;            //    Base date of 2nd Jan 1904 = 1.0
+    const CALENDAR_WINDOWS_1900 = 1900; //    Base date of 1st Jan 1900 = 1.0
+    const CALENDAR_MAC_1904 = 1904; //    Base date of 2nd Jan 1904 = 1.0
 
     /*
      * Names of the months of the year, indexed by shortname
@@ -388,7 +388,7 @@ 
             return false;
         }
         // Try checking for any of the date formatting characters that don't appear within square braces
-        if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $pFormatCode)) {
+        if (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $pFormatCode)) {
             //    We might also have a format mask containing quoted strings...
             //        we don't want to test for any of our characters within the quoted blocks
             if (strpos($pFormatCode, '"') !== false) {
@@ -396,7 +396,7 @@ 
                 foreach (explode('"', $pFormatCode) as $subVal) {
                     //    Only test in alternate array entries (the non-quoted blocks)
                     if (($segMatcher = !$segMatcher) &&
-                        (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $subVal))) {
+                        (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $subVal))) {
                         return true;
                     }
                 }

tests/PhpSpreadsheet/Shared/DateTest.php

Spacing +16 added lines, -16 removed lines

@@ -14,7 +14,7 @@ 
         );
 
         foreach ($calendarValues as $calendarValue) {
-            $result = call_user_func(array(Date::class,'setExcelCalendar'), $calendarValue);
+            $result = call_user_func(array(Date::class, 'setExcelCalendar'), $calendarValue);
             $this->assertTrue($result);
         }
     }
@@ -22,7 +22,7 @@ 
     public function testSetExcelCalendarWithInvalidValue()
     {
         $unsupportedCalendar = '2012';
-        $result = call_user_func(array(Date::class,'setExcelCalendar'), $unsupportedCalendar);
+        $result = call_user_func(array(Date::class, 'setExcelCalendar'), $unsupportedCalendar);
         $this->assertFalse($result);
     }
 
@@ -32,7 +32,7 @@ 
     public function testDateTimeExcelToTimestamp1900()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_WINDOWS_1900
         );
 
@@ -53,13 +53,13 @@ 
     public function testDateTimeTimestampToExcel1900()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_WINDOWS_1900
         );
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'timestampToExcel'), $args);
+        $result = call_user_func_array(array(Date::class, 'timestampToExcel'), $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -74,13 +74,13 @@ 
     public function testDateTimeDateTimeToExcel()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_WINDOWS_1900
         );
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'dateTimeToExcel'), $args);
+        $result = call_user_func_array(array(Date::class, 'dateTimeToExcel'), $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -95,13 +95,13 @@ 
     public function testDateTimeFormattedPHPToExcel1900()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_WINDOWS_1900
         );
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'formattedPHPToExcel'), $args);
+        $result = call_user_func_array(array(Date::class, 'formattedPHPToExcel'), $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -116,13 +116,13 @@ 
     public function testDateTimeExcelToTimestamp1904()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_MAC_1904
         );
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'excelToTimestamp'), $args);
+        $result = call_user_func_array(array(Date::class, 'excelToTimestamp'), $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -137,13 +137,13 @@ 
     public function testDateTimeTimestampToExcel1904()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_MAC_1904
         );
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'timestampToExcel'), $args);
+        $result = call_user_func_array(array(Date::class, 'timestampToExcel'), $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -159,7 +159,7 @@ 
     {
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'isDateTimeFormatCode'), $args);
+        $result = call_user_func_array(array(Date::class, 'isDateTimeFormatCode'), $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -174,13 +174,13 @@ 
     public function testDateTimeExcelToTimestamp1900Timezone()
     {
         $result = call_user_func(
-            array(Date::class,'setExcelCalendar'),
+            array(Date::class, 'setExcelCalendar'),
             Date::CALENDAR_WINDOWS_1900
         );
 
         $args = func_get_args();
         $expectedResult = array_pop($args);
-        $result = call_user_func_array(array(Date::class,'excelToTimestamp'), $args);
+        $result = call_user_func_array(array(Date::class, 'excelToTimestamp'), $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/rawTestData/Shared/Date/DateTimeToExcel.php

Spacing +15 added lines, -15 removed lines

@@ -2,19 +2,19 @@
 
 // DateTime object                          Result           Comments
 return [
-    [ new DateTime('1900-01-01'),           1.0        ],    //  Excel 1900 base calendar date
-    [ new DateTime('1900-02-28'),           59.0       ],    //  This and next test show gap for the mythical
-    [ new DateTime('1900-03-01'),           61.0       ],    //      MS Excel 1900 Leap Year
-    [ new DateTime('1901-12-14'),           714.0      ],    //  Unix Timestamp 32-bit Earliest Date
-    [ new DateTime('1903-12-31'),           1461.0     ],
-    [ new DateTime('1904-01-01'),           1462.0     ],    //  Excel 1904 Calendar Base Date
-    [ new DateTime('1904-01-02'),           1463.0     ],
-    [ new DateTime('1960-12-19'),           22269.0    ],
-    [ new DateTime('1970-01-01'),           25569.0    ],    //  Unix Timestamp Base Date
-    [ new DateTime('1982-12-07'),           30292.0    ],
-    [ new DateTime('2008-06-12'),           39611.0    ],
-    [ new DateTime('2038-01-19'),           50424.0    ],    //  Unix Timestamp 32-bit Latest Date
-    [ new DateTime('1903-05-18 13:37:46'),  1234.56789 ],
-    [ new DateTime('1933-10-18 16:17:37'),  12345.6789 ],
-    [ new DateTime('2099-12-31'),           73050.0    ],
+    [new DateTime('1900-01-01'), 1.0], //  Excel 1900 base calendar date
+    [new DateTime('1900-02-28'), 59.0], //  This and next test show gap for the mythical
+    [new DateTime('1900-03-01'), 61.0], //      MS Excel 1900 Leap Year
+    [new DateTime('1901-12-14'), 714.0], //  Unix Timestamp 32-bit Earliest Date
+    [new DateTime('1903-12-31'), 1461.0],
+    [new DateTime('1904-01-01'), 1462.0], //  Excel 1904 Calendar Base Date
+    [new DateTime('1904-01-02'), 1463.0],
+    [new DateTime('1960-12-19'), 22269.0],
+    [new DateTime('1970-01-01'), 25569.0], //  Unix Timestamp Base Date
+    [new DateTime('1982-12-07'), 30292.0],
+    [new DateTime('2008-06-12'), 39611.0],
+    [new DateTime('2038-01-19'), 50424.0], //  Unix Timestamp 32-bit Latest Date
+    [new DateTime('1903-05-18 13:37:46'), 1234.56789],
+    [new DateTime('1933-10-18 16:17:37'), 12345.6789],
+    [new DateTime('2099-12-31'), 73050.0],
 ];