PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/PasswordHasher.php

Spacing +4 added lines, -4 removed lines

@@ -41,14 +41,14 @@
     public static function hashPassword($pPassword = '')
     {
         $password = 0x0000;
-        $charPos = 1;       // char position
+        $charPos = 1; // char position
 
         // split the plain text password in its component characters
         $chars = preg_split('//', $pPassword, -1, PREG_SPLIT_NO_EMPTY);
         foreach ($chars as $char) {
-            $value = ord($char) << $charPos++;    // shifted ASCII value
-            $rotated_bits = $value >> 15;                // rotated bits beyond bit 15
-            $value &= 0x7fff;                    // first 15 bits
+            $value = ord($char) << $charPos++; // shifted ASCII value
+            $rotated_bits = $value >> 15; // rotated bits beyond bit 15
+            $value &= 0x7fff; // first 15 bits
             $password ^= ($value | $rotated_bits);
         }
 

src/PhpSpreadsheet/Shared/OLE/PPS.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
               . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd)          // 116
               . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
               . pack('V', $this->Size)               // 124
-              . pack('V', 0);                        // 128
+              . pack('V', 0); // 128
         return $ret;
     }
 

src/PhpSpreadsheet/Shared/OLE/PPS/Root.php

Spacing +18 added lines, -18 removed lines

@@ -63,11 +63,11 @@ 
         // Initial Setting for saving
         $this->_BIG_BLOCK_SIZE = pow(
             2,
-            (isset($this->_BIG_BLOCK_SIZE))? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
+            (isset($this->_BIG_BLOCK_SIZE)) ? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
         );
         $this->_SMALL_BLOCK_SIZE = pow(
             2,
-            (isset($this->_SMALL_BLOCK_SIZE))?  self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
+            (isset($this->_SMALL_BLOCK_SIZE)) ? self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
         );
 
         if (is_resource($filename)) {
@@ -130,21 +130,21 @@ 
                 $raList[$i]->Size = $raList[$i]->getDataLen();
                 if ($raList[$i]->Size < \PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL) {
                     $iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
                 } else {
                     $iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
                 }
             }
         }
         $iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
         $iSlCnt = floor($this->_BIG_BLOCK_SIZE / \PhpSpreadsheet\Shared\OLE::OLE_LONG_INT_SIZE);
-        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
+        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt) ? 1 : 0);
         $iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
