Completed
Push — develop ( bf3457...467bab )
by
unknown
09:08
created
src/PhpSpreadsheet/Writer/Excel2007/StringTable.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
             // Create string lookup table
44 44
             $aStringTable = array();
45 45
             $cellCollection = null;
46
-            $aFlippedStringTable = null;    // For faster lookup
46
+            $aFlippedStringTable = null; // For faster lookup
47 47
 
48 48
             // Is an existing table given?
49 49
             if (($pExistingTable !== null) && is_array($pExistingTable)) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
             foreach ($pStringTable as $textElement) {
109 109
                 $objWriter->startElement('si');
110 110
 
111
-                if (! $textElement instanceof \PHPExcel\RichText) {
111
+                if (!$textElement instanceof \PHPExcel\RichText) {
112 112
                     $textToWrite = \PHPExcel\Shared\StringHelper::controlCharacterPHP2OOXML($textElement);
113 113
                     $objWriter->startElement('t');
114 114
                     if ($textToWrite !== trim($textToWrite)) {
@@ -149,31 +149,31 @@  discard block
 block discarded – undo
149 149
         $elements = $pRichText->getRichTextElements();
150 150
         foreach ($elements as $element) {
151 151
             // r
152
-            $objWriter->startElement($prefix.'r');
152
+            $objWriter->startElement($prefix . 'r');
153 153
 
154 154
             // rPr
155 155
             if ($element instanceof \PHPExcel\RichText\Run) {
156 156
                 // rPr
157
-                $objWriter->startElement($prefix.'rPr');
157
+                $objWriter->startElement($prefix . 'rPr');
158 158
 
159 159
                 // rFont
160
-                $objWriter->startElement($prefix.'rFont');
160
+                $objWriter->startElement($prefix . 'rFont');
161 161
                 $objWriter->writeAttribute('val', $element->getFont()->getName());
162 162
                 $objWriter->endElement();
163 163
 
164 164
                 // Bold
165
-                $objWriter->startElement($prefix.'b');
165
+                $objWriter->startElement($prefix . 'b');
166 166
                 $objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
167 167
                 $objWriter->endElement();
168 168
 
169 169
                 // Italic
170
-                $objWriter->startElement($prefix.'i');
170
+                $objWriter->startElement($prefix . 'i');
171 171
                 $objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
172 172
                 $objWriter->endElement();
173 173
 
174 174
                 // Superscript / subscript
175 175
                 if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
176
-                    $objWriter->startElement($prefix.'vertAlign');
176
+                    $objWriter->startElement($prefix . 'vertAlign');
177 177
                     if ($element->getFont()->getSuperScript()) {
178 178
                         $objWriter->writeAttribute('val', 'superscript');
179 179
                     } elseif ($element->getFont()->getSubScript()) {
@@ -183,22 +183,22 @@  discard block
 block discarded – undo
183 183
                 }
184 184
 
185 185
                 // Strikethrough
186
-                $objWriter->startElement($prefix.'strike');
186
+                $objWriter->startElement($prefix . 'strike');
187 187
                 $objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
188 188
                 $objWriter->endElement();
189 189
 
190 190
                 // Color
191
-                $objWriter->startElement($prefix.'color');
191
+                $objWriter->startElement($prefix . 'color');
192 192
                 $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
193 193
                 $objWriter->endElement();
194 194
 
195 195
                 // Size
196
-                $objWriter->startElement($prefix.'sz');
196
+                $objWriter->startElement($prefix . 'sz');
197 197
                 $objWriter->writeAttribute('val', $element->getFont()->getSize());
198 198
                 $objWriter->endElement();
199 199
 
200 200
                 // Underline
201
-                $objWriter->startElement($prefix.'u');
201
+                $objWriter->startElement($prefix . 'u');
202 202
                 $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
203 203
                 $objWriter->endElement();
204 204
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
             }
207 207
 
208 208
             // t
209
-            $objWriter->startElement($prefix.'t');
209
+            $objWriter->startElement($prefix . 't');
210 210
             $objWriter->writeAttribute('xml:space', 'preserve');
211 211
             $objWriter->writeRawData(\PHPExcel\Shared\StringHelper::controlCharacterPHP2OOXML($element->getText()));
212 212
             $objWriter->endElement();
@@ -239,10 +239,10 @@  discard block
 block discarded – undo
239 239
         $elements = $pRichText->getRichTextElements();
240 240
         foreach ($elements as $element) {
241 241
             // r
242
-            $objWriter->startElement($prefix.'r');
242
+            $objWriter->startElement($prefix . 'r');
243 243
 
244 244
             // rPr
245
-            $objWriter->startElement($prefix.'rPr');
245
+            $objWriter->startElement($prefix . 'rPr');
246 246
 
247 247
             // Bold
248 248
             $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
             $objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
264 264
 
265 265
             // rFont
266
-            $objWriter->startElement($prefix.'latin');
266
+            $objWriter->startElement($prefix . 'latin');
267 267
                 $objWriter->writeAttribute('typeface', $element->getFont()->getName());
268 268
             $objWriter->endElement();
269 269
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
             $objWriter->endElement();
282 282
 
283 283
             // t
284
-            $objWriter->startElement($prefix.'t');
284
+            $objWriter->startElement($prefix . 't');
285 285
 //                    $objWriter->writeAttribute('xml:space', 'preserve');    //    Excel2010 accepts, Excel2007 complains
286 286
             $objWriter->writeRawData(\PHPExcel\Shared\StringHelper::controlCharacterPHP2OOXML($element->getText()));
287 287
             $objWriter->endElement();
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 
304 304
         // Loop through stringtable and add flipped items to $returnValue
305 305
         foreach ($stringTable as $key => $value) {
306
-            if (! $value instanceof \PHPExcel\RichText) {
306
+            if (!$value instanceof \PHPExcel\RichText) {
307 307
                 $returnValue[$value] = $key;
308 308
             } elseif ($value instanceof \PHPExcel\RichText) {
309 309
                 $returnValue[$value->getHashCode()] = $key;
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/Chart.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
                 $objWriter->startElement('c:smooth');
274 274
                 $objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine());
275 275
                 $objWriter->endElement();
276
-            } elseif (($chartType === DataSeries::TYPE_BARCHART) ||($chartType === DataSeries::TYPE_BARCHART_3D)) {
276
+            } elseif (($chartType === DataSeries::TYPE_BARCHART) || ($chartType === DataSeries::TYPE_BARCHART_3D)) {
277 277
                 $objWriter->startElement('c:gapWidth');
278 278
                 $objWriter->writeAttribute('val', 150);
279 279
                 $objWriter->endElement();
@@ -913,10 +913,10 @@  discard block
 block discarded – undo
913 913
         if (!is_null($xAxis->getGlowProperty('size'))) {
914 914
             $objWriter->startElement('a:glow');
915 915
             $objWriter->writeAttribute('rad', $xAxis->getGlowProperty('size'));
916
-            $objWriter->startElement("a:{$xAxis->getGlowProperty(array('color','type'))}");
917
-            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color','value')));
916
+            $objWriter->startElement("a:{$xAxis->getGlowProperty(array('color', 'type'))}");
917
+            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color', 'value')));
918 918
             $objWriter->startElement('a:alpha');
919
-            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color','alpha')));
919
+            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color', 'alpha')));
920 920
             $objWriter->endElement();
921 921
             $objWriter->endElement();
922 922
             $objWriter->endElement();
@@ -937,23 +937,23 @@  discard block
 block discarded – undo
937 937
             if (!is_null($xAxis->getShadowProperty('algn'))) {
938 938
                 $objWriter->writeAttribute('algn', $xAxis->getShadowProperty('algn'));
939 939
             }
940
-            if (!is_null($xAxis->getShadowProperty(array('size','sx')))) {
941
-                $objWriter->writeAttribute('sx', $xAxis->getShadowProperty(array('size','sx')));
940
+            if (!is_null($xAxis->getShadowProperty(array('size', 'sx')))) {
941
+                $objWriter->writeAttribute('sx', $xAxis->getShadowProperty(array('size', 'sx')));
942 942
             }
943
-            if (!is_null($xAxis->getShadowProperty(array('size','sy')))) {
944
-                $objWriter->writeAttribute('sy', $xAxis->getShadowProperty(array('size','sy')));
943
+            if (!is_null($xAxis->getShadowProperty(array('size', 'sy')))) {
944
+                $objWriter->writeAttribute('sy', $xAxis->getShadowProperty(array('size', 'sy')));
945 945
             }
946
-            if (!is_null($xAxis->getShadowProperty(array('size','kx')))) {
947
-                $objWriter->writeAttribute('kx', $xAxis->getShadowProperty(array('size','kx')));
946
+            if (!is_null($xAxis->getShadowProperty(array('size', 'kx')))) {
947
+                $objWriter->writeAttribute('kx', $xAxis->getShadowProperty(array('size', 'kx')));
948 948
             }
949 949
             if (!is_null($xAxis->getShadowProperty('rotWithShape'))) {
950 950
                 $objWriter->writeAttribute('rotWithShape', $xAxis->getShadowProperty('rotWithShape'));
951 951
             }
952 952
 
953
-            $objWriter->startElement("a:{$xAxis->getShadowProperty(array('color','type'))}");
954
-            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color','value')));
953
+            $objWriter->startElement("a:{$xAxis->getShadowProperty(array('color', 'type'))}");
954
+            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color', 'value')));
955 955
             $objWriter->startElement('a:alpha');
956
-            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color','alpha')));
956
+            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color', 'alpha')));
957 957
             $objWriter->endElement();
958 958
             $objWriter->endElement();
959 959
 
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/Rels.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
                 'http://schemas.microsoft.com/office/2006/relationships/vbaProject',
169 169
                 'vbaProject.bin'
170 170
             );
171
-            ++$i;//increment i if needed for an another relation
171
+            ++$i; //increment i if needed for an another relation
172 172
         }
173 173
 
174 174
         $objWriter->endElement();
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/Drawing.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
             // Loop through charts and write the chart position
73 73
             if ($chartCount > 0) {
74 74
                 for ($c = 0; $c < $chartCount; ++$c) {
75
-                    $this->writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c+$i);
75
+                    $this->writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c + $i);
76 76
                 }
77 77
             }
78 78
         }
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                 $objWriter->writeAttribute('macro', '');
118 118
                 $objWriter->startElement('xdr:nvGraphicFramePr');
119 119
                     $objWriter->startElement('xdr:cNvPr');
120
-                        $objWriter->writeAttribute('name', 'Chart '.$pRelationId);
120
+                        $objWriter->writeAttribute('name', 'Chart ' . $pRelationId);
121 121
                         $objWriter->writeAttribute('id', 1025 * $pRelationId);
122 122
                     $objWriter->endElement();
123 123
                     $objWriter->startElement('xdr:cNvGraphicFramePr');
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
                         $objWriter->startElement('c:chart');
144 144
                             $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
145 145
                             $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
146
-                            $objWriter->writeAttribute('r:id', 'rId'.$pRelationId);
146
+                            $objWriter->writeAttribute('r:id', 'rId' . $pRelationId);
147 147
                         $objWriter->endElement();
148 148
                     $objWriter->endElement();
149 149
                 $objWriter->endElement();
@@ -169,8 +169,8 @@  discard block
 block discarded – undo
169 169
             // xdr:oneCellAnchor
170 170
             $objWriter->startElement('xdr:oneCellAnchor');
171 171
             // Image location
172
-            $aCoordinates         = \PHPExcel\Cell::coordinateFromString($pDrawing->getCoordinates());
173
-            $aCoordinates[0]     = \PHPExcel\Cell::columnIndexFromString($aCoordinates[0]);
172
+            $aCoordinates = \PHPExcel\Cell::coordinateFromString($pDrawing->getCoordinates());
173
+            $aCoordinates[0] = \PHPExcel\Cell::columnIndexFromString($aCoordinates[0]);
174 174
 
175 175
             // xdr:from
176 176
             $objWriter->startElement('xdr:from');
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
     public function allDrawings(\PHPExcel\SpreadSheet $pPHPExcel = null)
574 574
     {
575 575
         // Get an array of all drawings
576
-        $aDrawings    = array();
576
+        $aDrawings = array();
577 577
 
578 578
         // Loop through PHPExcel
579 579
         $sheetCount = $pPHPExcel->getSheetCount();
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/Comments.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
50 50
 
51 51
           // Comments cache
52
-          $comments    = $pWorksheet->getComments();
52
+          $comments = $pWorksheet->getComments();
53 53
 
54 54
           // Authors cache
55
-          $authors    = array();
56
-          $authorId    = 0;
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++;
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
130 130
 
131 131
           // Comments cache
132
-          $comments    = $pWorksheet->getComments();
132
+          $comments = $pWorksheet->getComments();
133 133
 
134 134
         // xml
135 135
         $objWriter->startElement('xml');
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/DocProps.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@
 block discarded – undo
229 229
 
230 230
             $objWriter->startElement('property');
231 231
             $objWriter->writeAttribute('fmtid', '{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
232
-            $objWriter->writeAttribute('pid', $key+2);
232
+            $objWriter->writeAttribute('pid', $key + 2);
233 233
             $objWriter->writeAttribute('name', $customProperty);
234 234
 
235 235
             switch ($propertyType) {
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/Style.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -389,19 +389,19 @@  discard block
 block discarded – undo
389 389
         // xf
390 390
         $objWriter->startElement('xf');
391 391
         $objWriter->writeAttribute('xfId', 0);
392
-        $objWriter->writeAttribute('fontId', (int)$this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode()));
392
+        $objWriter->writeAttribute('fontId', (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode()));
393 393
         if ($pStyle->getQuotePrefix()) {
394 394
             $objWriter->writeAttribute('quotePrefix', 1);
395 395
         }
396 396
 
397 397
         if ($pStyle->getNumberFormat()->getBuiltInFormatCode() === false) {
398
-            $objWriter->writeAttribute('numFmtId', (int)($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164));
398
+            $objWriter->writeAttribute('numFmtId', (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164));
399 399
         } else {
400
-            $objWriter->writeAttribute('numFmtId', (int)$pStyle->getNumberFormat()->getBuiltInFormatCode());
400
+            $objWriter->writeAttribute('numFmtId', (int) $pStyle->getNumberFormat()->getBuiltInFormatCode());
401 401
         }
402 402
 
403
-        $objWriter->writeAttribute('fillId', (int)$this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode()));
404
-        $objWriter->writeAttribute('borderId', (int)$this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode()));
403
+        $objWriter->writeAttribute('fillId', (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode()));
404
+        $objWriter->writeAttribute('borderId', (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode()));
405 405
 
406 406
         // Apply styles?
407 407
         $objWriter->writeAttribute('applyFont', ($pPHPExcel->getDefaultStyle()->getFont()->getHashCode() != $pStyle->getFont()->getHashCode()) ? '1' : '0');
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
         /** @var \PHPExcel\Style $style */
624 624
         foreach ($aStyles as $style) {
625 625
             if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) {
626
-                $aFills[ $style->getFill()->getHashCode() ] = $style->getFill();
626
+                $aFills[$style->getFill()->getHashCode()] = $style->getFill();
627 627
             }
628 628
         }
629 629
 
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
         /** @var \PHPExcel\Style $style */
647 647
         foreach ($aStyles as $style) {
648 648
             if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) {
649
-                $aFonts[ $style->getFont()->getHashCode() ] = $style->getFont();
649
+                $aFonts[$style->getFont()->getHashCode()] = $style->getFont();
650 650
             }
651 651
         }
652 652
 
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
         /** @var \PHPExcel\Style $style */
670 670
         foreach ($aStyles as $style) {
671 671
             if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) {
672
-                $aBorders[ $style->getBorders()->getHashCode() ] = $style->getBorders();
672
+                $aBorders[$style->getBorders()->getHashCode()] = $style->getBorders();
673 673
             }
674 674
         }
675 675
 
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
         /** @var \PHPExcel\Style $style */
693 693
         foreach ($aStyles as $style) {
694 694
             if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) {
695
-                $aNumFmts[ $style->getNumberFormat()->getHashCode() ] = $style->getNumberFormat();
695
+                $aNumFmts[$style->getNumberFormat()->getHashCode()] = $style->getNumberFormat();
696 696
             }
697 697
         }
698 698
 
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/ContentTypes.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
         $aMediaContentTypes = array();
133 133
         $mediaCount = $this->getParentWriter()->getDrawingHashTable()->count();
134 134
         for ($i = 0; $i < $mediaCount; ++$i) {
135
-            $extension     = '';
136
-            $mimeType     = '';
135
+            $extension = '';
136
+            $mimeType = '';
137 137
 
138 138
             if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof \PHPExcel\Worksheet\Drawing) {
139 139
                 $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
         if ($pPHPExcel->hasRibbonBinObjects()) {
156 156
             // Some additional objects in the ribbon ?
157 157
             // we need to write "Extension" but not already write for media content
158
-            $tabRibbonTypes=array_diff($pPHPExcel->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
158
+            $tabRibbonTypes = array_diff($pPHPExcel->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
159 159
             foreach ($tabRibbonTypes as $aRibbonType) {
160
-                $mimeType='image/.'.$aRibbonType;//we wrote $mimeType like customUI Editor
160
+                $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor
161 161
                 $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
162 162
             }
163 163
         }
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Excel2007/Theme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -860,7 +860,7 @@
 block discarded – undo
860 860
     private function writeColourScheme($objWriter)
861 861
     {
862 862
         foreach (self::$colourScheme as $colourName => $colourValue) {
863
-            $objWriter->startElement('a:'.$colourName);
863
+            $objWriter->startElement('a:' . $colourName);
864 864
 
865 865
                 $objWriter->startElement('a:srgbClr');
866 866
                     $objWriter->writeAttribute('val', $colourValue);
Please login to merge, or discard this patch.