Inspection of "Merge branch 'feature/gh-7' into develop" - PHPOffice/PhpSpreadsheet - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( bf3457...467bab )

unknown

created 2016-08-14 23:21 UTC

Status

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -674,7 +674,7 @@
 block discarded – undo
             list($row1, $col1) = $this->cellToPackedRowcol($cell1);
             list($row2, $col2) = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
-             list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
+                list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
         }
 
         // The ptg value depends on the class of the ptg.

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Worksheet.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -1019,8 +1019,8 @@  discard block
 block discarded – undo
 
         // Write the packed data
         $this->append($header . $data .
-                       $unknown1 . $options .
-                       $unknown2 . $url_len . $url);
+                        $unknown1 . $options .
+                        $unknown2 . $url_len . $url);
         return 0;
     }
 
@@ -1068,8 +1068,8 @@  discard block
 block discarded – undo
 
         // Write the packed data
         $this->append($header . $data .
-                       $unknown1 . $options .
-                       $url_len . $url);
+                        $unknown1 . $options .
+                        $url_len . $url);
         return 0;
     }
 
@@ -1151,14 +1151,14 @@  discard block
 block discarded – undo
 
         // Pack the main data stream
         $data        = pack("vvvv", $row1, $row2, $col1, $col2) .
-                          $unknown1     .
-                          $link_type    .
-                          $unknown2     .
-                          $up_count     .
-                          $dir_short_len.
-                          $dir_short    .
-                          $unknown3     .
-                          $stream_len   ;/*.
+                            $unknown1     .
+                            $link_type    .
+                            $unknown2     .
+                            $up_count     .
+                            $dir_short_len.
+                            $dir_short    .
+                            $unknown3     .
+                            $stream_len   ;/*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel2007.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -139,8 +139,8 @@
 block discarded – undo
         }
 
         $hashTablesArray = array( 'stylesConditionalHashTable',    'fillHashTable',        'fontHashTable',
-                                  'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
-                                  'styleHashTable'
+                                    'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
+                                    'styleHashTable'
                                 );
 
         // Set HashTable variables

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5.php 1 patch

Indentation +80 added lines, -80 removed lines patch added patch discarded remove patch

@@ -567,49 +567,49 @@  discard block
 block discarded – undo
 
         // GKPIDDSI_CODEPAGE: CodePage
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-                               'data'    => array('data' => 1252));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+                                'data'    => array('data' => 1252));
         $dataSection_NumProps++;
 
         // GKPIDDSI_CATEGORY : Category
         if ($this->phpExcel->getProperties()->getCategory()) {
             $dataProp = $this->phpExcel->getProperties()->getCategory();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E),
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E),
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         // GKPIDDSI_VERSION :Version of the application that wrote the property storage
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x03),
-                               'data'    => array('pack' => 'V', 'data' => 0x000C0000));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x03),
+                                'data'    => array('pack' => 'V', 'data' => 0x000C0000));
         $dataSection_NumProps++;
         // GKPIDDSI_SCALE : FALSE
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
         // GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
         // GKPIDDSI_SHAREDOC : FALSE
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
         // GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
 
         // GKPIDDSI_DOCSPARTS
@@ -619,50 +619,50 @@  discard block
 block discarded – undo
         $dataProp = pack('v', 0x0001);
         $dataProp .= pack('v', 0x0000);
         // array of UnalignedLpstr
-          // cch
-          $dataProp .= pack('v', 0x000A);
-          $dataProp .= pack('v', 0x0000);
-          // value
-          $dataProp .= 'Worksheet'.chr(0);
+            // cch
+            $dataProp .= pack('v', 0x000A);
+            $dataProp .= pack('v', 0x0000);
+            // value
+            $dataProp .= 'Worksheet'.chr(0);
 
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x101E),
-                               'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x101E),
+                                'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
         $dataSection_NumProps++;
 
         // GKPIDDSI_HEADINGPAIR
         // VtVecHeadingPairValue
-          // cElements
-          $dataProp = pack('v', 0x0002);
-          $dataProp .= pack('v', 0x0000);
-          // Array of vtHeadingPair
+            // cElements
+            $dataProp = pack('v', 0x0002);
+            $dataProp .= pack('v', 0x0000);
+            // Array of vtHeadingPair
             // vtUnalignedString - headingString
-              // stringType
-              $dataProp .= pack('v', 0x001E);
-              // padding
-              $dataProp .= pack('v', 0x0000);
-              // UnalignedLpstr
+                // stringType
+                $dataProp .= pack('v', 0x001E);
+                // padding
+                $dataProp .= pack('v', 0x0000);
+                // UnalignedLpstr
                 // cch
                 $dataProp .= pack('v', 0x0013);
                 $dataProp .= pack('v', 0x0000);
                 // value
                 $dataProp .= 'Feuilles de calcul';
             // vtUnalignedString - headingParts
-              // wType : 0x0003 = 32 bit signed integer
-              $dataProp .= pack('v', 0x0300);
-              // padding
-              $dataProp .= pack('v', 0x0000);
-              // value
-              $dataProp .= pack('v', 0x0100);
-              $dataProp .= pack('v', 0x0000);
-              $dataProp .= pack('v', 0x0000);
-              $dataProp .= pack('v', 0x0000);
+                // wType : 0x0003 = 32 bit signed integer
+                $dataProp .= pack('v', 0x0300);
+                // padding
+                $dataProp .= pack('v', 0x0000);
+                // value
+                $dataProp .= pack('v', 0x0100);
+                $dataProp .= pack('v', 0x0000);
+                $dataProp .= pack('v', 0x0000);
+                $dataProp .= pack('v', 0x0000);
 
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x100C),
-                               'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x100C),
+                                'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
         $dataSection_NumProps++;
 
         //         4     Section Length
@@ -763,88 +763,88 @@  discard block
 block discarded – undo
 
         // CodePage : CP-1252
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-                               'data'    => array('data' => 1252));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+                                'data'    => array('data' => 1252));
         $dataSection_NumProps++;
 
         //    Title
         if ($this->phpExcel->getProperties()->getTitle()) {
             $dataProp = $this->phpExcel->getProperties()->getTitle();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Subject
         if ($this->phpExcel->getProperties()->getSubject()) {
             $dataProp = $this->phpExcel->getProperties()->getSubject();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Author (Creator)
         if ($this->phpExcel->getProperties()->getCreator()) {
             $dataProp = $this->phpExcel->getProperties()->getCreator();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Keywords
         if ($this->phpExcel->getProperties()->getKeywords()) {
             $dataProp = $this->phpExcel->getProperties()->getKeywords();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Comments (Description)
         if ($this->phpExcel->getProperties()->getDescription()) {
             $dataProp = $this->phpExcel->getProperties()->getDescription();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Last Saved By (LastModifiedBy)
         if ($this->phpExcel->getProperties()->getLastModifiedBy()) {
             $dataProp = $this->phpExcel->getProperties()->getLastModifiedBy();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Created Date/Time
         if ($this->phpExcel->getProperties()->getCreated()) {
             $dataProp = $this->phpExcel->getProperties()->getCreated();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                                   'data'    => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                                    'data'    => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
             $dataSection_NumProps++;
         }
         //    Modified Date/Time
         if ($this->phpExcel->getProperties()->getModified()) {
             $dataProp = $this->phpExcel->getProperties()->getModified();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                                   'data'    => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                                    'data'    => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
             $dataSection_NumProps++;
         }
         //    Security
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
-                               'data'    => array('data' => 0x00));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
+                                'data'    => array('data' => 0x00));
         $dataSection_NumProps++;
 
 

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel2007/Drawing.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -583,7 +583,7 @@
 block discarded – undo
             while ($iterator->valid()) {
                 $aDrawings[] = $iterator->current();
 
-                  $iterator->next();
+                    $iterator->next();
             }
         }
 

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel2007/Comments.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -48,12 +48,12 @@  discard block
 block discarded – undo
         // XML header
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
-          // Comments cache
-          $comments    = $pWorksheet->getComments();
+            // Comments cache
+            $comments    = $pWorksheet->getComments();
 
-          // Authors cache
-          $authors    = array();
-          $authorId    = 0;
+            // Authors cache
+            $authors    = array();
+            $authorId    = 0;
         foreach ($comments as $comment) {
             if (!isset($authors[$comment->getAuthor()])) {
                 $authors[$comment->getAuthor()] = $authorId++;
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
         // XML header
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
-          // Comments cache
-          $comments    = $pWorksheet->getComments();
+            // Comments cache
+            $comments    = $pWorksheet->getComments();
 
         // xml
         $objWriter->startElement('xml');
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
      */
     private function writeVMLComment(\PHPExcel\Shared\XMLWriter $objWriter = null, $pCellReference = 'A1', \PHPExcel\Comment $pComment = null)
     {
-         // Metadata
-         list($column, $row) = \PHPExcel\Cell::coordinateFromString($pCellReference);
-         $column = \PHPExcel\Cell::columnIndexFromString($column);
-         $id = 1024 + $column + $row;
-         $id = substr($id, 0, 4);
+            // Metadata
+            list($column, $row) = \PHPExcel\Cell::coordinateFromString($pCellReference);
+            $column = \PHPExcel\Cell::columnIndexFromString($column);
+            $id = 1024 + $column + $row;
+            $id = substr($id, 0, 4);
 
         // v:shape
         $objWriter->startElement('v:shape');

Please login to merge, or discard this patch.

Documentation/Examples/Reader/exampleReader07.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@
 block discarded – undo
 echo $objPHPExcel->getSheetCount(),' worksheet',(($objPHPExcel->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />';
 $loadedSheetNames = $objPHPExcel->getSheetNames();
 foreach($loadedSheetNames as $sheetIndex => $loadedSheetName) {
-	echo $sheetIndex,' -> ',$loadedSheetName,'<br />';
+    echo $sheetIndex,' -> ',$loadedSheetName,'<br />';
 }
 
 

Please login to merge, or discard this patch.

Documentation/Examples/Reader/exampleReader06.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@
 block discarded – undo
 echo $objPHPExcel->getSheetCount(),' worksheet',(($objPHPExcel->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />';
 $loadedSheetNames = $objPHPExcel->getSheetNames();
 foreach($loadedSheetNames as $sheetIndex => $loadedSheetName) {
-	echo $sheetIndex,' -> ',$loadedSheetName,'<br />';
+    echo $sheetIndex,' -> ',$loadedSheetName,'<br />';
 }
 
 

Please login to merge, or discard this patch.

Documentation/Examples/Calculations/Database/DVARP.php 1 patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

		@@ -33,17 +33,17 @@
		block discarded – undo
33	33
34	34	// Add some data
35	35	$database = array( array( 'Tree', 'Height', 'Age', 'Yield', 'Profit' ),
36		- array( 'Apple', 18, 20, 14, 105.00 ),
37		- array( 'Pear', 12, 12, 10, 96.00 ),
38		- array( 'Cherry', 13, 14, 9, 105.00 ),
39		- array( 'Apple', 14, 15, 10, 75.00 ),
40		- array( 'Pear', 9, 8, 8, 76.80 ),
41		- array( 'Apple', 8, 9, 6, 45.00 ),
42		- );
	36	+ array( 'Apple', 18, 20, 14, 105.00 ),
	37	+ array( 'Pear', 12, 12, 10, 96.00 ),
	38	+ array( 'Cherry', 13, 14, 9, 105.00 ),
	39	+ array( 'Apple', 14, 15, 10, 75.00 ),
	40	+ array( 'Pear', 9, 8, 8, 76.80 ),
	41	+ array( 'Apple', 8, 9, 6, 45.00 ),
	42	+ );
43	43	$criteria = array( array( 'Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height' ),
44		- array( '="=Apple"', '>10', NULL, NULL, NULL, '<16' ),
45		- array( '="=Pear"', NULL, NULL, NULL, NULL, NULL )
46		- );
	44	+ array( '="=Apple"', '>10', NULL, NULL, NULL, '<16' ),
	45	+ array( '="=Pear"', NULL, NULL, NULL, NULL, NULL )
	46	+ );
47	47
48	48	$worksheet->fromArray( $criteria, NULL, 'A1' );
49	49	$worksheet->fromArray( $database, NULL, 'A4' );

Please login to merge, or discard this patch.

		@@ -674,7 +674,7 @@
		block discarded – undo
674	674	list($row1, $col1) = $this->cellToPackedRowcol($cell1);
675	675	list($row2, $col2) = $this->cellToPackedRowcol($cell2);
676	676	} else { // It's a rows range (like 26:27)
677		- list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
	677	+ list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
678	678	}
679	679
680	680	// The ptg value depends on the class of the ptg.

		@@ -1019,8 +1019,8 @@ discard block
		block discarded – undo
1019	1019
1020	1020	// Write the packed data
1021	1021	$this->append($header . $data .
1022		- $unknown1 . $options .
1023		- $unknown2 . $url_len . $url);
	1022	+ $unknown1 . $options .
	1023	+ $unknown2 . $url_len . $url);
1024	1024	return 0;
1025	1025	}
1026	1026
		@@ -1068,8 +1068,8 @@ discard block
		block discarded – undo
