PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php

Spacing +4 added lines, -4 removed lines

@@ -99,12 +99,12 @@ 
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
 
-        $equation = 'Y = '.$intersect;
+        $equation = 'Y = ' . $intersect;
         foreach ($slope as $key => $value) {
             if ($value != 0.0) {
-                $equation .= ' + '.$value.' * X';
+                $equation .= ' + ' . $value . ' * X';
                 if ($key > 0) {
-                    $equation .= '^'.($key + 1);
+                    $equation .= '^' . ($key + 1);
                 }
             }
         }
@@ -207,7 +207,7 @@ 
     {
         if (parent::__construct($yValues, $xValues) !== false) {
             if ($order < $this->valueCount) {
-                $this->bestFitType .= '_'.$order;
+                $this->bestFitType .= '_' . $order;
                 $this->order = $order;
                 $this->polynomialRegression($order, $yValues, $xValues, $const);
                 if (($this->getGoodnessOfFit() < 0.0) || ($this->getGoodnessOfFit() > 1.0)) {

src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
 
-        return 'Y = '.$intersect.' + '.$slope.' * log(X)';
+        return 'Y = ' . $intersect . ' + ' . $slope . ' * log(X)';
     }
 
     /**

src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
 
-        return 'Y = '.$intersect.' * '.$slope.'^X';
+        return 'Y = ' . $intersect . ' * ' . $slope . '^X';
     }
 
     /**

src/PhpSpreadsheet/Shared/CodePage.php

Spacing +1 added lines, -1 removed lines

@@ -154,6 +154,6 @@
             case 65001:
                 return 'UTF-8'; //    Unicode (UTF-8)
         }
-        throw new \PhpOffice\PhpSpreadsheet\Exception('Unknown codepage: '.$codePage);
+        throw new \PhpOffice\PhpSpreadsheet\Exception('Unknown codepage: ' . $codePage);
     }
 }

src/PhpSpreadsheet/Shared/OLE/PPS.php

Indentation +15 added lines, -15 removed lines

@@ -177,21 +177,21 @@
         $ret = str_pad($this->Name, 64, "\x00");
 
         $ret .= pack('v', strlen($this->Name) + 2)  // 66
-              .pack('c', $this->Type)              // 67
-              .pack('c', 0x00) //UK                // 68
-              .pack('V', $this->PrevPps) //Prev    // 72
-              .pack('V', $this->NextPps) //Next    // 76
-              .pack('V', $this->DirPps)  //Dir     // 80
-              ."\x00\x09\x02\x00"                  // 84
-              ."\x00\x00\x00\x00"                  // 88
-              ."\xc0\x00\x00\x00"                  // 92
-              ."\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
-              ."\x00\x00\x00\x00"                  // 100
-              .\PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st)          // 108
-              .\PhpOffice\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('c', $this->Type)              // 67
+                .pack('c', 0x00) //UK                // 68
+                .pack('V', $this->PrevPps) //Prev    // 72
+                .pack('V', $this->NextPps) //Next    // 76
+                .pack('V', $this->DirPps)  //Dir     // 80
+                ."\x00\x09\x02\x00"                  // 84
+                ."\x00\x00\x00\x00"                  // 88
+                ."\xc0\x00\x00\x00"                  // 92
+                ."\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
+                ."\x00\x00\x00\x00"                  // 100
+                .\PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st)          // 108
+                .\PhpOffice\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
         return $ret;
     }
 

src/PhpSpreadsheet/Shared/OLE.php

Spacing +4 added lines, -4 removed lines

@@ -219,12 +219,12 @@
         $GLOBALS['_OLE_INSTANCES'][] = $this;
         $instanceId = end(array_keys($GLOBALS['_OLE_INSTANCES']));
 
-        $path = 'ole-chainedblockstream://oleInstanceId='.$instanceId;
+        $path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
         if ($blockIdOrPps instanceof OLE\PPS) {
-            $path .= '&blockId='.$blockIdOrPps->startBlock;
-            $path .= '&size='.$blockIdOrPps->Size;
+            $path .= '&blockId=' . $blockIdOrPps->startBlock;
+            $path .= '&size=' . $blockIdOrPps->Size;
         } else {
-            $path .= '&blockId='.$blockIdOrPps;
+            $path .= '&blockId=' . $blockIdOrPps;
         }
 
         return fopen($path, 'r');

src/PhpSpreadsheet/Shared/StringHelper.php

Spacing +5 added lines, -5 removed lines

@@ -89,7 +89,7 @@ 
     {
         for ($i = 0; $i <= 31; ++$i) {
             if ($i != 9 && $i != 10 && $i != 13) {
-                $find = '_x'.sprintf('%04s', strtoupper(dechex($i))).'_';
+                $find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_';
                 $replace = chr($i);
                 self::$controlCharacters[$find] = $replace;
             }
@@ -488,7 +488,7 @@ 
         // characters
         $chars = self::convertEncoding($value, 'UTF-16LE', 'UTF-8');
 
-        $data = pack('vC', $ln, $opt).$chars;
+        $data = pack('vC', $ln, $opt) . $chars;
 
         return $data;
     }
@@ -505,7 +505,7 @@ 
     public static function convertEncoding($value, $to, $from)
     {
         if (self::getIsIconvEnabled()) {
-            return iconv($from, $to.'//IGNORE//TRANSLIT', $value);
+            return iconv($from, $to . '//IGNORE//TRANSLIT', $value);
         }
 
         if (self::getIsMbstringEnabled()) {
@@ -709,9 +709,9 @@ 
      */
     public static function convertToNumberIfFraction(&$operand)
     {
-        if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) {
+        if (preg_match('/^' . self::STRING_REGEXP_FRACTION . '$/i', $operand, $match)) {
             $sign = ($match[1] == '-') ? '-' : '+';
-            $fractionFormula = '='.$sign.$match[2].$sign.$match[3];
+            $fractionFormula = '=' . $sign . $match[2] . $sign . $match[3];
             $operand = \PhpOffice\PhpSpreadsheet\Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
 
             return true;

src/PhpSpreadsheet/Shared/PCLZip/PclZip.php

Spacing +95 added lines, -95 removed lines

@@ -222,7 +222,7 @@ 
 
         // ----- Tests the zlib
         if (!function_exists('gzopen')) {
-            die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+            die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
         }
 
         // ----- Set the attributes
@@ -529,7 +529,7 @@ 
             $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
         } else {
             // ----- Invalid variable type for $p_filelist
-            self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+            self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
 
             return 0;
         }
@@ -1077,7 +1077,7 @@ 
                 $this->privSwapBackMagicQuotes();
 
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+                self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
 
                 // ----- Return
                 return 0;
@@ -1137,7 +1137,7 @@ 
             // TBC : Should also check the archive format
             if (!is_file($p_archive)) {
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+                self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
                 $v_result = PCLZIP_ERR_MISSING_FILE;
             } else {
                 // ----- Duplicate the archive
@@ -1257,7 +1257,7 @@ 
         }
 
         if ($p_with_code) {
-            return $v_value.' ('.$this->error_code.')';
+            return $v_value . ' (' . $this->error_code . ')';
         } else {
             return $v_value;
         }
@@ -1275,9 +1275,9 @@ 
             return PclErrorString();
         } else {
             if ($p_full) {
-                return $this->errorName(true).' : '.$this->error_string;
+                return $this->errorName(true) . ' : ' . $this->error_string;
             } else {
-                return $this->error_string.' [code '.$this->error_code.']';
+                return $this->error_string . ' [code ' . $this->error_code . ']';
             }
         }
     }
@@ -1316,7 +1316,7 @@ 
         // ----- Look if the file exits
         if (!is_file($this->zipname)) {
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+            self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
 
             return false;
         }
@@ -1324,7 +1324,7 @@ 
         // ----- Check that the file is readeable
         if (!is_readable($this->zipname)) {
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
 
             return false;
         }
@@ -1368,7 +1368,7 @@ 
             // ----- Check if the option is supported
             if (!isset($v_requested_options[$p_options_list[$i]])) {
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+                self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
                 // ----- Return
                 return self::errorCode();
@@ -1383,7 +1383,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return self::errorCode();
@@ -1397,14 +1397,14 @@ 
                 case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         return self::errorCode();
                     }
 
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
 
                         return self::errorCode();
                     }
@@ -1412,7 +1412,7 @@ 
                     // ----- Check the value
                     $v_value = $p_options_list[$i + 1];
                     if ((!is_integer($v_value)) || ($v_value < 0)) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         return self::errorCode();
                     }