-                      (($iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                      (($iSmallLen % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
         $iCnt = count($raList);
         $iBdCnt = $this->_BIG_BLOCK_SIZE / \PhpSpreadsheet\Shared\OLE::OLE_PPS_SIZE;
-        $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
+        $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
 
         return [$iSBDcnt, $iBBcnt, $iPPScnt];
     }
@@ -160,7 +160,7 @@ 
     {
         $iWk = log($i2) / log(2);
 
-        return ($iWk > floor($iWk))? floor($iWk) + 1:$iWk;
+        return ($iWk > floor($iWk)) ? floor($iWk) + 1 : $iWk;
     }
 
     /**
@@ -181,16 +181,16 @@ 
         $iBdExL = 0;
         $iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
         $iAllW = $iAll;
-        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt)? 1: 0);
+        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
 
         // Calculate BD count
         if ($iBdCnt > $i1stBdL) {
             while (1) {
                 ++$iBdExL;
                 ++$iAllW;
-                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt)? 1: 0);
+                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
                 if ($iBdCnt <= ($iBdExL * $iBlCnt + $i1stBdL)) {
                     break;
                 }
@@ -278,7 +278,7 @@ 
                     $raList[$i]->startBlock = $iStBlk;
                     $iStBlk +=
                             (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
                 }
                 // Close file for each PPS, and unlink it
                 //if (isset($raList[$i]->_PPS_FILE)) {
@@ -310,7 +310,7 @@ 
                 }
                 if ($raList[$i]->Size < \PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL) {
                     $iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
                     // Add to SBD
                     $jB = $iSmbCnt - 1;
                     for ($j = 0; $j < $jB; ++$j) {
@@ -384,15 +384,15 @@ 
         $iBdExL = 0;
         $iAll = $iBsize + $iPpsCnt + $iSbdSize;
         $iAllW = $iAll;
-        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt)? 1: 0);
+        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
         // Calculate BD count
         if ($iBdCnt > $i1stBdL) {
             while (1) {
                 ++$iBdExL;
                 ++$iAllW;
-                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt)? 1: 0);
+                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
                 if ($iBdCnt <= ($iBdExL * $iBbCnt + $i1stBdL)) {
                     break;
                 }

src/PhpSpreadsheet/Worksheet/AutoFilter.php

Spacing +1 added lines, -1 removed lines

@@ -456,7 +456,7 @@
      *    @var    array
      */
     private static $fromReplace = ['\*', '\?', '~~', '~.*', '~.?'];
-    private static $toReplace = ['.*', '.',  '~',  '\*',  '\?'];
+    private static $toReplace = ['.*', '.', '~', '\*', '\?'];
 
     /**
      *    Convert a dynamic rule daterange to a custom filter range expression for ease of calculation

src/PhpSpreadsheet/Worksheet/BaseDrawing.php

Spacing +1 added lines, -2 removed lines

@@ -137,8 +137,7 @@
         $this->rotation = 0;
         $this->shadow = new Drawing\Shadow();
 
-        // Set image index
-        ++self::$imageCounter;
+        // Set image index++self::$imageCounter;
         $this->imageIndex = self::$imageCounter;
     }
 

tests/PhpSpreadsheet/Shared/StringTest.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     public function testGetCurrencyCode()
     {
         $localeconv = localeconv();
-        $expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol']: '$'));
+        $expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol'] : '$'));
         $result = call_user_func([StringHelper::class, 'getCurrencyCode']);
         $this->assertEquals($expectedResult, $result);
     }

tests/data/Shared/Date/TimestampToExcel1900.php

Spacing +11 added lines, -11 removed lines

@@ -2,15 +2,15 @@
 
 // Unix TimeStamp   Result           Comments
 return [
-    [-2147472000,  714],    //  PHP 32-bit Earliest Date        14-Dec-1901
-    [-2082931200,  1461],    //                                  31-Dec-1903
-    [-2082844800,  1462],    //  Excel 1904 Calendar Base Date   01-Jan-1904
-    [-2082758400,  1463],    //                                  02-Jan-1904
-    [-285120000,   22269],    //                                  19-Dec-1960
-    [0,            25569],    //  PHP Base Date                   01-Jan-1970
-    [408067200,    30292],    //                                  07-Dec-1982
-    [1213228800,   39611],    //                                  12-Jun-2008
-    [2147472000,   50424],    //  PHP 32-bit Latest Date          19-Jan-2038
-    [-2102494934,  1234.56789],    //                                  18-May-1903 13:37:46
-    [-1142494943,  12345.6789],    //                                  18-Oct-1933 16:17:37
+    [-2147472000, 714], //  PHP 32-bit Earliest Date        14-Dec-1901
+    [-2082931200, 1461], //                                  31-Dec-1903
+    [-2082844800, 1462], //  Excel 1904 Calendar Base Date   01-Jan-1904
+    [-2082758400, 1463], //                                  02-Jan-1904
+    [-285120000, 22269], //                                  19-Dec-1960
+    [0, 25569], //  PHP Base Date                   01-Jan-1970
+    [408067200, 30292], //                                  07-Dec-1982
+    [1213228800, 39611], //                                  12-Jun-2008
+    [2147472000, 50424], //  PHP 32-bit Latest Date          19-Jan-2038
+    [-2102494934, 1234.56789], //                                  18-May-1903 13:37:46
+    [-1142494943, 12345.6789], //                                  18-Oct-1933 16:17:37
 ];

tests/data/Shared/Date/FormattedPHPToExcel1900.php

Spacing +11 added lines, -11 removed lines

@@ -2,15 +2,15 @@
 
 //    Year   Month  Day  Hours  Minutes  Seconds  Result            Comments
 return [
-    [1901,  12,    14,                           714],    //    PHP 32-bit Earliest Date        14-Dec-1901
-    [1903,  12,    31,                           1461],    //                                    31-Dec-1903
-    [1904,  1,     1,                            1462],    //    Excel 1904 Calendar Base Date   01-Jan-1904
-    [1904,  1,     2,                            1463],    //                                    02-Jan-1904
-    [1960,  12,    19,                           22269],    //                                    19-Dec-1960
-    [1970,  1,     1,                            25569],    //    PHP Base Date                   01-Jan-1970
-    [1982,  12,    7,                            30292],    //                                    07-Dec-1982
-    [2008,  6,     12,                           39611],    //                                    12-Jun-2008
-    [2038,  1,     19,                           50424],    //    PHP 32-bit Latest Date          19-Jan-2038
-    [1903,  5,     18,  13,    37,      46,      1234.56789],    //                                    18-May-1903 13:37:46
-    [1933,  10,    18,  16,    17,      37,      12345.6789],    //                                    18-Oct-1933 16:17:37
+    [1901, 12, 14, 714], //    PHP 32-bit Earliest Date        14-Dec-1901
+    [1903, 12, 31, 1461], //                                    31-Dec-1903
+    [1904, 1, 1, 1462], //    Excel 1904 Calendar Base Date   01-Jan-1904
+    [1904, 1, 2, 1463], //                                    02-Jan-1904
+    [1960, 12, 19, 22269], //                                    19-Dec-1960
+    [1970, 1, 1, 25569], //    PHP Base Date                   01-Jan-1970
+    [1982, 12, 7, 30292], //                                    07-Dec-1982
+    [2008, 6, 12, 39611], //                                    12-Jun-2008
+    [2038, 1, 19, 50424], //    PHP 32-bit Latest Date          19-Jan-2038
+    [1903, 5, 18, 13, 37, 46, 1234.56789], //                                    18-May-1903 13:37:46
+    [1933, 10, 18, 16, 17, 37, 12345.6789], //                                    18-Oct-1933 16:17:37
 ];

tests/data/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],
 ];