Dolibarr / dolibarr

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php

Spacing +22 added lines, -22 removed lines

@@ -498,19 +498,19 @@ 
         } elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
             return $this->convertRef2d($token);
         // match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) {
+        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) {
             return $this->convertRef3d($token);
         // match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
-        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) {
+        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) {
             return $this->convertRef3d($token);
         // match ranges like A1:B2 or $A$1:$B$2
         } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
             return $this->convertRange2d($token);
         // match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) {
+        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) {
             return $this->convertRange3d($token);
         // match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)\\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)$/u", $token)) {
+        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)\\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)$/u", $token)) {
             return $this->convertRange3d($token);
         // operators (including parentheses)
         } elseif (isset($this->ptg[$token])) {
@@ -569,7 +569,7 @@ 
             throw new WriterException('String is too long');
         }
 
-        return pack('C', $this->ptg['ptgStr']) . StringHelper::UTF8toBIFF8UnicodeShort($string);
+        return pack('C', $this->ptg['ptgStr']).StringHelper::UTF8toBIFF8UnicodeShort($string);
     }
 
     /**
@@ -630,7 +630,7 @@ 
             throw new WriterException("Unknown class $class");
         }
 
-        return $ptgArea . $row1 . $row2 . $col1 . $col2;
+        return $ptgArea.$row1.$row2.$col1.$col2;
     }
 
     /**
@@ -657,13 +657,13 @@ 
             [$row1, $col1] = $this->cellToPackedRowcol($cell1);
             [$row2, $col2] = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
-            [$row1, $col1, $row2, $col2] = $this->rangeToPackedRange($cell1 . ':' . $cell2);
+            [$row1, $col1, $row2, $col2] = $this->rangeToPackedRange($cell1.':'.$cell2);
         }
 
         // The ptg value depends on the class of the ptg.
         $ptgArea = pack('C', $this->ptg['ptgArea3d']);
 
-        return $ptgArea . $ext_ref . $row1 . $row2 . $col1 . $col2;
+        return $ptgArea.$ext_ref.$row1.$row2.$col1.$col2;
     }
 
     /**
@@ -682,7 +682,7 @@ 
         // The ptg value depends on the class of the ptg.
         $ptgRef = pack('C', $this->ptg['ptgRefA']);
 
-        return $ptgRef . $row . $col;
+        return $ptgRef.$row.$col;
     }
 
     /**
@@ -707,7 +707,7 @@ 
         // The ptg value depends on the class of the ptg.
         $ptgRef = pack('C', $this->ptg['ptgRef3dA']);
 
-        return $ptgRef . $ext_ref . $row . $col;
+        return $ptgRef.$ext_ref.$row.$col;
     }
 
     /**
@@ -1029,22 +1029,22 @@ 
                 // if it's a reference A1 or $A$1 or $A1 or A$1
                 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($this->lookAhead !== '.') and ($this->lookAhead !== '!')) {
                     return $token;
-                } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($this->lookAhead !== '.')) {
+                } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($this->lookAhead !== '.')) {
                     // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
                     return $token;
-                } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $token) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($this->lookAhead !== '.')) {
+                } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $token) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($this->lookAhead !== '.')) {
                     // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
                     return $token;
                 } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead)) {
                     // if it's a range A1:A2 or $A$1:$A$2
                     return $token;
-                } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $token) and !preg_match('/\d/', $this->lookAhead)) {
+                } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $token) and !preg_match('/\d/', $this->lookAhead)) {
                     // If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
                     return $token;
-                } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $token) and !preg_match('/\d/', $this->lookAhead)) {
+                } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $token) and !preg_match('/\d/', $this->lookAhead)) {
                     // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
                     return $token;
-                } elseif (is_numeric($token) and (!is_numeric($token . $this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead !== '!') and ($this->lookAhead !== ':')) {
+                } elseif (is_numeric($token) and (!is_numeric($token.$this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead !== '!') and ($this->lookAhead !== ':')) {
                     // If it's a number (check that it's not a sheet name or range)
                     return $token;
                 } elseif (preg_match('/"([^"]|""){0,255}"/', $token) and $this->lookAhead !== '"' and (substr_count($token, '"') % 2 == 0)) {
@@ -1258,13 +1258,13 @@ 
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) {
+        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) {
             // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
             return $result;
-        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $this->currentToken)) {
+        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $this->currentToken)) {
             // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
@@ -1278,14 +1278,14 @@ 
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $this->currentToken)) {
+        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $this->currentToken)) {
             // If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
             return $result;
-        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $this->currentToken)) {
+        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $this->currentToken)) {
             // If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
@@ -1308,7 +1308,7 @@ 
             return $this->func();
         }
 
-        throw new WriterException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
+        throw new WriterException('Syntax error: '.$this->currentToken.', lookahead: '.$this->lookAhead.', current char: '.$this->currentCharacter);
     }
 
     /**
@@ -1429,10 +1429,10 @@ 
                 $left_tree = '';
             }
             // add it's left subtree and return.
-            return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
+            return $left_tree.$this->convertFunction($tree['value'], $tree['right']);
         }
         $converted_tree = $this->convert($tree['value']);
 
-        return $polish . $converted_tree;
+        return $polish.$converted_tree;
     }
 }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php

Spacing +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
         $data .= pack('CCC', self::mapTextRotation($this->_style->getAlignment()->getTextRotation()), $biff8_options, $used_attrib);
         $data .= pack('VVv', $border1, $border2, $icv);
 
-        return $header . $data;
+        return $header.$data;
     }
 
     /**

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvv', $version, $type, $build, $year);
-        $this->append($header . $data . $unknown);
+        $this->append($header.$data.$unknown);
     }
 
     /**
@@ -203,7 +203,7 @@ 
 
         // The first 2080/8224 bytes remain intact. However, we have to change
         // the length field of the record.
-        $tmp = substr($data, 0, 2) . pack('v', $limit) . substr($data, 4, $limit);
+        $tmp = substr($data, 0, 2).pack('v', $limit).substr($data, 4, $limit);
 
         $header = pack('vv', $record, $limit); // Headers for continue records
 

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php

Spacing +70 added lines, -70 removed lines

@@ -522,7 +522,7 @@ 
                 // URL
             } else {
                 // external (local file)
-                $url = 'external:' . $url;
+                $url = 'external:'.$url;
             }
 
             $this->writeUrl($row - 1, Coordinate::columnIndexFromString($column) - 1, $url);
@@ -670,7 +670,7 @@ 
             $xl_double = strrev($xl_double);
         }
 
-        $this->append($header . $data . $xl_double);
+        $this->append($header.$data.$xl_double);
 
         return 0;
     }
@@ -712,7 +712,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -740,7 +740,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -768,7 +768,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvv', $row, $col, $xfIndex);
-        $this->append($header . $data);
+        $this->append($header.$data);
 
         return 0;
     }
@@ -791,7 +791,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvCC', $row, $col, $xfIndex, $value, $isError);
-        $this->append($header . $data);
+        $this->append($header.$data);
 
         return 0;
     }
@@ -883,7 +883,7 @@ 
             $data = pack('vvv', $row, $col, $xfIndex)
                         . $num
                         . pack('vVv', $grbit, $unknown, $formlen);
-            $this->append($header . $data . $formula);
+            $this->append($header.$data.$formula);
 
             // Append also a STRING record if necessary
             if ($stringValue !== null) {
@@ -909,7 +909,7 @@ 
         $length = strlen($data);
         $header = pack('vv', $record, $length);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -997,7 +997,7 @@ 
 
         // Convert URL to a null terminated wchar string
         $url = implode("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-        $url = $url . "\0\0\0";
+        $url = $url."\0\0\0";
 
         // Pack the length of the URL
         $url_len = pack('V', strlen($url));
@@ -1010,7 +1010,7 @@ 
         $data = pack('vvvv', $row1, $row2, $col1, $col2);
 
         // Write the packed data
-        $this->append($header . $data . $unknown1 . $options . $unknown2 . $url_len . $url);
+        $this->append($header.$data.$unknown1.$options.$unknown2.$url_len.$url);
 
         return 0;
     }
@@ -1059,7 +1059,7 @@ 
         $data = pack('vvvv', $row1, $row2, $col1, $col2);
 
         // Write the packed data
-        $this->append($header . $data . $unknown1 . $options . $url_len . $url);
+        $this->append($header.$data.$unknown1.$options.$url_len.$url);
 
         return 0;
     }
@@ -1124,10 +1124,10 @@ 
         $up_count = pack('v', $up_count);
 
         // Store the short dos dir name (null terminated)
-        $dir_short = preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
+        $dir_short = preg_replace('/\\.\\.\\\\/', '', $dir_long)."\0";
 
         // Store the long dir name as a wchar string (non-null terminated)
-        $dir_long = $dir_long . "\0";
+        $dir_long = $dir_long."\0";
 
         // Pack the lengths of the dir strings
         $dir_short_len = pack('V', strlen($dir_short));
@@ -1141,14 +1141,14 @@ 
         $unknown4 = pack('v', 0x03);
 
         // Pack the main data stream
-        $data = pack('vvvv', $row1, $row2, $col1, $col2) .
-                            $unknown1 .
-                            $link_type .
-                            $unknown2 .
-                            $up_count .
-                            $dir_short_len .
-                            $dir_short .
-                            $unknown3 .
+        $data = pack('vvvv', $row1, $row2, $col1, $col2).
+                            $unknown1.
+                            $link_type.
+                            $unknown2.
+                            $up_count.
+                            $dir_short_len.
+                            $dir_short.
+                            $unknown3.
                             $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
@@ -1161,7 +1161,7 @@ 
         $header = pack('vv', $record, $length);
 
         // Write the packed data
-        $this->append($header . $data);
+        $this->append($header.$data);
 
         return 0;
     }
@@ -1219,7 +1219,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvvvvv', $row, $colMic, $colMac, $miyRw, $irwMac, $reserved, $grbit, $ixfe);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1233,7 +1233,7 @@ 
         $data = pack('VVvvv', $this->firstRowIndex, $this->lastRowIndex + 1, $this->firstColumnIndex, $this->lastColumnIndex + 1, 0x0000); // reserved
 
         $header = pack('vv', $record, $length);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1285,7 +1285,7 @@ 
 
         $data .= pack('vvvvV', $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1307,7 +1307,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', 1, $defaultRowHeight);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1322,7 +1322,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $defaultColWidth);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1380,7 +1380,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvvv', $colFirst, $colLast, $coldx, $ixfe, $grbit, $reserved);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1440,7 +1440,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('CvvvvvvCC', $pnn, $rwAct, $colAct, $irefAct, $cref, $rwFirst, $rwLast, $colFirst, $colLast);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1485,10 +1485,10 @@ 
 
             // flush record if we have reached limit for number of merged cells, or reached final merged cell
             if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
-                $recordData = pack('v', $j) . $recordData;
+                $recordData = pack('v', $j).$recordData;
                 $length = strlen($recordData);
                 $header = pack('vv', $record, $length);
-                $this->append($header . $recordData);
+                $this->append($header.$recordData);
 
                 // initialize for next record, if any
                 $recordData = '';
@@ -1521,7 +1521,7 @@ 
 
         $record = 0x0862; // Record identifier
         $header = pack('vv', $record, $length);
-        $this->append($header . $recordData);
+        $this->append($header.$recordData);
     }
 
     /**
@@ -1565,7 +1565,7 @@ 
         $length = strlen($recordData);
         $header = pack('vv', $record, $length);
 
-        $this->append($header . $recordData);
+        $this->append($header.$recordData);
     }
 
     /**
@@ -1606,13 +1606,13 @@ 
                 hexdec($password)
             );
 
-            $recordData .= StringHelper::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
+            $recordData .= StringHelper::UTF8toBIFF8UnicodeLong('p'.md5($recordData));
 
             $length = strlen($recordData);
 
             $record = 0x0868; // Record identifier
             $header = pack('vv', $record, $length);
-            $this->append($header . $recordData);
+            $this->append($header.$recordData);
         }
     }
 
@@ -1700,7 +1700,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvv', $x, $y, $rwTop, $colLeft, $pnnAct);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1759,9 +1759,9 @@ 
 
         $header = pack('vv', $record, $length);
         $data1 = pack('vvvvvvvv', $iPaperSize, $iScale, $iPageStart, $iFitWidth, $iFitHeight, $grbit, $iRes, $iVRes);
-        $data2 = $numHdr . $numFtr;
+        $data2 = $numHdr.$numFtr;
         $data3 = pack('v', $iCopies);
-        $this->append($header . $data1 . $data2 . $data3);
+        $this->append($header.$data1.$data2.$data3);
     }
 
     /**
@@ -1785,7 +1785,7 @@ 
 
         $header = pack('vv', $record, $length);
 
-        $this->append($header . $recordData);
+        $this->append($header.$recordData);
     }
 
     /**
@@ -1809,7 +1809,7 @@ 
 
         $header = pack('vv', $record, $length);
 
-        $this->append($header . $recordData);
+        $this->append($header.$recordData);
     }
 
     /**
@@ -1825,7 +1825,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fHCenter);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1840,7 +1840,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fVCenter);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1859,7 +1859,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1878,7 +1878,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1897,7 +1897,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1916,7 +1916,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1931,7 +1931,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fPrintRwCol);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1947,7 +1947,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fPrintGrid);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1963,7 +1963,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fGridSet);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1979,7 +1979,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $iNumFilters);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2026,7 +2026,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('vvvv', $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2062,7 +2062,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $grbit);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2117,7 +2117,7 @@ 
                 $data .= pack('vvv', $hbreak, 0x0000, 0x00ff);
             }
 
-            $this->append($header . $data);
+            $this->append($header.$data);
         }
 
         // vertical page breaks
@@ -2144,7 +2144,7 @@ 
                 $data .= pack('vvv', $vbreak, 0x0000, 0xffff);
             }
 
-            $this->append($header . $data);
+            $this->append($header.$data);
         }
     }
 
@@ -2166,7 +2166,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fLock);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2190,7 +2190,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', 1);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2214,7 +2214,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', 1);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2235,7 +2235,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $wPassword);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2269,7 +2269,7 @@ 
         $lcb = $size;
 
         $header = pack('vvvvV', $record, $length, $cf, $env, $lcb);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2451,7 +2451,7 @@ 
         $data .= pack('v', $grbit2);
         $data .= pack('V', $Reserved5);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2473,7 +2473,7 @@ 
                 foreach (['red', 'green', 'blue'] as $key) {
                     $color[$key] = $color[$key] + round((255 - $color[$key]) * $color['alpha'] / 127);
                 }
-                $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
+                $data .= chr($color['blue']).chr($color['green']).chr($color['red']);
             }
             if (3 * $width % 4) {
                 $data .= str_repeat("\x00", 4 - 3 * $width % 4);
@@ -2564,7 +2564,7 @@ 
 
         // Add the BITMAPCOREHEADER data
         $header = pack('Vvvvv', 0x000c, $width, $height, 0x01, 0x18);
-        $data = $header . $data;
+        $data = $header.$data;
 
         return [$width, $height, $size, $data];
     }
@@ -2585,7 +2585,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', $this->phpSheet->getSheetView()->getZoomScale(), 100);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -2634,7 +2634,7 @@ 
                 $length = strlen($dataChunk);
                 $header = pack('vv', $record, $length);
 
-                $this->append($header . $dataChunk);
+                $this->append($header.$dataChunk);
 
                 // OBJ record
                 $record = 0x005D; // record identifier
@@ -2688,7 +2688,7 @@ 
 
                 $length = strlen($objData);
                 $header = pack('vv', $record, $length);
-                $this->append($header . $objData);
+                $this->append($header.$objData);
             }
         }
     }
@@ -2714,7 +2714,7 @@ 
 
             $header = pack('vv', $record, $length);
             $data = pack('vVVVV', $grbit, $horPos, $verPos, $objId, count($dataValidationCollection));
-            $this->append($header . $data);
+            $this->append($header.$data);
 
             // DATAVALIDATION records
             $record = 0x01BE; // Record identifier
@@ -2901,7 +2901,7 @@ 
                 $length = strlen($data);
                 $header = pack('vv', $record, $length);
 
-                $this->append($header . $data);
+                $this->append($header.$data);
             }
         }
     }
@@ -2963,7 +2963,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvVVvv', $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -4428,7 +4428,7 @@ 
             $data .= $operand2;
         }
         $header = pack('vv', $record, strlen($data));
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -4479,6 +4479,6 @@ 
         $data .= $cellRange;
         $data .= pack('v', 0x0001);
         $data .= $cellRange;
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         $length = strlen($data);
         $header = pack('vv', $record, $length);
 
-        return $header . $data;
+        return $header.$data;
     }
 
     /**

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
         // Worksheets
         $sheetCount = $spreadsheet->getSheetCount();
         for ($i = 0; $i < $sheetCount; ++$i) {
-            $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml');
+            $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml');
         }
 
         // Shared strings
@@ -99,13 +99,13 @@ 
 
             //    We need a drawing relationship for the worksheet if we have either drawings or charts
             if (($drawingCount > 0) || ($chartCount > 0) || $hasUnparsedDrawing) {
-                $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml');
+                $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml');
             }
 
             //    If we have charts, then we need a chart relationship for every individual chart
             if ($chartCount > 0) {
                 for ($c = 0; $c < $chartCount; ++$c) {
-                    $this->writeOverrideContentType($objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml');
+                    $this->writeOverrideContentType($objWriter, '/xl/charts/chart'.$chart++.'.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml');
                 }
             }
         }
@@ -113,7 +113,7 @@ 
         // Comments
         for ($i = 0; $i < $sheetCount; ++$i) {
             if (count($spreadsheet->getSheet($i)->getComments()) > 0) {
-                $this->writeOverrideContentType($objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml');
+                $this->writeOverrideContentType($objWriter, '/xl/comments'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml');
             }
         }
 
@@ -146,7 +146,7 @@ 
             // we need to write "Extension" but not already write for media content
             $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
             foreach ($tabRibbonTypes as $aRibbonType) {
-                $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor
+                $mimeType = 'image/.'.$aRibbonType; //we wrote $mimeType like customUI Editor
                 $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
             }
         }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php

Spacing +6 added lines, -6 removed lines

@@ -228,7 +228,7 @@ 
             if ($sheetState !== 'visible' && $sheetState != '') {
                 $objWriter->writeAttribute('state', $sheetState);
             }
-            $objWriter->writeAttribute('r:id', 'rId' . $pRelId);
+            $objWriter->writeAttribute('r:id', 'rId'.$pRelId);
             $objWriter->endElement();
         } else {
             throw new WriterException('Invalid parameters passed.');
@@ -306,7 +306,7 @@ 
         $range = Coordinate::splitRange($pNamedRange->getRange());
         $iMax = count($range);
         for ($i = 0; $i < $iMax; ++$i) {
-            $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteReference($range[$i][0]);
+            $range[$i][0] = '\''.str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()).'\'!'.Coordinate::absoluteReference($range[$i][0]);
             if (isset($range[$i][1])) {
                 $range[$i][1] = Coordinate::absoluteReference($range[$i][1]);
             }
@@ -345,7 +345,7 @@ 
             $range[1] = Coordinate::absoluteCoordinate($range[1]);
             $range = implode(':', $range);
 
-            $objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
+            $objWriter->writeRawData('\''.str_replace("'", "''", $pSheet->getTitle()).'\'!'.$range);
 
             $objWriter->endElement();
         }
@@ -373,7 +373,7 @@ 
             if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
                 $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
 
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+                $settingString .= '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!$'.$repeat[0].':$'.$repeat[1];
             }
 
             // Rows to repeat
@@ -384,7 +384,7 @@ 
 
                 $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
 
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+                $settingString .= '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!$'.$repeat[0].':$'.$repeat[1];
             }
 
             $objWriter->writeRawData($settingString);
@@ -415,7 +415,7 @@ 
             foreach ($printArea as $printAreaRect) {
                 $printAreaRect[0] = Coordinate::absoluteReference($printAreaRect[0]);
                 $printAreaRect[1] = Coordinate::absoluteReference($printAreaRect[1]);
-                $chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+                $chunks[] = '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!'.implode(':', $printAreaRect);
             }
 
             $objWriter->writeRawData(implode(',', $chunks));

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php

Spacing +6 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
         $objWriter->writeAttribute('macro', '');
         $objWriter->startElement('xdr:nvGraphicFramePr');
         $objWriter->startElement('xdr:cNvPr');
-        $objWriter->writeAttribute('name', 'Chart ' . $pRelationId);
+        $objWriter->writeAttribute('name', 'Chart '.$pRelationId);
         $objWriter->writeAttribute('id', 1025 * $pRelationId);
         $objWriter->endElement();
         $objWriter->startElement('xdr:cNvGraphicFramePr');
@@ -137,7 +137,7 @@ 
         $objWriter->startElement('c:chart');
         $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
         $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-        $objWriter->writeAttribute('r:id', 'rId' . $pRelationId);
+        $objWriter->writeAttribute('r:id', 'rId'.$pRelationId);
         $objWriter->endElement();
         $objWriter->endElement();
         $objWriter->endElement();
@@ -217,7 +217,7 @@ 
             // a:blip
             $objWriter->startElement('a:blip');
             $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-            $objWriter->writeAttribute('r:embed', 'rId' . $pRelationId);
+            $objWriter->writeAttribute('r:embed', 'rId'.$pRelationId);
             $objWriter->endElement();
 
             // a:stretch
@@ -455,13 +455,13 @@ 
         // v:shape
         $objWriter->startElement('v:shape');
         $objWriter->writeAttribute('id', $pReference);
-        $objWriter->writeAttribute('o:spid', '_x0000_s' . $id);
+        $objWriter->writeAttribute('o:spid', '_x0000_s'.$id);
         $objWriter->writeAttribute('type', '#_x0000_t75');
         $objWriter->writeAttribute('style', "position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1");
 
         // v:imagedata
         $objWriter->startElement('v:imagedata');
-        $objWriter->writeAttribute('o:relid', 'rId' . $pReference);
+        $objWriter->writeAttribute('o:relid', 'rId'.$pReference);
         $objWriter->writeAttribute('o:title', $pImage->getName());
         $objWriter->endElement();
 
@@ -513,7 +513,7 @@ 
 
         $objWriter->startElement('a:hlinkClick');
         $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-        $objWriter->writeAttribute('r:id', 'rId' . $hlinkClickId);
+        $objWriter->writeAttribute('r:id', 'rId'.$hlinkClickId);
         $objWriter->endElement();
     }
 }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php

Spacing +4 added lines, -4 removed lines

@@ -182,15 +182,15 @@
 
         // v:shape
         $objWriter->startElement('v:shape');
-        $objWriter->writeAttribute('id', '_x0000_s' . $id);
+        $objWriter->writeAttribute('id', '_x0000_s'.$id);
         $objWriter->writeAttribute('type', '#_x0000_t202');
-        $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden'));
-        $objWriter->writeAttribute('fillcolor', '#' . $pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('style', 'position:absolute;margin-left:'.$pComment->getMarginLeft().';margin-top:'.$pComment->getMarginTop().';width:'.$pComment->getWidth().';height:'.$pComment->getHeight().';z-index:1;visibility:'.($pComment->getVisible() ? 'visible' : 'hidden'));
+        $objWriter->writeAttribute('fillcolor', '#'.$pComment->getFillColor()->getRGB());
         $objWriter->writeAttribute('o:insetmode', 'auto');
 
         // v:fill
         $objWriter->startElement('v:fill');
-        $objWriter->writeAttribute('color2', '#' . $pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('color2', '#'.$pComment->getFillColor()->getRGB());
         $objWriter->endElement();
 
         // v:shadow