@@ -1425,7 +1425,7 @@ 
                 case PCLZIP_OPT_TEMP_FILE_ON:
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
 
                         return self::errorCode();
                     }
@@ -1436,13 +1436,13 @@ 
                 case PCLZIP_OPT_TEMP_FILE_OFF:
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
 
                         return self::errorCode();
                     }
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
 
                         return self::errorCode();
                     }
@@ -1453,7 +1453,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1470,7 +1470,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1482,7 +1482,7 @@ 
                         $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1499,7 +1499,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1509,7 +1509,7 @@ 
                         $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1523,7 +1523,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return self::errorCode();
@@ -1534,7 +1534,7 @@ 
                         $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return self::errorCode();
@@ -1547,7 +1547,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return self::errorCode();
@@ -1562,12 +1562,12 @@ 
                         // ----- Parse items
                         $v_work_list = explode(',', $p_options_list[$i + 1]);
                     } elseif (is_integer($p_options_list[$i + 1])) {
-                        $v_work_list[0] = $p_options_list[$i + 1].'-'.$p_options_list[$i + 1];
+                        $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
                     } elseif (is_array($p_options_list[$i + 1])) {
                         $v_work_list = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return self::errorCode();
@@ -1598,7 +1598,7 @@ 
                             $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
                         } else {
                             // ----- Error log
-                            self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                            self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                             // ----- Return
                             return self::errorCode();
@@ -1610,7 +1610,7 @@ 
 
                             // ----- TBC : An automatic sort should be writen ...
                             // ----- Error log
-                            self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                            self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                             // ----- Return
                             return self::errorCode();
@@ -1639,7 +1639,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1662,7 +1662,7 @@ 
                     // ----- Check the number of parameters
                     if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1673,7 +1673,7 @@ 
                     // ----- Check that the value is a valid existing function
                     if (!function_exists($v_function_name)) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return self::errorCode();
                     }