1068	1068
1069	1069	// Write the packed data
1070	1070	$this->append($header . $data .
1071		- $unknown1 . $options .
1072		- $url_len . $url);
	1071	+ $unknown1 . $options .
	1072	+ $url_len . $url);
1073	1073	return 0;
1074	1074	}
1075	1075
		@@ -1151,14 +1151,14 @@ discard block
		block discarded – undo
1151	1151
1152	1152	// Pack the main data stream
1153	1153	$data = pack("vvvv", $row1, $row2, $col1, $col2) .
1154		- $unknown1 .
1155		- $link_type .
1156		- $unknown2 .
1157		- $up_count .
1158		- $dir_short_len.
1159		- $dir_short .
1160		- $unknown3 .
1161		- $stream_len ;/*.
	1154	+ $unknown1 .
	1155	+ $link_type .
	1156	+ $unknown2 .
	1157	+ $up_count .
	1158	+ $dir_short_len.
	1159	+ $dir_short .
	1160	+ $unknown3 .
	1161	+ $stream_len ;/*.
1162	1162	$dir_long_len .
1163	1163	$unknown4 .
1164	1164	$dir_long .

		@@ -139,8 +139,8 @@
		block discarded – undo
139	139	}
140	140
141	141	$hashTablesArray = array( 'stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
142		- 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
143		- 'styleHashTable'
	142	+ 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
	143	+ 'styleHashTable'
144	144	);
145	145
146	146	// Set HashTable variables

		@@ -583,7 +583,7 @@
		block discarded – undo
583	583	while ($iterator->valid()) {
584	584	$aDrawings[] = $iterator->current();
585	585
586		- $iterator->next();
	586	+ $iterator->next();
587	587	}
588	588	}
589	589

		@@ -567,49 +567,49 @@ discard block
		block discarded – undo
567	567
568	568	// GKPIDDSI_CODEPAGE: CodePage
569	569	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
570		- 'offset' => array('pack' => 'V'),
571		- 'type' => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
572		- 'data' => array('data' => 1252));
	570	+ 'offset' => array('pack' => 'V'),
	571	+ 'type' => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
	572	+ 'data' => array('data' => 1252));
573	573	$dataSection_NumProps++;
574	574
575	575	// GKPIDDSI_CATEGORY : Category
576	576	if ($this->phpExcel->getProperties()->getCategory()) {
577	577	$dataProp = $this->phpExcel->getProperties()->getCategory();
578	578	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
579		- 'offset' => array('pack' => 'V'),
580		- 'type' => array('pack' => 'V', 'data' => 0x1E),
581		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	579	+ 'offset' => array('pack' => 'V'),
	580	+ 'type' => array('pack' => 'V', 'data' => 0x1E),
	581	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
582	582	$dataSection_NumProps++;
583	583	}
584	584	// GKPIDDSI_VERSION :Version of the application that wrote the property storage
585	585	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
586		- 'offset' => array('pack' => 'V'),
587		- 'type' => array('pack' => 'V', 'data' => 0x03),
588		- 'data' => array('pack' => 'V', 'data' => 0x000C0000));
	586	+ 'offset' => array('pack' => 'V'),
	587	+ 'type' => array('pack' => 'V', 'data' => 0x03),
	588	+ 'data' => array('pack' => 'V', 'data' => 0x000C0000));
589	589	$dataSection_NumProps++;
590	590	// GKPIDDSI_SCALE : FALSE
591	591	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
592		- 'offset' => array('pack' => 'V'),
593		- 'type' => array('pack' => 'V', 'data' => 0x0B),
594		- 'data' => array('data' => false));
	592	+ 'offset' => array('pack' => 'V'),
	593	+ 'type' => array('pack' => 'V', 'data' => 0x0B),
	594	+ 'data' => array('data' => false));
595	595	$dataSection_NumProps++;
596	596	// GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
597	597	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
598		- 'offset' => array('pack' => 'V'),
599		- 'type' => array('pack' => 'V', 'data' => 0x0B),
600		- 'data' => array('data' => false));
	598	+ 'offset' => array('pack' => 'V'),
	599	+ 'type' => array('pack' => 'V', 'data' => 0x0B),
	600	+ 'data' => array('data' => false));
601	601	$dataSection_NumProps++;
602	602	// GKPIDDSI_SHAREDOC : FALSE
603	603	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
604		- 'offset' => array('pack' => 'V'),
605		- 'type' => array('pack' => 'V', 'data' => 0x0B),
606		- 'data' => array('data' => false));
	604	+ 'offset' => array('pack' => 'V'),
	605	+ 'type' => array('pack' => 'V', 'data' => 0x0B),
	606	+ 'data' => array('data' => false));
607	607	$dataSection_NumProps++;
608	608	// GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
609	609	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
610		- 'offset' => array('pack' => 'V'),
611		- 'type' => array('pack' => 'V', 'data' => 0x0B),
612		- 'data' => array('data' => false));
	610	+ 'offset' => array('pack' => 'V'),
	611	+ 'type' => array('pack' => 'V', 'data' => 0x0B),
	612	+ 'data' => array('data' => false));
613	613	$dataSection_NumProps++;
614	614
615	615	// GKPIDDSI_DOCSPARTS
		@@ -619,50 +619,50 @@ discard block
		block discarded – undo
619	619	$dataProp = pack('v', 0x0001);
620	620	$dataProp .= pack('v', 0x0000);
621	621	// array of UnalignedLpstr
622		- // cch
623		- $dataProp .= pack('v', 0x000A);
624		- $dataProp .= pack('v', 0x0000);
625		- // value
626		- $dataProp .= 'Worksheet'.chr(0);
	622	+ // cch
	623	+ $dataProp .= pack('v', 0x000A);
	624	+ $dataProp .= pack('v', 0x0000);
	625	+ // value
	626	+ $dataProp .= 'Worksheet'.chr(0);
627	627
628	628	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
629		- 'offset' => array('pack' => 'V'),
630		- 'type' => array('pack' => 'V', 'data' => 0x101E),
631		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	629	+ 'offset' => array('pack' => 'V'),
	630	+ 'type' => array('pack' => 'V', 'data' => 0x101E),
	631	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
632	632	$dataSection_NumProps++;
633	633
634	634	// GKPIDDSI_HEADINGPAIR
635	635	// VtVecHeadingPairValue
636		- // cElements
637		- $dataProp = pack('v', 0x0002);
638		- $dataProp .= pack('v', 0x0000);
639		- // Array of vtHeadingPair
	636	+ // cElements
	637	+ $dataProp = pack('v', 0x0002);
	638	+ $dataProp .= pack('v', 0x0000);
	639	+ // Array of vtHeadingPair
640	640	// vtUnalignedString - headingString
641		- // stringType
642		- $dataProp .= pack('v', 0x001E);
643		- // padding
644		- $dataProp .= pack('v', 0x0000);
645		- // UnalignedLpstr
	641	+ // stringType
	642	+ $dataProp .= pack('v', 0x001E);
	643	+ // padding
	644	+ $dataProp .= pack('v', 0x0000);
	645	+ // UnalignedLpstr
646	646	// cch
647	647	$dataProp .= pack('v', 0x0013);
648	648	$dataProp .= pack('v', 0x0000);
649	649	// value
650	650	$dataProp .= 'Feuilles de calcul';
651	651	// vtUnalignedString - headingParts
652		- // wType : 0x0003 = 32 bit signed integer
653		- $dataProp .= pack('v', 0x0300);
654		- // padding
655		- $dataProp .= pack('v', 0x0000);
656		- // value
657		- $dataProp .= pack('v', 0x0100);
658		- $dataProp .= pack('v', 0x0000);
659		- $dataProp .= pack('v', 0x0000);
660		- $dataProp .= pack('v', 0x0000);
	652	+ // wType : 0x0003 = 32 bit signed integer
	653	+ $dataProp .= pack('v', 0x0300);
	654	+ // padding
	655	+ $dataProp .= pack('v', 0x0000);
	656	+ // value
	657	+ $dataProp .= pack('v', 0x0100);
	658	+ $dataProp .= pack('v', 0x0000);
	659	+ $dataProp .= pack('v', 0x0000);
	660	+ $dataProp .= pack('v', 0x0000);
661	661
662	662	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
663		- 'offset' => array('pack' => 'V'),
664		- 'type' => array('pack' => 'V', 'data' => 0x100C),
665		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	663	+ 'offset' => array('pack' => 'V'),
	664	+ 'type' => array('pack' => 'V', 'data' => 0x100C),
	665	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
666	666	$dataSection_NumProps++;
667	667
668	668	// 4 Section Length
		@@ -763,88 +763,88 @@ discard block
		block discarded – undo
763	763
764	764	// CodePage : CP-1252
765	765	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
766		- 'offset' => array('pack' => 'V'),
767		- 'type' => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
768		- 'data' => array('data' => 1252));
	766	+ 'offset' => array('pack' => 'V'),
	767	+ 'type' => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
	768	+ 'data' => array('data' => 1252));
769	769	$dataSection_NumProps++;
770	770
771	771	// Title
772	772	if ($this->phpExcel->getProperties()->getTitle()) {
773	773	$dataProp = $this->phpExcel->getProperties()->getTitle();
774	774	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
775		- 'offset' => array('pack' => 'V'),
776		- 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
777		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	775	+ 'offset' => array('pack' => 'V'),
	776	+ 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
	777	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
778	778	$dataSection_NumProps++;
779	779	}
780	780	// Subject
781	781	if ($this->phpExcel->getProperties()->getSubject()) {
782	782	$dataProp = $this->phpExcel->getProperties()->getSubject();
783	783	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
784		- 'offset' => array('pack' => 'V'),
785		- 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
786		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	784	+ 'offset' => array('pack' => 'V'),
	785	+ 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
	786	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
787	787	$dataSection_NumProps++;
788	788	}
789	789	// Author (Creator)
790	790	if ($this->phpExcel->getProperties()->getCreator()) {
791	791	$dataProp = $this->phpExcel->getProperties()->getCreator();
792	792	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
793		- 'offset' => array('pack' => 'V'),
794		- 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
795		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	793	+ 'offset' => array('pack' => 'V'),
	794	+ 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
	795	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
796	796	$dataSection_NumProps++;
797	797	}
798	798	// Keywords
799	799	if ($this->phpExcel->getProperties()->getKeywords()) {
800	800	$dataProp = $this->phpExcel->getProperties()->getKeywords();
801	801	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
802		- 'offset' => array('pack' => 'V'),
803		- 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
804		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	802	+ 'offset' => array('pack' => 'V'),
	803	+ 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
	804	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
805	805	$dataSection_NumProps++;
806	806	}
807	807	// Comments (Description)
808	808	if ($this->phpExcel->getProperties()->getDescription()) {
809	809	$dataProp = $this->phpExcel->getProperties()->getDescription();
810	810	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
811		- 'offset' => array('pack' => 'V'),
812		- 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
813		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	811	+ 'offset' => array('pack' => 'V'),
	812	+ 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
	813	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
814	814	$dataSection_NumProps++;
815	815	}
816	816	// Last Saved By (LastModifiedBy)
817	817	if ($this->phpExcel->getProperties()->getLastModifiedBy()) {
818	818	$dataProp = $this->phpExcel->getProperties()->getLastModifiedBy();
819	819	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
820		- 'offset' => array('pack' => 'V'),
821		- 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
822		- 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
	820	+ 'offset' => array('pack' => 'V'),
	821	+ 'type' => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
	822	+ 'data' => array('data' => $dataProp, 'length' => strlen($dataProp)));
823	823	$dataSection_NumProps++;
824	824	}
825	825	// Created Date/Time
826	826	if ($this->phpExcel->getProperties()->getCreated()) {
827	827	$dataProp = $this->phpExcel->getProperties()->getCreated();
828	828	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
829		- 'offset' => array('pack' => 'V'),
830		- 'type' => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
831		- 'data' => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
	829	+ 'offset' => array('pack' => 'V'),
	830	+ 'type' => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
	831	+ 'data' => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
832	832	$dataSection_NumProps++;
833	833	}
834	834	// Modified Date/Time
835	835	if ($this->phpExcel->getProperties()->getModified()) {
836	836	$dataProp = $this->phpExcel->getProperties()->getModified();
837	837	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
838		- 'offset' => array('pack' => 'V'),
839		- 'type' => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
840		- 'data' => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
	838	+ 'offset' => array('pack' => 'V'),
	839	+ 'type' => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
	840	+ 'data' => array('data' => \PHPExcel\Shared\OLE::localDateToOLE($dataProp)));
841	841	$dataSection_NumProps++;
842	842	}
843	843	// Security
844	844	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
845		- 'offset' => array('pack' => 'V'),
846		- 'type' => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
847		- 'data' => array('data' => 0x00));
	845	+ 'offset' => array('pack' => 'V'),
	846	+ 'type' => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
	847	+ 'data' => array('data' => 0x00));
848	848	$dataSection_NumProps++;
849	849
850	850

		@@ -48,12 +48,12 @@ discard block
		block discarded – undo
48	48	// XML header
49	49	$objWriter->startDocument('1.0', 'UTF-8', 'yes');
50	50
51		- // Comments cache
52		- $comments = $pWorksheet->getComments();
	51	+ // Comments cache
	52	+ $comments = $pWorksheet->getComments();
53	53
54		- // Authors cache
55		- $authors = array();
56		- $authorId = 0;
	54	+ // Authors cache
	55	+ $authors = array();
	56	+ $authorId = 0;
57	57	foreach ($comments as $comment) {
58	58	if (!isset($authors[$comment->getAuthor()])) {
59	59	$authors[$comment->getAuthor()] = $authorId++;
		@@ -128,8 +128,8 @@ discard block
		block discarded – undo
128	128	// XML header
129	129	$objWriter->startDocument('1.0', 'UTF-8', 'yes');
130	130
131		- // Comments cache
132		- $comments = $pWorksheet->getComments();
	131	+ // Comments cache
	132	+ $comments = $pWorksheet->getComments();
133	133
134	134	// xml
135	135	$objWriter->startElement('xml');
		@@ -190,11 +190,11 @@ discard block
		block discarded – undo
190	190	*/
191	191	private function writeVMLComment(\PHPExcel\Shared\XMLWriter $objWriter = null, $pCellReference = 'A1', \PHPExcel\Comment $pComment = null)
192	192	{
193		- // Metadata
194		- list($column, $row) = \PHPExcel\Cell::coordinateFromString($pCellReference);
195		- $column = \PHPExcel\Cell::columnIndexFromString($column);
196		- $id = 1024 + $column + $row;
197		- $id = substr($id, 0, 4);
	193	+ // Metadata
	194	+ list($column, $row) = \PHPExcel\Cell::coordinateFromString($pCellReference);
	195	+ $column = \PHPExcel\Cell::columnIndexFromString($column);
	196	+ $id = 1024 + $column + $row;
	197	+ $id = substr($id, 0, 4);
198	198
199	199	// v:shape
200	200	$objWriter->startElement('v:shape');

		@@ -46,7 +46,7 @@
		block discarded – undo
46	46	echo $objPHPExcel->getSheetCount(),' worksheet',(($objPHPExcel->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />';
47	47	$loadedSheetNames = $objPHPExcel->getSheetNames();
48	48	foreach($loadedSheetNames as $sheetIndex => $loadedSheetName) {
49		- echo $sheetIndex,' -> ',$loadedSheetName,'<br />';
	49	+ echo $sheetIndex,' -> ',$loadedSheetName,'<br />';
50	50	}
51	51
52	52

PHPOffice / PhpSpreadsheet

Push — develop ( bf3457...467bab )

Status

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +80 added lines, -80 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch