PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/OLE.php

Doc Comments +6 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
      *
      * @acces public
      * @param string $file
-     * @return mixed true on success, PEAR_Error on failure
+     * @return boolean true on success, PEAR_Error on failure
      * @throws \PHPExcel\Reader\Exception
     */
     public function read($file)
@@ -225,6 +225,7 @@ 
     /**
      * Reads a signed char.
      * @param   resource  file handle
+     * @param resource $fh
      * @return  int
      * @access public
      */
@@ -237,6 +238,7 @@ 
     /**
      * Reads an unsigned short (2 octets).
      * @param   resource  file handle
+     * @param resource $fh
      * @return  int
      * @access public
      */
@@ -249,6 +251,7 @@ 
     /**
      * Reads an unsigned long (4 octets).
      * @param   resource  file handle
+     * @param resource $fh
      * @return  int
      * @access public
      */
@@ -264,7 +267,8 @@ 
     *
     * @access public
     * @param  integer  the block id of the first block
-    * @return mixed true on success, PEAR_Error on failure
+    * @param integer $blockId
+    * @return boolean true on success, PEAR_Error on failure
     */
     public function _readPpsWks($blockId)
     {

Indentation +88 added lines, -88 removed lines

@@ -50,43 +50,43 @@ 
     /**
      * The file handle for reading an OLE container
      * @var resource
-    */
+     */
     public $_file_handle;
 
     /**
-    * Array of PPS's found on the OLE container
-    * @var array
-    */
+     * Array of PPS's found on the OLE container
+     * @var array
+     */
     public $_list = array();
 
     /**
      * Root directory of OLE container
      * @var OLE_PPS_Root
-    */
+     */
     public $root;
 
     /**
      * Big Block Allocation Table
      * @var array  (blockId => nextBlockId)
-    */
+     */
     public $bbat;
 
     /**
      * Short Block Allocation Table
      * @var array  (blockId => nextBlockId)
-    */
+     */
     public $sbat;
 
     /**
      * Size of big blocks. This is usually 512.
      * @var  int  number of octets per block.
-    */
+     */
     public $bigBlockSize;
 
     /**
      * Size of small blocks. This is usually 64.
      * @var  int  number of octets per block
-    */
+     */
     public $smallBlockSize;
 
     /**
@@ -96,7 +96,7 @@ 
      * @param string $file
      * @return mixed true on success, PEAR_Error on failure
      * @throws \PHPExcel\Reader\Exception
-    */
+     */
     public function read($file)
     {
         $fh = fopen($file, "r");
@@ -193,11 +193,11 @@ 
     }
 
     /**
-    * Returns a stream for use with fread() etc. External callers should
-    * use \PHPExcel\Shared\OLE\PPS\File::getStream().
-    * @param   int|PPS   block id or PPS
-    * @return  resource  read-only stream
-    */
+     * Returns a stream for use with fread() etc. External callers should
+     * use \PHPExcel\Shared\OLE\PPS\File::getStream().
+     * @param   int|PPS   block id or PPS
+     * @return  resource  read-only stream
+     */
     public function getStream($blockIdOrPps)
     {
         static $isRegistered = false;
@@ -259,13 +259,13 @@ 
     }
 
     /**
-    * Gets information about all PPS's on the OLE container from the PPS WK's
-    * creates an OLE_PPS object for each one.
-    *
-    * @access public
-    * @param  integer  the block id of the first block
-    * @return mixed true on success, PEAR_Error on failure
-    */
+     * Gets information about all PPS's on the OLE container from the PPS WK's
+     * creates an OLE_PPS object for each one.
+     *
+     * @access public
+     * @param  integer  the block id of the first block
+     * @return mixed true on success, PEAR_Error on failure
+     */
     public function _readPpsWks($blockId)
     {
         $fh = $this->getStream($blockId);
@@ -333,13 +333,13 @@ 
     }
 
     /**
-    * It checks whether the PPS tree is complete (all PPS's read)
-    * starting with the given PPS (not necessarily root)
-    *
-    * @access public
-    * @param integer $index The index of the PPS from which we are checking
-    * @return boolean Whether the PPS tree for the given PPS is complete
-    */
+     * It checks whether the PPS tree is complete (all PPS's read)
+     * starting with the given PPS (not necessarily root)
+     *
+     * @access public
+     * @param integer $index The index of the PPS from which we are checking
+     * @return boolean Whether the PPS tree for the given PPS is complete
+     */
     public function _ppsTreeComplete($index)
     {
         return isset($this->_list[$index]) &&
@@ -353,13 +353,13 @@ 
     }
 
     /**
-    * Checks whether a PPS is a File PPS or not.
-    * If there is no PPS for the index given, it will return false.
-    *
-    * @access public
-    * @param integer $index The index for the PPS
-    * @return bool true if it's a File PPS, false otherwise
-    */
+     * Checks whether a PPS is a File PPS or not.
+     * If there is no PPS for the index given, it will return false.
+     *
+     * @access public
+     * @param integer $index The index for the PPS
+     * @return bool true if it's a File PPS, false otherwise
+     */
     public function isFile($index)
     {
         if (isset($this->_list[$index])) {
@@ -369,13 +369,13 @@ 
     }
 
     /**
-    * Checks whether a PPS is a Root PPS or not.
-    * If there is no PPS for the index given, it will return false.
-    *
-    * @access public
-    * @param integer $index The index for the PPS.
-    * @return bool true if it's a Root PPS, false otherwise
-    */
+     * Checks whether a PPS is a Root PPS or not.
+     * If there is no PPS for the index given, it will return false.
+     *
+     * @access public
+     * @param integer $index The index for the PPS.
+     * @return bool true if it's a Root PPS, false otherwise
+     */
     public function isRoot($index)
     {
         if (isset($this->_list[$index])) {
@@ -385,28 +385,28 @@ 
     }
 
     /**
-    * Gives the total number of PPS's found in the OLE container.
-    *
-    * @access public
-    * @return integer The total number of PPS's found in the OLE container
-    */
+     * Gives the total number of PPS's found in the OLE container.
+     *
+     * @access public
+     * @return integer The total number of PPS's found in the OLE container
+     */
     public function ppsTotal()
     {
         return count($this->_list);
     }
 
     /**
-    * Gets data from a PPS
-    * If there is no PPS for the index given, it will return an empty string.
-    *
-    * @access public
-    * @param integer $index    The index for the PPS
-    * @param integer $position The position from which to start reading
-    *                          (relative to the PPS)
-    * @param integer $length   The amount of bytes to read (at most)
-    * @return string The binary string containing the data requested
-    * @see OLE_PPS_File::getStream()
-    */
+     * Gets data from a PPS
+     * If there is no PPS for the index given, it will return an empty string.
+     *
+     * @access public
+     * @param integer $index    The index for the PPS
+     * @param integer $position The position from which to start reading
+     *                          (relative to the PPS)
+     * @param integer $length   The amount of bytes to read (at most)
+     * @return string The binary string containing the data requested
+     * @see OLE_PPS_File::getStream()
+     */
     public function getData($index, $position, $length)
     {
         // if position is not valid return empty string
@@ -420,13 +420,13 @@ 
     }
 
     /**
-    * Gets the data length from a PPS
-    * If there is no PPS for the index given, it will return 0.
-    *
-    * @access public
-    * @param integer $index    The index for the PPS
-    * @return integer The amount of bytes in data the PPS has
-    */
+     * Gets the data length from a PPS
+     * If there is no PPS for the index given, it will return 0.
+     *
+     * @access public
+     * @param integer $index    The index for the PPS
+     * @return integer The amount of bytes in data the PPS has
+     */
     public function getDataLength($index)
     {
         if (isset($this->_list[$index])) {
@@ -436,13 +436,13 @@ 
     }
 
     /**
-    * Utility function to transform ASCII text to Unicode
-    *
-    * @access public
-    * @static
-    * @param string $ascii The ASCII string to transform
-    * @return string The string in Unicode
-    */
+     * Utility function to transform ASCII text to Unicode
+     *
+     * @access public
+     * @static
+     * @param string $ascii The ASCII string to transform
+     * @return string The string in Unicode
+     */
     public static function ascToUcs($ascii)
     {
         $rawname = '';
@@ -453,14 +453,14 @@ 
     }
 
     /**
-    * Utility function
-    * Returns a string for the OLE container with the date given
-    *
-    * @access public
-    * @static
-    * @param integer $date A timestamp
-    * @return string The string for the OLE container
-    */
+     * Utility function
+     * Returns a string for the OLE container with the date given
+     *
+     * @access public
+     * @static
+     * @param integer $date A timestamp
+     * @return string The string for the OLE container
+     */
     public static function localDateToOLE($date = null)
     {
         if (!isset($date)) {
@@ -498,13 +498,13 @@ 
     }
 
     /**
-    * Returns a timestamp from an OLE container's date
-    *
-    * @access public
-    * @static
-    * @param integer $string A binary string with the encoded date
-    * @return string The timestamp corresponding to the string
-    */
+     * Returns a timestamp from an OLE container's date
+     *
+     * @access public
+     * @static
+     * @param integer $string A binary string with the encoded date
+     * @return string The timestamp corresponding to the string
+     */
     public static function OLE2LocalDate($string)
     {
         if (strlen($string) != 8) {

Spacing +8 added lines, -8 removed lines

@@ -40,12 +40,12 @@ 
 */
 class OLE
 {
-    const OLE_PPS_TYPE_ROOT   =      5;
-    const OLE_PPS_TYPE_DIR    =      1;
-    const OLE_PPS_TYPE_FILE   =      2;
+    const OLE_PPS_TYPE_ROOT   = 5;
+    const OLE_PPS_TYPE_DIR    = 1;
+    const OLE_PPS_TYPE_FILE   = 2;
     const OLE_DATA_SIZE_SMALL = 0x1000;
-    const OLE_LONG_INT_SIZE   =      4;
-    const OLE_PPS_SIZE        =   0x80;
+    const OLE_LONG_INT_SIZE   = 4;
+    const OLE_PPS_SIZE        = 0x80;
 
     /**
      * The file handle for reading an OLE container
@@ -116,7 +116,7 @@ 
         }
         // Size of blocks and short blocks in bytes
         $this->bigBlockSize = pow(2, self::_readInt2($fh));
-        $this->smallBlockSize  = pow(2, self::_readInt2($fh));
+        $this->smallBlockSize = pow(2, self::_readInt2($fh));
 
         // Skip UID, revision number and version number
         fseek($fh, 44);
@@ -269,7 +269,7 @@ 
     public function _readPpsWks($blockId)
     {
         $fh = $this->getStream($blockId);
-        for ($pos = 0;; $pos += 128) {
+        for ($pos = 0; ; $pos += 128) {
             fseek($fh, $pos, SEEK_SET);
             $nameUtf16 = fread($fh, 64);
             $nameLength = self::_readInt2($fh);
@@ -473,7 +473,7 @@ 
         // days from 1-1-1601 until the beggining of UNIX era
         $days = 134774;
         // calculate seconds
-        $big_date = $days*24*3600 + gmmktime(date("H", $date), date("i", $date), date("s", $date), date("m", $date), date("d", $date), date("Y", $date));
+        $big_date = $days * 24 * 3600 + gmmktime(date("H", $date), date("i", $date), date("s", $date), date("m", $date), date("d", $date), date("Y", $date));
         // multiply just to make MS happy
         $big_date *= 10000000;
 

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

Doc Comments +5 added lines, -4 removed lines

@@ -42,6 +42,7 @@ 
     /**
      * @param integer $time_1st A timestamp
      * @param integer $time_2nd A timestamp
+     * @param File[] $raChild
      */
     public function __construct($time_1st, $time_2nd, $raChild)
     {
@@ -57,9 +58,9 @@ 
     * If a resource pointer to a stream created by fopen() is passed
     * it will be used, but you have to close such stream by yourself.
     *
-    * @param string|resource $filename The name of the file or stream where to save the OLE container.
+    * @param string|null $filename The name of the file or stream where to save the OLE container.
     * @access public
-    * @return mixed true on success
+    * @return boolean true on success
     * @throws \PHPExcel\Writer\Exception
     */
     public function save($filename)
@@ -121,7 +122,7 @@ 
     *
     * @access public
     * @param array $raList Reference to an array of PPS's
-    * @return array The array of numbers
+    * @return double[] The array of numbers
     */
     public function _calcSize(&$raList)
     {
@@ -160,7 +161,7 @@ 
     * @access public
     * @param integer $i2 The argument
     * @see save()
-    * @return integer
+    * @return double
     */
     private static function adjust2($i2)
     {

Indentation +54 added lines, -54 removed lines

@@ -51,17 +51,17 @@ 
     }
 
     /**
-    * Method for saving the whole OLE container (including files).
-    * In fact, if called with an empty argument (or '-'), it saves to a
-    * temporary file and then outputs it's contents to stdout.
-    * If a resource pointer to a stream created by fopen() is passed
-    * it will be used, but you have to close such stream by yourself.
-    *
-    * @param string|resource $filename The name of the file or stream where to save the OLE container.
-    * @access public
-    * @return mixed true on success
-    * @throws \PHPExcel\Writer\Exception
-    */
+     * Method for saving the whole OLE container (including files).
+     * In fact, if called with an empty argument (or '-'), it saves to a
+     * temporary file and then outputs it's contents to stdout.
+     * If a resource pointer to a stream created by fopen() is passed
+     * it will be used, but you have to close such stream by yourself.
+     *
+     * @param string|resource $filename The name of the file or stream where to save the OLE container.
+     * @access public
+     * @return mixed true on success
+     * @throws \PHPExcel\Writer\Exception
+     */
     public function save($filename)
     {
         // Initial Setting for saving
@@ -117,12 +117,12 @@ 
     }
 
     /**
-    * Calculate some numbers
-    *
-    * @access public
-    * @param array $raList Reference to an array of PPS's
-    * @return array The array of numbers
-    */
+     * Calculate some numbers
+     *
+     * @access public
+     * @param array $raList Reference to an array of PPS's
+     * @return array The array of numbers
+     */
     public function _calcSize(&$raList)
     {
         // Calculate Basic Setting
@@ -155,13 +155,13 @@ 
     }
 
     /**
-    * Helper function for caculating a magic value for block sizes
-    *
-    * @access public
-    * @param integer $i2 The argument
-    * @see save()
-    * @return integer
-    */
+     * Helper function for caculating a magic value for block sizes
+     *
+     * @access public
+     * @param integer $i2 The argument
+     * @see save()
+     * @return integer
+     */
     private static function adjust2($i2)
     {
         $iWk = log($i2)/log(2);
@@ -169,13 +169,13 @@ 
     }
 
     /**
-    * Save OLE header
-    *
-    * @access public
-    * @param integer $iSBDcnt
-    * @param integer $iBBcnt
-    * @param integer $iPPScnt
-    */
+     * Save OLE header
+     *
+     * @access public
+     * @param integer $iSBDcnt
+     * @param integer $iBBcnt
+     * @param integer $iPPScnt
+     */
     public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt)
     {
         $FILE = $this->_FILEH_;
@@ -250,12 +250,12 @@ 
     }
 
     /**
-    * Saving big data (PPS's with data bigger than \PHPExcel\Shared\OLE::OLE_DATA_SIZE_SMALL)
-    *
-    * @access public
-    * @param integer $iStBlk
-    * @param array &$raList Reference to array of PPS's
-    */
+     * Saving big data (PPS's with data bigger than \PHPExcel\Shared\OLE::OLE_DATA_SIZE_SMALL)
+     *
+     * @access public
+     * @param integer $iStBlk
+     * @param array &$raList Reference to array of PPS's
+     */
     public function _saveBigData($iStBlk, &$raList)
     {
         $FILE = $this->_FILEH_;
@@ -298,11 +298,11 @@ 
     }
 
     /**
-    * get small data (PPS's with data smaller than \PHPExcel\Shared\OLE::OLE_DATA_SIZE_SMALL)
-    *
-    * @access public
-    * @param array &$raList Reference to array of PPS's
-    */
+     * get small data (PPS's with data smaller than \PHPExcel\Shared\OLE::OLE_DATA_SIZE_SMALL)
+     *
+     * @access public
+     * @param array &$raList Reference to array of PPS's
+     */
     public function _makeSmallData(&$raList)
     {
         $sRes = '';
@@ -355,11 +355,11 @@ 
     }
 
     /**
-    * Saves all the PPS's WKs
-    *
-    * @access public
-    * @param array $raList Reference to an array with all PPS's
-    */
+     * Saves all the PPS's WKs
+     *
+     * @access public
+     * @param array $raList Reference to an array with all PPS's
+     */
     public function _savePps(&$raList)
     {
         // Save each PPS WK
@@ -376,13 +376,13 @@ 
     }
 
     /**
-    * Saving Big Block Depot
-    *
-    * @access public
-    * @param integer $iSbdSize
-    * @param integer $iBsize
-    * @param integer $iPpsCnt
-    */
+     * Saving Big Block Depot
+     *
+     * @access public
+     * @param integer $iSbdSize
+     * @param integer $iBsize
+     * @param integer $iPpsCnt
+     */
     public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt)
     {
         $FILE = $this->_FILEH_;

Spacing +38 added lines, -38 removed lines

@@ -65,13 +65,13 @@ 
     public function save($filename)
     {
         // Initial Setting for saving
-        $this->_BIG_BLOCK_SIZE  = pow(
+        $this->_BIG_BLOCK_SIZE = pow(
             2,
-            (isset($this->_BIG_BLOCK_SIZE))? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
+            (isset($this->_BIG_BLOCK_SIZE)) ? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
         );
-        $this->_SMALL_BLOCK_SIZE= pow(
+        $this->_SMALL_BLOCK_SIZE = pow(
             2,
-            (isset($this->_SMALL_BLOCK_SIZE))?  self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
+            (isset($this->_SMALL_BLOCK_SIZE)) ? self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
         );
 
         if (is_resource($filename)) {
@@ -126,7 +126,7 @@ 
     public function _calcSize(&$raList)
     {
         // Calculate Basic Setting
-        list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0,0,0);
+        list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0, 0, 0);
         $iSmallLen = 0;
         $iSBcnt = 0;
         $iCount = count($raList);
@@ -135,21 +135,21 @@ 
                 $raList[$i]->Size = $raList[$i]->getDataLen();
                 if ($raList[$i]->Size < \PHPExcel\Shared\OLE::OLE_DATA_SIZE_SMALL) {
                     $iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
                 } else {
                     $iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
                 }
             }
         }
         $iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
         $iSlCnt = floor($this->_BIG_BLOCK_SIZE / \PHPExcel\Shared\OLE::OLE_LONG_INT_SIZE);
-        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
-        $iBBcnt +=  (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
-                      (( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
+        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt) ? 1 : 0);
+        $iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
+                      (($iSmallLen % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
         $iCnt = count($raList);
         $iBdCnt = $this->_BIG_BLOCK_SIZE / \PHPExcel\Shared\OLE::OLE_PPS_SIZE;
-        $iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
+        $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
 
         return array($iSBDcnt, $iBBcnt, $iPPScnt);
     }
@@ -164,8 +164,8 @@ 
     */
     private static function adjust2($i2)
     {
-        $iWk = log($i2)/log(2);
-        return ($iWk > floor($iWk))? floor($iWk)+1:$iWk;
+        $iWk = log($i2) / log(2);
+        return ($iWk > floor($iWk)) ? floor($iWk) + 1 : $iWk;
     }
 
     /**
@@ -187,17 +187,17 @@ 
         $iBdExL = 0;
         $iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
         $iAllW = $iAll;
-        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
+        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
 
         // Calculate BD count
         if ($iBdCnt > $i1stBdL) {
             while (1) {
                 ++$iBdExL;
                 ++$iAllW;
-                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
-                if ($iBdCnt <= ($iBdExL*$iBlCnt+ $i1stBdL)) {
+                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
+                if ($iBdCnt <= ($iBdExL * $iBlCnt + $i1stBdL)) {
                     break;
                 }
             }
@@ -220,7 +220,7 @@ 
             . "\x00\x00\x00\x00"
             . "\x00\x00\x00\x00"
             . pack("V", $iBdCnt)
-            . pack("V", $iBBcnt+$iSBDcnt) //ROOT START
+            . pack("V", $iBBcnt + $iSBDcnt) //ROOT START
             . pack("V", 0)
             . pack("V", 0x1000)
             . pack("V", $iSBDcnt ? 0 : -2) //Small Block Depot
@@ -234,12 +234,12 @@ 
                 . pack("V", 0)// Extra BDList Count
             );
         } else {
-            fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
+            fwrite($FILE, pack("V", $iAll + $iBdCnt) . pack("V", $iBdExL));
         }
 
         // BDList
         for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; ++$i) {
-            fwrite($FILE, pack("V", $iAll+$i));
+            fwrite($FILE, pack("V", $iAll + $i));
         }
         if ($i < $i1stBdL) {
             $jB = $i1stBdL - $i;
@@ -285,7 +285,7 @@ 
                     $raList[$i]->startBlock = $iStBlk;
                     $iStBlk +=
                             (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
                 }
                 // Close file for each PPS, and unlink it
                 //if (isset($raList[$i]->_PPS_FILE)) {
@@ -318,11 +318,11 @@ 
                 }
                 if ($raList[$i]->Size < \PHPExcel\Shared\OLE::OLE_DATA_SIZE_SMALL) {
                     $iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
                     // Add to SBD
                     $jB = $iSmbCnt - 1;
                     for ($j = 0; $j < $jB; ++$j) {
-                        fwrite($FILE, pack("V", $j+$iSmBlk+1));
+                        fwrite($FILE, pack("V", $j + $iSmBlk + 1));
                     }
                     fwrite($FILE, pack("V", -2));
 
@@ -393,16 +393,16 @@ 
         $iBdExL = 0;
         $iAll = $iBsize + $iPpsCnt + $iSbdSize;
         $iAllW = $iAll;
-        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
+        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
         // Calculate BD count
-        if ($iBdCnt >$i1stBdL) {
+        if ($iBdCnt > $i1stBdL) {
             while (1) {
                 ++$iBdExL;
                 ++$iAllW;
-                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
-                if ($iBdCnt <= ($iBdExL*$iBbCnt+ $i1stBdL)) {
+                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
+                if ($iBdCnt <= ($iBdExL * $iBbCnt + $i1stBdL)) {
                     break;
                 }
             }
@@ -412,19 +412,19 @@ 
         // Set for SBD
         if ($iSbdSize > 0) {
             for ($i = 0; $i < ($iSbdSize - 1); ++$i) {
-                fwrite($FILE, pack("V", $i+1));
+                fwrite($FILE, pack("V", $i + 1));
             }
             fwrite($FILE, pack("V", -2));
         }
         // Set for B
         for ($i = 0; $i < ($iBsize - 1); ++$i) {
-            fwrite($FILE, pack("V", $i+$iSbdSize+1));
+            fwrite($FILE, pack("V", $i + $iSbdSize + 1));
         }
         fwrite($FILE, pack("V", -2));
 
         // Set for PPS
         for ($i = 0; $i < ($iPpsCnt - 1); ++$i) {
-            fwrite($FILE, pack("V", $i+$iSbdSize+$iBsize+1));
+            fwrite($FILE, pack("V", $i + $iSbdSize + $iBsize + 1));
         }
         fwrite($FILE, pack("V", -2));
         // Set for BBD itself ( 0xFFFFFFFD : BBD)
@@ -444,17 +444,17 @@ 
         }
         // Extra BDList
         if ($iBdCnt > $i1stBdL) {
-            $iN=0;
-            $iNb=0;
+            $iN = 0;
+            $iNb = 0;
             for ($i = $i1stBdL; $i < $iBdCnt; $i++, ++$iN) {
                 if ($iN >= ($iBbCnt - 1)) {
                     $iN = 0;
                     ++$iNb;
-                    fwrite($FILE, pack("V", $iAll+$iBdCnt+$iNb));
+                    fwrite($FILE, pack("V", $iAll + $iBdCnt + $iNb));
                 }
-                fwrite($FILE, pack("V", $iBsize+$iSbdSize+$iPpsCnt+$i));
+                fwrite($FILE, pack("V", $iBsize + $iSbdSize + $iPpsCnt + $i));
             }
-            if (($iBdCnt-$i1stBdL) % ($iBbCnt-1)) {
+            if (($iBdCnt - $i1stBdL) % ($iBbCnt - 1)) {
                 $iB = ($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1));
                 for ($i = 0; $i < $iB; ++$i) {
                     fwrite($FILE, pack("V", -1));

src/PhpSpreadsheet/Shared/OLERead.php

Doc Comments +2 added lines, -1 removed lines

@@ -74,7 +74,7 @@ 
     /**
      * Read the file
      *
-     * @param $sFileName string Filename
+     * @param string $sFileName string Filename
      * @throws \PHPExcel\Reader\Exception
      */
     public function read($sFileName)
@@ -172,6 +172,7 @@ 
     /**
      * Extract binary stream data
      *
+     * @param integer $stream
      * @return string
      */
     public function getStream($stream)

Indentation +3 added lines, -3 removed lines

@@ -121,8 +121,8 @@ 
         }
 
         for ($i = 0; $i < $bbdBlocks; ++$i) {
-              $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
-              $pos += 4;
+                $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
+                $pos += 4;
         }
 
         for ($j = 0; $j < $this->numExtensionBlocks; ++$j) {
@@ -188,7 +188,7 @@ 
             $block = $this->props[$stream]['startBlock'];
 
             while ($block != -2) {
-                  $pos = $block * self::SMALL_BLOCK_SIZE;
+                    $pos = $block * self::SMALL_BLOCK_SIZE;
                 $streamData .= substr($rootdata, $pos, self::SMALL_BLOCK_SIZE);
 
                 $block = self::getInt4d($this->smallBlockChain, $block*4);

Spacing +10 added lines, -10 removed lines

@@ -117,7 +117,7 @@ 
         $bbdBlocks = $this->numBigBlockDepotBlocks;
 
         if ($this->numExtensionBlocks != 0) {
-            $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS)/4;
+            $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS) / 4;
         }
 
         for ($i = 0; $i < $bbdBlocks; ++$i) {
@@ -146,8 +146,8 @@ 
         for ($i = 0; $i < $this->numBigBlockDepotBlocks; ++$i) {
             $pos = ($bigBlockDepotBlocks[$i] + 1) * self::BIG_BLOCK_SIZE;
 
-            $this->bigBlockChain .= substr($this->data, $pos, 4*$bbs);
-            $pos += 4*$bbs;
+            $this->bigBlockChain .= substr($this->data, $pos, 4 * $bbs);
+            $pos += 4 * $bbs;
         }
 
         $pos = 0;
@@ -156,10 +156,10 @@ 
         while ($sbdBlock != -2) {
             $pos = ($sbdBlock + 1) * self::BIG_BLOCK_SIZE;
 
-            $this->smallBlockChain .= substr($this->data, $pos, 4*$bbs);
-            $pos += 4*$bbs;
+            $this->smallBlockChain .= substr($this->data, $pos, 4 * $bbs);
+            $pos += 4 * $bbs;
 
-            $sbdBlock = self::getInt4d($this->bigBlockChain, $sbdBlock*4);
+            $sbdBlock = self::getInt4d($this->bigBlockChain, $sbdBlock * 4);
         }
 
         // read the directory stream
@@ -191,7 +191,7 @@ 
                   $pos = $block * self::SMALL_BLOCK_SIZE;
                 $streamData .= substr($rootdata, $pos, self::SMALL_BLOCK_SIZE);
 
-                $block = self::getInt4d($this->smallBlockChain, $block*4);
+                $block = self::getInt4d($this->smallBlockChain, $block * 4);
             }
 
             return $streamData;
@@ -210,7 +210,7 @@ 
             while ($block != -2) {
                 $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
                 $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-                $block = self::getInt4d($this->bigBlockChain, $block*4);
+                $block = self::getInt4d($this->bigBlockChain, $block * 4);
             }
 
             return $streamData;
@@ -231,7 +231,7 @@ 
         while ($block != -2) {
             $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
             $data .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-            $block = self::getInt4d($this->bigBlockChain, $block*4);
+            $block = self::getInt4d($this->bigBlockChain, $block * 4);
         }
         return $data;
     }
@@ -250,7 +250,7 @@ 
             $d = substr($this->entry, $offset, self::PROPERTY_STORAGE_BLOCK_SIZE);
 
             // size in bytes of name
-            $nameSize = ord($d[self::SIZE_OF_NAME_POS]) | (ord($d[self::SIZE_OF_NAME_POS+1]) << 8);
+            $nameSize = ord($d[self::SIZE_OF_NAME_POS]) | (ord($d[self::SIZE_OF_NAME_POS + 1]) << 8);
 
             // type of entry
             $type = ord($d[self::TYPE_POS]);

src/PhpSpreadsheet/Shared/PCLZip/PclZip.php

Doc Comments +12 added lines

@@ -215,6 +215,10 @@ 
     //     Note that no real action is taken, if the archive does not exist it is not
     //     created. Use create() for that.
     // --------------------------------------------------------------------------------
+
+    /**
+     * @param string $p_zipname
+     */
     public function __construct($p_zipname)
     {
 
@@ -2193,6 +2197,10 @@ 
     // Description :
     // Parameters :
     // --------------------------------------------------------------------------------
+
+    /**
+     * @param string $p_mode
+     */
     public function privOpenFd($p_mode)
     {
         $v_result=1;
@@ -3772,6 +3780,10 @@ 
     // Parameters :
     // Return Values :
     // --------------------------------------------------------------------------------
+
+    /**
+     * @param string $p_string
+     */
     public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
     {
         $v_result=1;

Indentation +25 added lines, -25 removed lines

@@ -538,12 +538,12 @@ 
 
         // ----- For each file in the list check the attributes
         $v_supported_attributes = array(
-          PCLZIP_ATT_FILE_NAME => 'mandatory',
-          PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
-          PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
-          PCLZIP_ATT_FILE_MTIME => 'optional',
-          PCLZIP_ATT_FILE_CONTENT => 'optional',
-          PCLZIP_ATT_FILE_COMMENT => 'optional',
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional',
         );
         foreach ($v_att_list as $v_entry) {
             $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
@@ -700,25 +700,25 @@ 
             if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
                 // ----- Parse the options
                 $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
-                  PCLZIP_OPT_PATH => 'optional',
-                  PCLZIP_OPT_REMOVE_PATH => 'optional',
-                  PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                  PCLZIP_OPT_ADD_PATH => 'optional',
-                  PCLZIP_CB_PRE_EXTRACT => 'optional',
-                  PCLZIP_CB_POST_EXTRACT => 'optional',
-                  PCLZIP_OPT_SET_CHMOD => 'optional',
-                  PCLZIP_OPT_BY_NAME => 'optional',
-                  PCLZIP_OPT_BY_EREG => 'optional',
-                  PCLZIP_OPT_BY_PREG => 'optional',
-                  PCLZIP_OPT_BY_INDEX => 'optional',
-                  PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                  PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                  PCLZIP_OPT_REPLACE_NEWER => 'optional',
-                  PCLZIP_OPT_STOP_ON_ERROR => 'optional',
-                  PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                  PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                  PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                  PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_BY_NAME => 'optional',
+                    PCLZIP_OPT_BY_EREG => 'optional',
+                    PCLZIP_OPT_BY_PREG => 'optional',
+                    PCLZIP_OPT_BY_INDEX => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
                 ));
                 if ($v_result != 1) {
                     return 0;

Spacing +246 added lines, -246 removed lines

@@ -220,7 +220,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
@@ -272,7 +272,7 @@ 
     // --------------------------------------------------------------------------------
     public function create($p_filelist)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Reset the error handler
         $this->privErrorReset();
@@ -296,7 +296,7 @@ 
             // ----- Look for first arg
             if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
                 // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
                     PCLZIP_OPT_REMOVE_PATH => 'optional',
                     PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                     PCLZIP_OPT_ADD_PATH => 'optional',
@@ -438,7 +438,7 @@ 
     // --------------------------------------------------------------------------------
     public function add($p_filelist)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Reset the error handler
         $this->privErrorReset();
@@ -462,7 +462,7 @@ 
             // ----- Look for first arg
             if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
                 // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
                     PCLZIP_OPT_REMOVE_PATH => 'optional',
                     PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                     PCLZIP_OPT_ADD_PATH => 'optional',
@@ -525,7 +525,7 @@ 
             $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
         } else {
             // ----- Invalid variable type for $p_filelist
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
             return 0;
         }
 
@@ -612,7 +612,7 @@ 
     // --------------------------------------------------------------------------------
     public function listContent()
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Reset the error handler
         $this->privErrorReset();
@@ -668,7 +668,7 @@ 
     // --------------------------------------------------------------------------------
     public function extract()
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Reset the error handler
         $this->privErrorReset();
@@ -699,7 +699,7 @@ 
             // ----- Look for first arg
             if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
                 // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
                   PCLZIP_OPT_PATH => 'optional',
                   PCLZIP_OPT_REMOVE_PATH => 'optional',
                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
@@ -819,7 +819,7 @@ 
     //function extractByIndex($p_index, options...)
     public function extractByIndex($p_index)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Reset the error handler
         $this->privErrorReset();
@@ -921,9 +921,9 @@ 
         // ----- Trick
         // Here I want to reuse extractByRule(), so I need to parse the $p_index
         // with privParseOptions()
-        $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+        $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);
         $v_options_trick = array();
-        $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array (PCLZIP_OPT_BY_INDEX => 'optional'));
+        $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(PCLZIP_OPT_BY_INDEX => 'optional'));
         if ($v_result != 1) {
             return 0;
         }
@@ -962,7 +962,7 @@ 
     // --------------------------------------------------------------------------------
     public function delete()
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Reset the error handler
         $this->privErrorReset();
@@ -984,7 +984,7 @@ 
             $v_arg_list = func_get_args();
 
             // ----- Parse the options
-            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
                 PCLZIP_OPT_BY_NAME => 'optional',
                 PCLZIP_OPT_BY_EREG => 'optional',
                 PCLZIP_OPT_BY_PREG => 'optional',
@@ -1072,7 +1072,7 @@ 
                 $this->privSwapBackMagicQuotes();
 
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
 
                 // ----- Return
                 return 0;
@@ -1131,7 +1131,7 @@ 
             // TBC : Should also check the archive format
             if (!is_file($p_archive)) {
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
                 $v_result = PCLZIP_ERR_MISSING_FILE;
             } else {
                 // ----- Duplicate the archive
@@ -1253,7 +1253,7 @@ 
         }
 
         if ($p_with_code) {
-            return($v_value.' ('.$this->error_code.')');
+            return($v_value . ' (' . $this->error_code . ')');
         } else {
             return($v_value);
         }
@@ -1271,9 +1271,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 . "]");
             }
         }
     }
@@ -1315,14 +1315,14 @@ 
         // ----- Look if the file exits
         if (!is_file($this->zipname)) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
             return(false);
         }
 
         // ----- Check that the file is readeable
         if (!is_readable($this->zipname)) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
             return(false);
         }
 
@@ -1357,15 +1357,15 @@ 
     // --------------------------------------------------------------------------------
     public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Read the options
-        $i=0;
-        while ($i<$p_size) {
+        $i = 0;
+        while ($i < $p_size) {
             // ----- Check if the option is supported
             if (!isset($v_requested_options[$p_options_list[$i]])) {
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
                 // ----- Return
                 return PclZip::errorCode();
@@ -1378,48 +1378,48 @@ 
                 case PCLZIP_OPT_REMOVE_PATH:
                 case PCLZIP_OPT_ADD_PATH:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value
-                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
+                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
                     $i++;
                     break;
 
                 case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                    if (($i + 1) >= $p_size) {
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         return PclZip::errorCode();
                     }
 
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
                         return PclZip::errorCode();
                     }
 
                     // ----- Check the value
-                    $v_value = $p_options_list[$i+1];
-                    if ((!is_integer($v_value)) || ($v_value<0)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                    $v_value = $p_options_list[$i + 1];
+                    if ((!is_integer($v_value)) || ($v_value < 0)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value (and convert it in bytes)
-                    $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+                    $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
                     $i++;
                     break;
 
                 case PCLZIP_OPT_TEMP_FILE_ON:
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
                         return PclZip::errorCode();
                     }
 
@@ -1429,12 +1429,12 @@ 
                 case PCLZIP_OPT_TEMP_FILE_OFF:
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
                         return PclZip::errorCode();
                     }
                     // ----- Check for incompatible options
                     if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
                         return PclZip::errorCode();
                     }
                     $v_result_list[$p_options_list[$i]] = true;
@@ -1442,16 +1442,16 @@ 
 
                 case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value
-                    if (is_string($p_options_list[$i+1]) && ($p_options_list[$i+1] != '')) {
-                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
+                    if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
+                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
                         $i++;
                     } else {
                     }
@@ -1459,21 +1459,21 @@ 
                 // ----- Look for options that request an array of string for value
                 case PCLZIP_OPT_BY_NAME:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value
-                    if (is_string($p_options_list[$i+1])) {
-                            $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-                    } elseif (is_array($p_options_list[$i+1])) {
-                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    if (is_string($p_options_list[$i + 1])) {
+                            $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
@@ -1488,19 +1488,19 @@ 
                 case PCLZIP_OPT_BY_PREG:
                 //case PCLZIP_OPT_CRYPT :
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value
-                    if (is_string($p_options_list[$i+1])) {
-                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    if (is_string($p_options_list[$i + 1])) {
+                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
@@ -1512,20 +1512,20 @@ 
                 case PCLZIP_OPT_ADD_COMMENT:
                 case PCLZIP_OPT_PREPEND_COMMENT:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value
-                    if (is_string($p_options_list[$i+1])) {
-                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    if (is_string($p_options_list[$i + 1])) {
+                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" .PclZipUtilOptionText($p_options_list[$i]) ."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return PclZip::errorCode();
@@ -1536,9 +1536,9 @@ 
                 // ----- Look for options that request an array of index
                 case PCLZIP_OPT_BY_INDEX:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return PclZip::errorCode();
@@ -1546,19 +1546,19 @@ 
 
                     // ----- Get the value
                     $v_work_list = array();
-                    if (is_string($p_options_list[$i+1])) {
+                    if (is_string($p_options_list[$i + 1])) {
                         // ----- Remove spaces
-                        $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
 
                         // ----- 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];
-                    } elseif (is_array($p_options_list[$i+1])) {
-                            $v_work_list = $p_options_list[$i+1];
+                        $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];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                            $v_work_list = $p_options_list[$i + 1];
                     } else {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                         // ----- Return
                         return PclZip::errorCode();
@@ -1568,9 +1568,9 @@ 
                     // each index item in the list must be a couple with a start and
                     // an end value : [0,3], [5-5], [8-10], ...
                     // ----- Check the format of each item
-                    $v_sort_flag=false;
-                    $v_sort_value=0;
-                    for ($j=0; $j<sizeof($v_work_list); $j++) {
+                    $v_sort_flag = false;
+                    $v_sort_value = 0;
+                    for ($j = 0; $j < sizeof($v_work_list); $j++) {
                         // ----- Explode the item
                         $v_item_list = explode("-", $v_work_list[$j]);
                         $v_size_item_list = sizeof($v_item_list);
@@ -1589,7 +1589,7 @@ 
                             $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
                         } else {
                             // ----- Error log
-                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                             // ----- Return
                             return PclZip::errorCode();
@@ -1598,11 +1598,11 @@ 
 
                         // ----- Look for list sort
                         if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                            $v_sort_flag=true;
+                            $v_sort_flag = true;
 
                             // ----- TBC : An automatic sort should be writen ...
                             // ----- Error log
-                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                             // ----- Return
                             return PclZip::errorCode();
@@ -1629,14 +1629,14 @@ 
                 // ----- Look for options that request an octal value
                 case PCLZIP_OPT_SET_CHMOD:
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
                     // ----- Get the value
-                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
                     $i++;
                     break;
 
@@ -1652,20 +1652,20 @@ 
                 case PCLZIP_CB_POST_LIST :
                 */
                     // ----- Check the number of parameters
-                    if (($i+1) >= $p_size) {
+                    if (($i + 1) >= $p_size) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
 
                     // ----- Get the value
-                    $v_function_name = $p_options_list[$i+1];
+                    $v_function_name = $p_options_list[$i + 1];
 
                     // ----- Check that the value is a valid existing function
                     if (!function_exists($v_function_name)) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
                         // ----- Return
                         return PclZip::errorCode();
                     }
@@ -1676,7 +1676,7 @@ 
                     break;
                 default:
                     // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" .$p_options_list[$i]."'");
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
 
                     // ----- Return
                     return PclZip::errorCode();
@@ -1688,13 +1688,13 @@ 
 
         // ----- Look for mandatory options
         if ($v_requested_options !== false) {
-            for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+            for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
                 // ----- Look for mandatory option
                 if ($v_requested_options[$key] == 'mandatory') {
                     // ----- Look if present
                     if (!isset($v_result_list[$key])) {
                         // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
 
                         // ----- Return
                         return PclZip::errorCode();
@@ -1720,7 +1720,7 @@ 
     // --------------------------------------------------------------------------------
     public function privOptionDefaultThreshold(&$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
             return $v_result;
@@ -1733,17 +1733,17 @@ 
 
         if ($last == 'g') {
             //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-            $v_memory_limit = $v_memory_limit*1073741824;
+            $v_memory_limit = $v_memory_limit * 1073741824;
         }
         if ($last == 'm') {
             //$v_memory_limit = $v_memory_limit*1024*1024;
-            $v_memory_limit = $v_memory_limit*1048576;
+            $v_memory_limit = $v_memory_limit * 1048576;
         }
         if ($last == 'k') {
-            $v_memory_limit = $v_memory_limit*1024;
+            $v_memory_limit = $v_memory_limit * 1024;
         }
 
-        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
 
         // ----- Sanity check : No threshold if value lower than 1M
         if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
@@ -1765,14 +1765,14 @@ 
     // --------------------------------------------------------------------------------
     public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- For each file in the list check the attributes
         foreach ($p_file_list as $v_key => $v_value) {
             // ----- Check if the option is supported
             if (!isset($v_requested_options[$v_key])) {
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
                 // ----- Return
                 return PclZip::errorCode();
@@ -1782,54 +1782,54 @@ 
             switch ($v_key) {
                 case PCLZIP_ATT_FILE_NAME:
                     if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
 
                     $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
 
                     if ($p_filedescr['filename'] == '') {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
                     break;
                 case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
                     if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
 
                     $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
 
                     if ($p_filedescr['new_short_name'] == '') {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
                     break;
                 case PCLZIP_ATT_FILE_NEW_FULL_NAME:
                     if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
 
                     $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
 
                     if ($p_filedescr['new_full_name'] == '') {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
                     break;
                 // ----- Look for options that takes a string
                 case PCLZIP_ATT_FILE_COMMENT:
                     if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
                     $p_filedescr['comment'] = $v_value;
                     break;
                 case PCLZIP_ATT_FILE_MTIME:
                     if (!is_integer($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
                         return PclZip::errorCode();
                     }
                     $p_filedescr['mtime'] = $v_value;
@@ -1839,7 +1839,7 @@ 
                     break;
                 default:
                     // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '".$v_key."'");
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
 
                     // ----- Return
                     return PclZip::errorCode();
@@ -1852,7 +1852,7 @@ 
                     if ($v_requested_options[$key] == 'mandatory') {
                         // ----- Look if present
                         if (!isset($p_file_list[$key])) {
-                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
                             return PclZip::errorCode();
                         }
                     }
@@ -1881,13 +1881,13 @@ 
     // --------------------------------------------------------------------------------
     public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Create a result list
         $v_result_list = array();
 
         // ----- Look each entry
-        for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+        for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
             // ----- Get filedescr
             $v_descr = $p_filedescr_list[$i];
 
@@ -1914,7 +1914,7 @@ 
             } else {
                 // ----- Missing file
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
 
                 // ----- Return
                 return PclZip::errorCode();
@@ -1939,7 +1939,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
@@ -1947,7 +1947,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;
                             }
@@ -1992,7 +1992,7 @@ 
     // --------------------------------------------------------------------------------
     public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
         $v_list_detail = array();
 
         // ----- Magic quotes trick
@@ -2026,7 +2026,7 @@ 
     // --------------------------------------------------------------------------------
     public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
         $v_list_detail = array();
 
         // ----- Look if the archive exists or is empty
@@ -2041,7 +2041,7 @@ 
         $this->privDisableMagicQuotes();
 
         // ----- Open the zip file
-        if (($v_result=$this->privOpenFd('rb')) != 1) {
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
             // ----- Magic quotes trick
             $this->privSwapBackMagicQuotes();
 
@@ -2061,14 +2061,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();
 
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
 
             // ----- Return
             return PclZip::errorCode();
@@ -2116,7 +2116,7 @@ 
         }
 
         // ----- Create the Central Dir files header
-        for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if ($v_header_list[$i]['status'] == 'ok') {
                 if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
@@ -2141,17 +2141,17 @@ 
             $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
-        $v_size = @ftell($this->zip_fd)-$v_offset;
+        $v_size = @ftell($this->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
-        if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+        if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
             // ----- Reset the file list
             unset($v_header_list);
             $this->privSwapBackMagicQuotes();
@@ -2195,12 +2195,12 @@ 
     // --------------------------------------------------------------------------------
     public function privOpenFd($p_mode)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Look if already open
         if ($this->zip_fd != 0) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
 
             // ----- Return
             return PclZip::errorCode();
@@ -2209,7 +2209,7 @@ 
         // ----- Open the zip file
         if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
 
             // ----- Return
             return PclZip::errorCode();
@@ -2227,7 +2227,7 @@ 
     // --------------------------------------------------------------------------------
     public function privCloseFd()
     {
-        $v_result=1;
+        $v_result = 1;
 
         if ($this->zip_fd != 0) {
             @fclose($this->zip_fd);
@@ -2255,7 +2255,7 @@ 
     //    public function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
     public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Add the files
         $v_header_list = array();
@@ -2268,7 +2268,7 @@ 
         $v_offset = @ftell($this->zip_fd);
 
         // ----- Create the Central Dir files header
-        for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if ($v_header_list[$i]['status'] == 'ok') {
                 if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
@@ -2289,7 +2289,7 @@ 
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($this->zip_fd)-$v_offset;
+        $v_size = @ftell($this->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
@@ -2316,14 +2316,14 @@ 
     // --------------------------------------------------------------------------------
     public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
         $v_header = array();
 
         // ----- Recuperate the current number of elt in list
         $v_nb = sizeof($p_result_list);
 
         // ----- Loop on the files
-        for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+        for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
             // ----- Format the filename
             $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
 
@@ -2335,7 +2335,7 @@ 
 
             // ----- Check the filename
             if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
-                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
                 return PclZip::errorCode();
             }
 
@@ -2368,7 +2368,7 @@ 
     // --------------------------------------------------------------------------------
     public function privAddFile($p_filedescr, &$p_header, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Working variable
         $p_filename = $p_filedescr['filename'];
@@ -2413,10 +2413,10 @@ 
         $p_header['index'] = -1;
 
         // ----- Look for regular file
-        if ($p_filedescr['type']=='file') {
+        if ($p_filedescr['type'] == 'file') {
             $p_header['external'] = 0x00000000;
             $p_header['size'] = filesize($p_filename);
-        } elseif ($p_filedescr['type']=='folder') {
+        } elseif ($p_filedescr['type'] == 'folder') {
             // ----- Look for regular folder
             $p_header['external'] = 0x00000010;
             $p_header['mtime'] = filemtime($p_filename);
@@ -2570,7 +2570,7 @@ 
                 // ----- Set the file properties
                 $p_header['size'] = 0;
                 //$p_header['external'] = 0x41FF0010;     // Value for a folder : to be checked
-                $p_header['external'] = 0x00000010;     // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
                 // ----- Call the header generation
                 if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
@@ -2612,7 +2612,7 @@ 
     // --------------------------------------------------------------------------------
     public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
     {
-        $v_result=PCLZIP_ERR_NO_ERROR;
+        $v_result = PCLZIP_ERR_NO_ERROR;
 
         // ----- Working variable
         $p_filename = $p_filedescr['filename'];
@@ -2625,10 +2625,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);
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
             return PclZip::errorCode();
         }
 
@@ -2648,13 +2648,13 @@ 
 
         // ----- Check the minimum file size
         if (filesize($v_gzip_temp_name) < 18) {
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
             return PclZip::errorCode();
         }
 
         // ----- Extract the compressed attributes
         if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
             return PclZip::errorCode();
         }
 
@@ -2666,7 +2666,7 @@ 
         $v_data_header['os'] = bin2hex($v_data_header['os']);
 
         // ----- Read the gzip file footer
-        @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+        @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
         $v_binary_data = @fread($v_file_compressed, 8);
         $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
@@ -2674,7 +2674,7 @@ 
         $p_header['compression'] = ord($v_data_header['cm']);
         //$p_header['mtime'] = $v_data_header['mtime'];
         $p_header['crc'] = $v_data_footer['crc'];
-        $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+        $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
 
         // ----- Close the file
         @fclose($v_file_compressed);
@@ -2686,7 +2686,7 @@ 
 
         // ----- Add the compressed data
         if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
             return PclZip::errorCode();
         }
 
@@ -2722,7 +2722,7 @@ 
     // --------------------------------------------------------------------------------
     public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Working variables
         $p_filename = $p_filedescr['filename'];
@@ -2754,9 +2754,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;
@@ -2773,7 +2773,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);
@@ -2796,9 +2796,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;
                 }
             }
         }
@@ -2820,15 +2820,15 @@ 
     // --------------------------------------------------------------------------------
     public function privWriteFileHeader(&$p_header)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Store the offset position of the file
         $p_header['offset'] = ftell($this->zip_fd);
 
         // ----- Transform UNIX mtime to DOS format mdate/mtime
         $v_date = getdate($p_header['mtime']);
-        $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-        $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
         // ----- Packed data
         $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
@@ -2857,7 +2857,7 @@ 
     // --------------------------------------------------------------------------------
     public function privWriteCentralFileHeader(&$p_header)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // TBC
         //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -2865,8 +2865,8 @@ 
 
         // ----- Transform UNIX mtime to DOS format mdate/mtime
         $v_date = getdate($p_header['mtime']);
-        $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-        $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
 
         // ----- Packed data
@@ -2936,7 +2936,7 @@ 
             $this->privSwapBackMagicQuotes();
 
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
 
             // ----- Return
             return PclZip::errorCode();
@@ -2962,7 +2962,7 @@ 
         }
 
         // ----- Read each entry
-        for ($i=0; $i<$v_central_dir['entries']; $i++) {
+        for ($i = 0; $i < $v_central_dir['entries']; $i++) {
             // ----- Read the file header
             if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
                 $this->privSwapBackMagicQuotes();
@@ -3007,7 +3007,7 @@ 
     // --------------------------------------------------------------------------------
     public function privConvertHeader2FileInfo($p_header, &$p_info)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Get the interesting attributes
         $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
@@ -3018,7 +3018,7 @@ 
         $p_info['compressed_size'] = $p_header['compressed_size'];
         $p_info['mtime'] = $p_header['mtime'];
         $p_info['comment'] = $p_header['comment'];
-        $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+        $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
         $p_info['index'] = $p_header['index'];
         $p_info['status'] = $p_header['status'];
         $p_info['crc'] = $p_header['crc'];
@@ -3046,21 +3046,21 @@ 
     // --------------------------------------------------------------------------------
     public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Magic quotes trick
         $this->privDisableMagicQuotes();
 
         // ----- 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;
+        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
+            $p_path = "./" . $p_path;
         }
 
         // ----- Reduce the path last (and duplicated) '/'
         if (($p_path != "./") && ($p_path != "/")) {
             // ----- Look for the path end '/'
             while (substr($p_path, -1) == "/") {
-                $p_path = substr($p_path, 0, strlen($p_path)-1);
+                $p_path = substr($p_path, 0, strlen($p_path) - 1);
             }
         }
 
@@ -3091,7 +3091,7 @@ 
 
         // ----- Read each entry
         $j_start = 0;
-        for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
             // ----- Read next Central dir entry
             @rewind($this->zip_fd);
             if (@fseek($this->zip_fd, $v_pos_entry)) {
@@ -3128,7 +3128,7 @@ 
             // ----- Look for extract by name rule
             if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
                 // ----- Look if the filename is in the list
-                for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
                     // ----- Look for a directory
                     if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
                         // ----- Look if the directory is in the filename path
@@ -3148,15 +3148,15 @@ 
             } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
                 // ----- Look for extract by index rule
                 // ----- Look if the index is in the list
-                for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-                    if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                             $v_extract = true;
                     }
-                    if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                            $j_start = $j+1;
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                            $j_start = $j + 1;
                     }
 
-                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                         break;
                     }
                 }
@@ -3173,7 +3173,7 @@ 
                 if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
                     $this->privSwapBackMagicQuotes();
 
-                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '".$v_header['stored_filename']."' is compressed by an unsupported compression method (".$v_header['compression'].") ");
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is compressed by an unsupported compression method (" . $v_header['compression'] . ") ");
 
                     return PclZip::errorCode();
                 }
@@ -3186,7 +3186,7 @@ 
                 if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
                     $this->privSwapBackMagicQuotes();
 
-                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for  filename '".$v_header['stored_filename']."'");
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for  filename '" . $v_header['stored_filename'] . "'");
 
                     return PclZip::errorCode();
                 }
@@ -3320,7 +3320,7 @@ 
     // --------------------------------------------------------------------------------
     public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Read the file header
         if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -3337,7 +3337,7 @@ 
         // ----- Look for all path to remove
         if ($p_remove_all_path == true) {
             // ----- Look for folder entry that not need to be extracted
-            if (($p_entry['external']&0x00000010)==0x00000010) {
+            if (($p_entry['external'] & 0x00000010) == 0x00000010) {
                 $p_entry['status'] = "filtered";
 
                 return $v_result;
@@ -3364,14 +3364,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) {
-                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '".$p_entry['filename']."' is outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
                 return PclZip::errorCode();
             }
@@ -3418,8 +3418,8 @@ 
                     // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
                     // 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)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '".$p_entry['filename']."' is already used by an existing directory");
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is already used by an existing directory");
                         return PclZip::errorCode();
                     }
                 } elseif (!is_writeable($p_entry['filename'])) {
@@ -3431,7 +3431,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)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '".$p_entry['filename']."' exists and is write protected");
+                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists and is write protected");
                         return PclZip::errorCode();
                     }
                 } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
@@ -3445,7 +3445,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)) {
-                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '".$p_entry['filename']."' exists and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists and option PCLZIP_OPT_REPLACE_NEWER is not selected");
                             return PclZip::errorCode();
                         }
                     }
@@ -3453,7 +3453,7 @@ 
                 }
             } else {
                 // ----- Check the directory availability and create it if necessary
-                if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+                if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
                     $v_dir_to_check = $p_entry['filename'];
                 } elseif (!strstr($p_entry['filename'], "/")) {
                     $v_dir_to_check = "";
@@ -3461,7 +3461,7 @@ 
                     $v_dir_to_check = dirname($p_entry['filename']);
                 }
 
-                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
                     // ----- Change the file status
                     $p_entry['status'] = "path_creation_fail";
 
@@ -3475,7 +3475,7 @@ 
         // ----- Look if extraction should be done
         if ($p_entry['status'] == 'ok') {
             // ----- Do the extraction (if not a folder)
-            if (!(($p_entry['external']&0x00000010) == 0x00000010)) {
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
                 // ----- Look for not compressed file
                 if ($p_entry['compression'] == 0) {
                     // ----- Opening destination file
@@ -3509,7 +3509,7 @@ 
                     // ----- TBC
                     // Need to be finished
                     if (($p_entry['flag'] & 1) == 1) {
-                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
                         return PclZip::errorCode();
                     }
 
@@ -3597,13 +3597,13 @@ 
     // --------------------------------------------------------------------------------
     public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
     {
-        $v_result=1;
+        $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);
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
             return PclZip::errorCode();
         }
 
@@ -3638,7 +3638,7 @@ 
         if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
             @fclose($v_dest_file);
             $p_entry['status'] = "read_error";
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
             return PclZip::errorCode();
         }
 
@@ -3670,7 +3670,7 @@ 
     // --------------------------------------------------------------------------------
     public function privExtractFileInOutput(&$p_entry, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Read the file header
         if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -3716,7 +3716,7 @@ 
         // ----- Look if extraction should be done
         if ($p_entry['status'] == 'ok') {
             // ----- Do the extraction (if not a folder)
-            if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
                 // ----- Look for not compressed file
                 if ($p_entry['compressed_size'] == $p_entry['size']) {
                     // ----- Read the file in a buffer (one shot)
@@ -3774,7 +3774,7 @@ 
     // --------------------------------------------------------------------------------
     public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Read the file header
         $v_header = array();
@@ -3820,7 +3820,7 @@ 
         // ----- Look if extraction should be done
         if ($p_entry['status'] == 'ok') {
             // ----- Do the extraction (if not a folder)
-            if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
                 // ----- Look for not compressed file
     //            if ($p_entry['compressed_size'] == $p_entry['size'])
                 if ($p_entry['compression'] == 0) {
@@ -3883,7 +3883,7 @@ 
     // --------------------------------------------------------------------------------
     public function privReadFileHeader(&$p_header)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Read the 4 bytes signature
         $v_binary_data = @fread($this->zip_fd, 4);
@@ -3907,7 +3907,7 @@ 
             $p_header['status'] = "invalid_header";
 
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
 
             // ----- Return
             return PclZip::errorCode();
@@ -3942,7 +3942,7 @@ 
             // ----- Extract time
             $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
             $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-            $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
             // ----- Extract date
             $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4002,7 +4002,7 @@ 
             $p_header['status'] = "invalid_header";
 
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
 
             // ----- Return
             return PclZip::errorCode();
@@ -4041,7 +4041,7 @@ 
             // ----- Extract time
             $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
             $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-            $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
             // ----- Extract date
             $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4082,7 +4082,7 @@ 
     // --------------------------------------------------------------------------------
     public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Check the static values
         // TBC
@@ -4119,14 +4119,14 @@ 
     // --------------------------------------------------------------------------------
     public function privReadEndCentralDir(&$p_central_dir)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Go to the end of the zip file
         $v_size = filesize($this->zipname);
         @fseek($this->zip_fd, $v_size);
         if (@ftell($this->zip_fd) != $v_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
 
             // ----- Return
             return PclZip::errorCode();
@@ -4136,10 +4136,10 @@ 
         // in this case the end of central dir is at 22 bytes of the file end
         $v_found = 0;
         if ($v_size > 26) {
-            @fseek($this->zip_fd, $v_size-22);
-            if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22)) {
+            @fseek($this->zip_fd, $v_size - 22);
+            if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
 
                 // ----- Return
                 return PclZip::errorCode();
@@ -4163,10 +4163,10 @@ 
             if ($v_maximum_size > $v_size) {
                 $v_maximum_size = $v_size;
             }
-            @fseek($this->zip_fd, $v_size-$v_maximum_size);
-            if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size)) {
+            @fseek($this->zip_fd, $v_size - $v_maximum_size);
+            if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
 
                 // ----- Return
                 return PclZip::errorCode();
@@ -4210,7 +4210,7 @@ 
         // ----- Look for invalid block size
         if (strlen($v_binary_data) != 18) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
 
             // ----- Return
             return PclZip::errorCode();
@@ -4265,11 +4265,11 @@ 
     // --------------------------------------------------------------------------------
     public function privDeleteByRule(&$p_result_list, &$p_options)
     {
-        $v_result=1;
+        $v_result = 1;
         $v_list_detail = array();
 
         // ----- Open the zip file
-        if (($v_result=$this->privOpenFd('rb')) != 1) {
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
             // ----- Return
             return $v_result;
         }
@@ -4302,7 +4302,7 @@ 
         // ----- Read each entry
         $v_header_list = array();
         $j_start = 0;
-        for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
             // ----- Read the file header
             $v_header_list[$v_nb_extracted] = array();
             if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
@@ -4322,13 +4322,13 @@ 
             // ----- Look for extract by name rule
             if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
                 // ----- Look if the filename is in the list
-                for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
                     // ----- Look for a directory
                     if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
                         // ----- 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]) {
@@ -4344,14 +4344,14 @@ 
             } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
                 // ----- Look for extract by index rule
                 // ----- Look if the index is in the list
-                for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-                    if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                         $v_found = true;
                     }
-                    if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                        $j_start = $j+1;
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
                     }
-                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                         break;
                     }
                 }
@@ -4370,7 +4370,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 PclZip($v_zip_temp_name);
@@ -4384,7 +4384,7 @@ 
             }
 
             // ----- Look which file need to be kept
-            for ($i=0; $i<sizeof($v_header_list); $i++) {
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
                 // ----- Calculate the position of the header
                 @rewind($this->zip_fd);
                 if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
@@ -4445,7 +4445,7 @@ 
             $v_offset = @ftell($v_temp_zip->zip_fd);
 
             // ----- Re-Create the Central Dir files header
-            for ($i=0; $i<sizeof($v_header_list); $i++) {
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
                 // ----- Create the file header
                 if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                     $v_temp_zip->privCloseFd();
@@ -4468,7 +4468,7 @@ 
             }
 
             // ----- Calculate the size of the central header
-            $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+            $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
 
             // ----- Create the central dir footer
             if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
@@ -4533,8 +4533,8 @@ 
         $v_result = 1;
 
         // ----- Remove the final '/'
-        if (($p_is_dir) && (substr($p_dir, -1)=='/')) {
-            $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+        if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
+            $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
         }
 
         // ----- Check the directory availability
@@ -4578,7 +4578,7 @@ 
     // --------------------------------------------------------------------------------
     public function privMerge(&$p_archive_to_add)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Look if the archive_to_add exists
         if (!is_file($p_archive_to_add->zipname)) {
@@ -4599,7 +4599,7 @@ 
         }
 
         // ----- Open the zip file
-        if (($v_result=$this->privOpenFd('rb')) != 1) {
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
             // ----- Return
             return $v_result;
         }
@@ -4615,7 +4615,7 @@ 
         @rewind($this->zip_fd);
 
         // ----- Open the archive_to_add file
-        if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1) {
+        if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
             $this->privCloseFd();
 
             // ----- Return
@@ -4635,14 +4635,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();
 
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
 
             // ----- Return
             return PclZip::errorCode();
@@ -4689,10 +4689,10 @@ 
         }
 
         // ----- 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;
+        $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
         // ----- Swap the file descriptor
         // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -4702,7 +4702,7 @@ 
         $v_zip_temp_fd = $v_swap;
 
         // ----- Create the central dir footer
-        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
             $this->privCloseFd();
             $p_archive_to_add->privCloseFd();
             @fclose($v_zip_temp_fd);
@@ -4749,7 +4749,7 @@ 
     // --------------------------------------------------------------------------------
     public function privDuplicate($p_archive_filename)
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Look if the $p_archive_filename exists
         if (!is_file($p_archive_filename)) {
@@ -4761,7 +4761,7 @@ 
         }
 
         // ----- Open the zip file
-        if (($v_result=$this->privOpenFd('wb')) != 1) {
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
             // ----- Return
             return $v_result;
         }
@@ -4770,7 +4770,7 @@ 
         if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
             $this->privCloseFd();
 
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
 
             // ----- Return
             return PclZip::errorCode();
@@ -4837,7 +4837,7 @@ 
     // --------------------------------------------------------------------------------
     public function privDisableMagicQuotes()
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Look if function exists
         if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
@@ -4870,7 +4870,7 @@ 
     // --------------------------------------------------------------------------------
     public function privSwapBackMagicQuotes()
     {
-        $v_result=1;
+        $v_result = 1;
 
         // ----- Look if function exists
         if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
@@ -4912,7 +4912,7 @@ 
 
         // ----- Study directories from last to first
         $v_skip = 0;
-        for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+        for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
             // ----- Look for current path
             if ($v_list[$i] == ".") {
                 // ----- Ignore this directory
@@ -4922,14 +4922,14 @@ 
             } 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
                         $v_result = $p_dir;
                         $v_skip = 0;
                     }
-                } elseif ($i == (sizeof($v_list)-1)) {
+                } elseif ($i == (sizeof($v_list) - 1)) {
                     // ----- Last '/' i.e. indicates a directory
                     $v_result = $v_list[$i];
                 } else {
@@ -4942,7 +4942,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 : "");
                 }
             }
         }
@@ -4950,7 +4950,7 @@ 
         // ----- Look for skip
         if ($v_skip > 0) {
             while ($v_skip > 0) {
-                $v_result = '../'.$v_result;
+                $v_result = '../' . $v_result;
                 $v_skip--;
             }
         }
@@ -4981,11 +4981,11 @@ 
     $v_result = 1;
 
     // ----- 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);
+    if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+        $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);
+    if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
@@ -5057,28 +5057,28 @@ 
 {
     $v_result = 1;
 
-    if ($p_mode==0) {
+    if ($p_mode == 0) {
         while ($p_size != 0) {
             $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
             $v_buffer = @fread($p_src, $v_read_size);
             @fwrite($p_dest, $v_buffer, $v_read_size);
             $p_size -= $v_read_size;
         }
-    } elseif ($p_mode==1) {
+    } elseif ($p_mode == 1) {
         while ($p_size != 0) {
             $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
             $v_buffer = @gzread($p_src, $v_read_size);
             @fwrite($p_dest, $v_buffer, $v_read_size);
             $p_size -= $v_read_size;
         }
-    } elseif ($p_mode==2) {
+    } elseif ($p_mode == 2) {
         while ($p_size != 0) {
             $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
             $v_buffer = @fread($p_src, $v_read_size);
             @gzwrite($p_dest, $v_buffer, $v_read_size);
             $p_size -= $v_read_size;
         }
-    } elseif ($p_mode==3) {
+    } elseif ($p_mode == 3) {
         while ($p_size != 0) {
             $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
             $v_buffer = @gzread($p_src, $v_read_size);
@@ -5164,7 +5164,7 @@ 
     if (stristr(php_uname(), 'windows')) {
         // ----- Look for potential disk letter
         if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-            $p_path = substr($p_path, $v_position+1);
+            $p_path = substr($p_path, $v_position + 1);
         }
         // ----- Change potential windows directory separator
         if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {

src/PhpSpreadsheet/Shared/TimeZone.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
     /**
      *    Return the Timezone transition for the specified timezone and timestamp
      *
-     *    @param        DateTimeZone         $objTimezone    The timezone for finding the transitions
+     *    @param        \DateTimeZone         $objTimezone    The timezone for finding the transitions
      *    @param        integer                 $timestamp        PHP date/time value for finding the current transition
      *    @return         array                The current transition details
      */

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * @private
      * @var    string
      */
-    protected static $timezone    = 'UTC';
+    protected static $timezone = 'UTC';
 
     /**
      * Validate a Timezone name

src/PhpSpreadsheet/Shared/Trend/BestFit.php

Doc Comments +11 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
      * Return the Y-Value for a specified value of X
      *
      * @param     float        $xValue            X-Value
-     * @return     float                        Y-Value
+     * @return     boolean                        Y-Value
      */
     public function getValueOfYForX($xValue)
     {
@@ -133,7 +133,7 @@ 
      * Return the X-Value for a specified value of Y
      *
      * @param     float        $yValue            Y-Value
-     * @return     float                        X-Value
+     * @return     boolean                        X-Value
      */
     public function getValueOfXForY($yValue)
     {
@@ -154,7 +154,7 @@ 
      * Return the Equation of the best-fit line
      *
      * @param     int        $dp        Number of places of decimal precision to display
-     * @return     string
+     * @return     boolean
      */
     public function getEquation($dp = 0)
     {
@@ -306,6 +306,9 @@ 
         return $this->yBestFitValues;
     }
 
+    /**
+     * @param double $sumY2
+     */
     protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const)
     {
         $SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
@@ -360,6 +363,11 @@ 
         }
     }
 
+    /**
+     * @param double[] $yValues
+     * @param double[] $xValues
+     * @param boolean $const
+     */
     protected function leastSquareFit($yValues, $xValues, $const)
     {
         // calculate sums

src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php

Doc Comments +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
      * Return the Slope of the line
      *
      * @param     int        $dp        Number of places of decimal precision to display
-     * @return     string
+     * @return     double
      **/
     public function getSlope($dp = 0)
     {
@@ -91,7 +91,7 @@ 
      * Return the Value of X where it intersects Y = 0
      *
      * @param     int        $dp        Number of places of decimal precision to display
-     * @return     string
+     * @return     double
      **/
     public function getIntersect($dp = 0)
     {

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      *
      * @var    string
      **/
-    protected $bestFitType        = 'exponential';
+    protected $bestFitType = 'exponential';
 
     /**
      * Return the Y-Value for a specified value of X

src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
      * Return the Value of X where it intersects Y = 0
      *
      * @param     int        $dp        Number of places of decimal precision to display
-     * @return     string
+     * @return     double
      **/
     public function getIntersect($dp = 0)
     {

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      *
      * @var    string
      **/
-    protected $bestFitType        = 'power';
+    protected $bestFitType = 'power';
 
 
     /**

src/PhpSpreadsheet/Shared/XMLWriter.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      * Fallback method for writeRaw, introduced in PHP 5.2
      *
      * @param string $text
-     * @return string
+     * @return boolean
      */
     public function writeRawData($text)
     {

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      *
      * @var string
      */
-    private $tempFileName  = '';
+    private $tempFileName = '';
 
     /**
      * Create a new XMLWriter instance