@@ -1684,7 +1684,7 @@ 
                     break;
                 default:
                     // ----- Error log
-                    self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '".$p_options_list[$i]."'");
+                    self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
 
                     // ----- Return
                     return self::errorCode();
@@ -1702,7 +1702,7 @@ 
                     // ----- Look if present
                     if (!isset($v_result_list[$key])) {
                         // ----- Error log
-                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Missing mandatory parameter '.PclZipUtilOptionText($key).'('.$key.')');
+                        self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Missing mandatory parameter ' . PclZipUtilOptionText($key) . '(' . $key . ')');
 
                         // ----- Return
                         return self::errorCode();
@@ -1780,7 +1780,7 @@ 
             // ----- Check if the option is supported
             if (!isset($v_requested_options[$v_key])) {
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+                self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
                 // ----- Return
                 return self::errorCode();
@@ -1790,7 +1790,7 @@ 
             switch ($v_key) {
                 case PCLZIP_ATT_FILE_NAME:
                     if (!is_string($v_value)) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type '.gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type ' . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
@@ -1798,14 +1798,14 @@ 
                     $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
 
                     if ($p_filedescr['filename'] == '') {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
                     break;
                 case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
                     if (!is_string($v_value)) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type '.gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type ' . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
@@ -1813,14 +1813,14 @@ 
                     $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
 
                     if ($p_filedescr['new_short_name'] == '') {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
                     break;
                 case PCLZIP_ATT_FILE_NEW_FULL_NAME:
                     if (!is_string($v_value)) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type '.gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type ' . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
@@ -1828,7 +1828,7 @@ 
                     $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
 
                     if ($p_filedescr['new_full_name'] == '') {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
@@ -1836,7 +1836,7 @@ 
                 // ----- Look for options that takes a string
                 case PCLZIP_ATT_FILE_COMMENT:
                     if (!is_string($v_value)) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type '.gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type ' . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
@@ -1844,7 +1844,7 @@ 
                     break;
                 case PCLZIP_ATT_FILE_MTIME:
                     if (!is_integer($v_value)) {
-                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type '.gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        self::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, 'Invalid type ' . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
 
                         return self::errorCode();
                     }
@@ -1855,7 +1855,7 @@ 
                     break;
                 default:
                     // ----- Error log
-                    self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '".$v_key."'");
+                    self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
 
                     // ----- Return
                     return self::errorCode();
@@ -1868,7 +1868,7 @@ 
                     if ($v_requested_options[$key] == 'mandatory') {
                         // ----- Look if present
                         if (!isset($p_file_list[$key])) {
-                            self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Missing mandatory parameter '.PclZipUtilOptionText($key).'('.$key.')');
+                            self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Missing mandatory parameter ' . PclZipUtilOptionText($key) . '(' . $key . ')');
 
                             return self::errorCode();
                         }
@@ -1931,7 +1931,7 @@ 
             } else {
                 // ----- Missing file
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+                self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
 
                 // ----- Return
                 return self::errorCode();
@@ -1956,7 +1956,7 @@ 
                         }
 
                         // ----- Compose the full filename
-                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
 
                         // ----- Look for different stored filename
                         // Because the name of the folder was changed, the name of the
@@ -1964,7 +1964,7 @@ 
                         if (($v_descr['stored_filename'] != $v_descr['filename'])
                                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
                             if ($v_descr['stored_filename'] != '') {
-                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
                             } else {
                                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
                             }
@@ -2079,14 +2079,14 @@ 
         @rewind($this->zip_fd);
 
         // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
 
         // ----- Open the temporary file in write mode
         if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
 
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
 
             // ----- Return
             return self::errorCode();
@@ -2159,10 +2159,10 @@ 
             $v_comment = $p_options[PCLZIP_OPT_COMMENT];
         }
         if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-            $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+            $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
         }
         if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
         }
 
         // ----- Calculate the size of the central header
@@ -2218,7 +2218,7 @@ 
         // ----- Look if already open
         if ($this->zip_fd != 0) {
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
 
             // ----- Return
             return self::errorCode();
@@ -2227,7 +2227,7 @@ 
         // ----- Open the zip file
         if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
 
             // ----- Return
             return self::errorCode();
@@ -2353,7 +2353,7 @@ 
 
             // ----- Check the filename
             if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
-                self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+                self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
 
                 return self::errorCode();
             }
@@ -2647,10 +2647,10 @@ 
         }
 
         // ----- Creates a compressed temporary file
-        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
         if (($v_file_compressed = @gzopen($v_gzip_temp_name, 'wb')) == 0) {
             fclose($v_file);
-            self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+            self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
 
             return self::errorCode();
         }
@@ -2671,14 +2671,14 @@ 
 
         // ----- Check the minimum file size
         if (filesize($v_gzip_temp_name) < 18) {
-            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
 
             return self::errorCode();
         }
 
         // ----- Extract the compressed attributes
         if (($v_file_compressed = @fopen($v_gzip_temp_name, 'rb')) == 0) {
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
 
             return self::errorCode();
         }
@@ -2711,7 +2711,7 @@ 
 
         // ----- Add the compressed data
         if (($v_file_compressed = @fopen($v_gzip_temp_name, 'rb')) == 0) {
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
 
             return self::errorCode();
         }
@@ -2779,9 +2779,9 @@ 
                 $v_path_info = pathinfo($p_filename);
                 $v_dir = '';
                 if ($v_path_info['dirname'] != '') {
-                    $v_dir = $v_path_info['dirname'].'/';
+                    $v_dir = $v_path_info['dirname'] . '/';
                 }
-                $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+                $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
             } else {
                 // ----- Calculate the stored filename
                 $v_stored_filename = $p_filename;
@@ -2798,7 +2798,7 @@ 
 
                 if ((substr($p_filename, 0, 2) == './') || (substr($p_remove_dir, 0, 2) == './')) {
                     if ((substr($p_filename, 0, 2) == './') && (substr($p_remove_dir, 0, 2) != './')) {
-                        $p_remove_dir = './'.$p_remove_dir;
+                        $p_remove_dir = './' . $p_remove_dir;
                     }
                     if ((substr($p_filename, 0, 2) != './') && (substr($p_remove_dir, 0, 2) == './')) {
                         $p_remove_dir = substr($p_remove_dir, 2);
@@ -2821,9 +2821,9 @@ 
             // ----- Look for path to add
             if ($p_add_dir != '') {
                 if (substr($p_add_dir, -1) == '/') {
-                    $v_stored_filename = $p_add_dir.$v_stored_filename;
+                    $v_stored_filename = $p_add_dir . $v_stored_filename;
                 } else {
-                    $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
+                    $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
                 }
             }
         }
@@ -2960,7 +2960,7 @@ 
             $this->privSwapBackMagicQuotes();
 
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
 
             // ----- Return
             return self::errorCode();
@@ -3079,7 +3079,7 @@ 
 
         // ----- Check the path
         if (($p_path == '') || ((substr($p_path, 0, 1) != '/') && (substr($p_path, 0, 3) != '../') && (substr($p_path, 1, 2) != ':/'))) {
-            $p_path = './'.$p_path;
+            $p_path = './' . $p_path;
         }
 
         // ----- Reduce the path last (and duplicated) '/'
@@ -3200,7 +3200,7 @@ 
                 if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
                     $this->privSwapBackMagicQuotes();
 
-                    self::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '".$v_header['stored_filename']."' is compressed by an unsupported compression method (".$v_header['compression'].') ');
+                    self::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is compressed by an unsupported compression method (" . $v_header['compression'] . ') ');
 
                     return self::errorCode();
                 }
@@ -3213,7 +3213,7 @@ 
                 if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
                     $this->privSwapBackMagicQuotes();
 
-                    self::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for  filename '".$v_header['stored_filename']."'");
+                    self::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for  filename '" . $v_header['stored_filename'] . "'");
 
                     return self::errorCode();
                 }
@@ -3395,14 +3395,14 @@ 
 
         // ----- Add the path
         if ($p_path != '') {
-            $p_entry['filename'] = $p_path.'/'.$p_entry['filename'];
+            $p_entry['filename'] = $p_path . '/' . $p_entry['filename'];
         }
 
         // ----- Check a base_dir_restriction
         if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
             $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
             if ($v_inclusion == 0) {
-                self::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '".$p_entry['filename']."' is outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+                self::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
                 return self::errorCode();
             }
@@ -3450,7 +3450,7 @@ 
                     // For historical reason first PclZip implementation does not stop
                     // when this kind of error occurs.
                     if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-                        self::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '".$p_entry['filename']."' is already used by an existing directory");
+                        self::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is already used by an existing directory");
 
                         return self::errorCode();
                     }
@@ -3463,7 +3463,7 @@ 
                     // For historical reason first PclZip implementation does not stop
                     // when this kind of error occurs.
                     if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-                        self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '".$p_entry['filename']."' exists and is write protected");
+                        self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists and is write protected");
 
                         return self::errorCode();
                     }
@@ -3478,7 +3478,7 @@ 
                         // For historical reason first PclZip implementation does not stop
                         // when this kind of error occurs.
                         if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-                            self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '".$p_entry['filename']."' exists and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+                            self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists and option PCLZIP_OPT_REPLACE_NEWER is not selected");
 
                             return self::errorCode();
                         }
@@ -3543,7 +3543,7 @@ 
                     // ----- TBC
                     // Need to be finished
                     if (($p_entry['flag'] & 1) == 1) {
-                        self::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+                        self::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
 
                         return self::errorCode();
                     }
@@ -3635,10 +3635,10 @@ 
         $v_result = 1;
 
         // ----- Creates a temporary file
-        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
         if (($v_dest_file = @fopen($v_gzip_temp_name, 'wb')) == 0) {
             fclose($v_file);
-            self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+            self::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
 
             return self::errorCode();
         }
@@ -3675,7 +3675,7 @@ 
         if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
             @fclose($v_dest_file);
             $p_entry['status'] = 'read_error';
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
 
             return self::errorCode();
         }
@@ -3944,7 +3944,7 @@ 
             $p_header['status'] = 'invalid_header';
 
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
+            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
 
             // ----- Return
             return self::errorCode();
@@ -4039,7 +4039,7 @@ 
             $p_header['status'] = 'invalid_header';
 
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
+            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
 
             // ----- Return
             return self::errorCode();
@@ -4162,7 +4162,7 @@ 
         @fseek($this->zip_fd, $v_size);
         if (@ftell($this->zip_fd) != $v_size) {
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
 
             // ----- Return
             return self::errorCode();
@@ -4175,7 +4175,7 @@ 
             @fseek($this->zip_fd, $v_size - 22);
             if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+                self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
 
                 // ----- Return
                 return self::errorCode();
@@ -4202,7 +4202,7 @@ 
             @fseek($this->zip_fd, $v_size - $v_maximum_size);
             if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
                 // ----- Error log
-                self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+                self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
 
                 // ----- Return
                 return self::errorCode();
@@ -4246,7 +4246,7 @@ 
         // ----- Look for invalid block size
         if (strlen($v_binary_data) != 18) {
             // ----- Error log
-            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid End of Central Dir Record size : '.strlen($v_binary_data));
+            self::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid End of Central Dir Record size : ' . strlen($v_binary_data));
 
             // ----- Return
             return self::errorCode();
@@ -4364,7 +4364,7 @@ 
                         // ----- Look if the directory is in the filename path
                         if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                             $v_found = true;
-                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                             $v_found = true;
                         }
                     } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
@@ -4406,7 +4406,7 @@ 
         // ----- Look if something need to be deleted
         if ($v_nb_extracted > 0) {
             // ----- Creates a temporay file
-            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
 
             // ----- Creates a temporary zip archive
             $v_temp_zip = new self($v_zip_temp_name);
@@ -4671,14 +4671,14 @@ 
         @rewind($p_archive_to_add->zip_fd);
 
         // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
 
         // ----- Open the temporary file in write mode
         if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
             $this->privCloseFd();
             $p_archive_to_add->privCloseFd();
 
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
 
             // ----- Return
             return self::errorCode();
@@ -4725,7 +4725,7 @@ 
         }
 
         // ----- Merge the file comments
-        $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+        $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
 
         // ----- Calculate the size of the (new) central header
         $v_size = @ftell($v_zip_temp_fd) - $v_offset;
@@ -4806,7 +4806,7 @@ 
         if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
             $this->privCloseFd();
 
-            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+            self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
 
             // ----- Return
             return self::errorCode();
@@ -4958,7 +4958,7 @@ 
             } elseif ($v_list[$i] == '') {
                 // ----- First '/' i.e. root slash
                 if ($i == 0) {
-                    $v_result = '/'.$v_result;
+                    $v_result = '/' . $v_result;
                     if ($v_skip > 0) {
                         // ----- It is an invalid path, so the path is not modified
                         // TBC
@@ -4978,7 +4978,7 @@ 
                 if ($v_skip > 0) {
                     --$v_skip;
                 } else {
-                    $v_result = $v_list[$i].($i != (sizeof($v_list) - 1) ? '/'.$v_result : '');
+                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/' . $v_result : '');
                 }
             }
         }
@@ -4986,7 +4986,7 @@ 
         // ----- Look for skip
         if ($v_skip > 0) {
             while ($v_skip > 0) {
-                $v_result = '../'.$v_result;
+                $v_result = '../' . $v_result;
                 --$v_skip;
             }
         }
@@ -5018,10 +5018,10 @@ 
 
     // ----- Look for path beginning by ./
     if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
-        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false).'/'.substr($p_dir, 1);
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_dir, 1);
     }
     if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
-        $p_path = PclZipUtilTranslateWinPath(getcwd(), false).'/'.substr($p_path, 1);
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator

src/PhpSpreadsheet/Worksheet/AutoFilter.php

Spacing +5 added lines, -5 removed lines

@@ -425,7 +425,7 @@ 
                 }
             } else {
                 //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
-                $retVal = preg_match('/^'.$rule['value'].'$/i', $cellValue);
+                $retVal = preg_match('/^' . $rule['value'] . '$/i', $cellValue);
             }
             //    If there are multiple conditions, then we need to test both using the appropriate join operator
             switch ($join) {
@@ -591,7 +591,7 @@ 
 
     private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
     {
-        $range = $columnID.$startRow.':'.$columnID.$endRow;
+        $range = $columnID . $startRow . ':' . $columnID . $endRow;
         $dataValues = \PhpOffice\PhpSpreadsheet\Calculation\Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
 
         $dataValues = array_filter($dataValues);
@@ -674,7 +674,7 @@ 
                                 ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')) {
                                 $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
                             }
-                            $dateTime = $date.$time;
+                            $dateTime = $date . $time;
                             $arguments['date'][] = $date;
                             $arguments['time'][] = $time;
                             $arguments['dateTime'][] = $dateTime;
@@ -722,7 +722,7 @@ 
                             ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
                             //    Number (Average) based
                             //    Calculate the average
-                            $averageFormula = '=AVERAGE('.$columnID.($rangeStart[1] + 1).':'.$columnID.$rangeEnd[1].')';
+                            $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')';
                             $average = \PhpOffice\PhpSpreadsheet\Calculation::getInstance()->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1'));
                             //    Set above/below rule based on greaterThan or LessTan
                             $operator = ($dynamicRuleType === AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
@@ -800,7 +800,7 @@ 
         for ($row = $rangeStart[1] + 1; $row <= $rangeEnd[1]; ++$row) {
             $result = true;
             foreach ($columnFilterTests as $columnID => $columnFilterTest) {
-                $cellValue = $this->workSheet->getCell($columnID.$row)->getCalculatedValue();
+                $cellValue = $this->workSheet->getCell($columnID . $row)->getCalculatedValue();
                 //    Execute the filter test
                 $result = $result &&
                     call_user_func_array(