@@ -34,42 +34,42 @@ |
||
34 | 34 | * |
35 | 35 | * @var double |
36 | 36 | */ |
37 | - private $left = 0.7; |
|
37 | + private $left = 0.7; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Right |
41 | 41 | * |
42 | 42 | * @var double |
43 | 43 | */ |
44 | - private $right = 0.7; |
|
44 | + private $right = 0.7; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Top |
48 | 48 | * |
49 | 49 | * @var double |
50 | 50 | */ |
51 | - private $top = 0.75; |
|
51 | + private $top = 0.75; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Bottom |
55 | 55 | * |
56 | 56 | * @var double |
57 | 57 | */ |
58 | - private $bottom = 0.75; |
|
58 | + private $bottom = 0.75; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Header |
62 | 62 | * |
63 | 63 | * @var double |
64 | 64 | */ |
65 | - private $header = 0.3; |
|
65 | + private $header = 0.3; |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * Footer |
69 | 69 | * |
70 | 70 | * @var double |
71 | 71 | */ |
72 | - private $footer = 0.3; |
|
72 | + private $footer = 0.3; |
|
73 | 73 | |
74 | 74 | /** |
75 | 75 | * Create a new PageMargins |
@@ -34,119 +34,119 @@ |
||
34 | 34 | * |
35 | 35 | * @var boolean |
36 | 36 | */ |
37 | - private $sheet = false; |
|
37 | + private $sheet = false; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Objects |
41 | 41 | * |
42 | 42 | * @var boolean |
43 | 43 | */ |
44 | - private $objects = false; |
|
44 | + private $objects = false; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Scenarios |
48 | 48 | * |
49 | 49 | * @var boolean |
50 | 50 | */ |
51 | - private $scenarios = false; |
|
51 | + private $scenarios = false; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Format cells |
55 | 55 | * |
56 | 56 | * @var boolean |
57 | 57 | */ |
58 | - private $formatCells = false; |
|
58 | + private $formatCells = false; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Format columns |
62 | 62 | * |
63 | 63 | * @var boolean |
64 | 64 | */ |
65 | - private $formatColumns = false; |
|
65 | + private $formatColumns = false; |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * Format rows |
69 | 69 | * |
70 | 70 | * @var boolean |
71 | 71 | */ |
72 | - private $formatRows = false; |
|
72 | + private $formatRows = false; |
|
73 | 73 | |
74 | 74 | /** |
75 | 75 | * Insert columns |
76 | 76 | * |
77 | 77 | * @var boolean |
78 | 78 | */ |
79 | - private $insertColumns = false; |
|
79 | + private $insertColumns = false; |
|
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Insert rows |
83 | 83 | * |
84 | 84 | * @var boolean |
85 | 85 | */ |
86 | - private $insertRows = false; |
|
86 | + private $insertRows = false; |
|
87 | 87 | |
88 | 88 | /** |
89 | 89 | * Insert hyperlinks |
90 | 90 | * |
91 | 91 | * @var boolean |
92 | 92 | */ |
93 | - private $insertHyperlinks = false; |
|
93 | + private $insertHyperlinks = false; |
|
94 | 94 | |
95 | 95 | /** |
96 | 96 | * Delete columns |
97 | 97 | * |
98 | 98 | * @var boolean |
99 | 99 | */ |
100 | - private $deleteColumns = false; |
|
100 | + private $deleteColumns = false; |
|
101 | 101 | |
102 | 102 | /** |
103 | 103 | * Delete rows |
104 | 104 | * |
105 | 105 | * @var boolean |
106 | 106 | */ |
107 | - private $deleteRows = false; |
|
107 | + private $deleteRows = false; |
|
108 | 108 | |
109 | 109 | /** |
110 | 110 | * Select locked cells |
111 | 111 | * |
112 | 112 | * @var boolean |
113 | 113 | */ |
114 | - private $selectLockedCells = false; |
|
114 | + private $selectLockedCells = false; |
|
115 | 115 | |
116 | 116 | /** |
117 | 117 | * Sort |
118 | 118 | * |
119 | 119 | * @var boolean |
120 | 120 | */ |
121 | - private $sort = false; |
|
121 | + private $sort = false; |
|
122 | 122 | |
123 | 123 | /** |
124 | 124 | * AutoFilter |
125 | 125 | * |
126 | 126 | * @var boolean |
127 | 127 | */ |
128 | - private $autoFilter = false; |
|
128 | + private $autoFilter = false; |
|
129 | 129 | |
130 | 130 | /** |
131 | 131 | * Pivot tables |
132 | 132 | * |
133 | 133 | * @var boolean |
134 | 134 | */ |
135 | - private $pivotTables = false; |
|
135 | + private $pivotTables = false; |
|
136 | 136 | |
137 | 137 | /** |
138 | 138 | * Select unlocked cells |
139 | 139 | * |
140 | 140 | * @var boolean |
141 | 141 | */ |
142 | - private $selectUnlockedCells = false; |
|
142 | + private $selectUnlockedCells = false; |
|
143 | 143 | |
144 | 144 | /** |
145 | 145 | * Password |
146 | 146 | * |
147 | 147 | * @var string |
148 | 148 | */ |
149 | - private $password = ''; |
|
149 | + private $password = ''; |
|
150 | 150 | |
151 | 151 | /** |
152 | 152 | * Create a new Protection |
@@ -671,7 +671,7 @@ |
||
671 | 671 | set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath); |
672 | 672 | } |
673 | 673 | |
674 | - $rendererName = '\\PHPExcel\\Chart\\Renderer\\'.$libraryName; |
|
674 | + $rendererName = '\\PHPExcel\\Chart\\Renderer\\' . $libraryName; |
|
675 | 675 | $renderer = new $rendererName($this); |
676 | 676 | |
677 | 677 | if ($outputDestination == 'php://output') { |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | * @static |
38 | 38 | */ |
39 | 39 | private static $searchLocations = array( |
40 | - array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => '\\PHPExcel\\Writer\\{0}' ), |
|
41 | - array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => '\\PHPExcel\\Reader\\{0}' ) |
|
40 | + array('type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => '\\PHPExcel\\Writer\\{0}'), |
|
41 | + array('type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => '\\PHPExcel\\Reader\\{0}') |
|
42 | 42 | ); |
43 | 43 | |
44 | 44 | /** |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public static function addSearchLocation($type = '', $location = '', $classname = '') |
108 | 108 | { |
109 | - self::$searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname ); |
|
109 | + self::$searchLocations[] = array('type' => $type, 'path' => $location, 'class' => $classname); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -12,15 +12,15 @@ discard block |
||
12 | 12 | class GridLines extends Properties |
13 | 13 | { |
14 | 14 | |
15 | - /** |
|
16 | - * Properties of Class: |
|
17 | - * Object State (State for Minor Tick Mark) @var bool |
|
18 | - * Line Properties @var array of mixed |
|
19 | - * Shadow Properties @var array of mixed |
|
20 | - * Glow Properties @var array of mixed |
|
21 | - * Soft Properties @var array of mixed |
|
22 | - * |
|
23 | - */ |
|
15 | + /** |
|
16 | + * Properties of Class: |
|
17 | + * Object State (State for Minor Tick Mark) @var bool |
|
18 | + * Line Properties @var array of mixed |
|
19 | + * Shadow Properties @var array of mixed |
|
20 | + * Glow Properties @var array of mixed |
|
21 | + * Soft Properties @var array of mixed |
|
22 | + * |
|
23 | + */ |
|
24 | 24 | |
25 | 25 | private $objectState = false; |
26 | 26 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | private $softEdges = array( |
82 | 82 | 'size' => null |
83 | - ); |
|
83 | + ); |
|
84 | 84 | |
85 | 85 | /** |
86 | 86 | * Get Object State |
@@ -30,12 +30,12 @@ |
||
30 | 30 | class Legend |
31 | 31 | { |
32 | 32 | /** Legend positions */ |
33 | - const XL_LEGEND_POSITION_BOTTOM = -4107; // Below the chart. |
|
34 | - const XL_LEGEND_POSITION_CORNER = 2; // In the upper right-hand corner of the chart border. |
|
35 | - const XL_LEGEND_POSITION_CUSTOM = -4161; // A custom position. |
|
36 | - const XL_LEGEND_POSITION_LEFT = -4131; // Left of the chart. |
|
37 | - const XL_LEGEND_POSITION_RIGHT = -4152; // Right of the chart. |
|
38 | - const XL_LEGEND_POSITION_TOP = -4160; // Above the chart. |
|
33 | + const XL_LEGEND_POSITION_BOTTOM = -4107; // Below the chart. |
|
34 | + const XL_LEGEND_POSITION_CORNER = 2; // In the upper right-hand corner of the chart border. |
|
35 | + const XL_LEGEND_POSITION_CUSTOM = -4161; // A custom position. |
|
36 | + const XL_LEGEND_POSITION_LEFT = -4131; // Left of the chart. |
|
37 | + const XL_LEGEND_POSITION_RIGHT = -4152; // Right of the chart. |
|
38 | + const XL_LEGEND_POSITION_TOP = -4160; // Above the chart. |
|
39 | 39 | |
40 | 40 | const POSITION_RIGHT = 'r'; |
41 | 41 | const POSITION_LEFT = 'l'; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * |
96 | 96 | * @var string |
97 | 97 | */ |
98 | - protected $builtInFormatCode = 0; |
|
98 | + protected $builtInFormatCode = 0; |
|
99 | 99 | |
100 | 100 | /** |
101 | 101 | * Create a new NumberFormat |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | self::$builtInFormats[11] = '0.00E+00'; |
284 | 284 | self::$builtInFormats[12] = '# ?/?'; |
285 | 285 | self::$builtInFormats[13] = '# ??/??'; |
286 | - self::$builtInFormats[14] = 'm/d/yyyy'; // Despite ECMA 'mm-dd-yy'; |
|
286 | + self::$builtInFormats[14] = 'm/d/yyyy'; // Despite ECMA 'mm-dd-yy'; |
|
287 | 287 | self::$builtInFormats[15] = 'd-mmm-yy'; |
288 | 288 | self::$builtInFormats[16] = 'd-mmm'; |
289 | 289 | self::$builtInFormats[17] = 'mmm-yy'; |
@@ -291,17 +291,17 @@ discard block |
||
291 | 291 | self::$builtInFormats[19] = 'h:mm:ss AM/PM'; |
292 | 292 | self::$builtInFormats[20] = 'h:mm'; |
293 | 293 | self::$builtInFormats[21] = 'h:mm:ss'; |
294 | - self::$builtInFormats[22] = 'm/d/yyyy h:mm'; // Despite ECMA 'm/d/yy h:mm'; |
|
294 | + self::$builtInFormats[22] = 'm/d/yyyy h:mm'; // Despite ECMA 'm/d/yy h:mm'; |
|
295 | 295 | |
296 | - self::$builtInFormats[37] = '#,##0_);(#,##0)'; // Despite ECMA '#,##0 ;(#,##0)'; |
|
297 | - self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; // Despite ECMA '#,##0 ;[Red](#,##0)'; |
|
298 | - self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)'; // Despite ECMA '#,##0.00;(#,##0.00)'; |
|
299 | - self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)'; // Despite ECMA '#,##0.00;[Red](#,##0.00)'; |
|
296 | + self::$builtInFormats[37] = '#,##0_);(#,##0)'; // Despite ECMA '#,##0 ;(#,##0)'; |
|
297 | + self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; // Despite ECMA '#,##0 ;[Red](#,##0)'; |
|
298 | + self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)'; // Despite ECMA '#,##0.00;(#,##0.00)'; |
|
299 | + self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)'; // Despite ECMA '#,##0.00;[Red](#,##0.00)'; |
|
300 | 300 | |
301 | 301 | self::$builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)'; |
302 | 302 | self::$builtInFormats[45] = 'mm:ss'; |
303 | 303 | self::$builtInFormats[46] = '[h]:mm:ss'; |
304 | - self::$builtInFormats[47] = 'mm:ss.0'; // Despite ECMA 'mmss.0'; |
|
304 | + self::$builtInFormats[47] = 'mm:ss.0'; // Despite ECMA 'mmss.0'; |
|
305 | 305 | self::$builtInFormats[48] = '##0.0E+0'; |
306 | 306 | self::$builtInFormats[49] = '@'; |
307 | 307 | |
@@ -520,8 +520,8 @@ discard block |
||
520 | 520 | |
521 | 521 | $GCD = \PHPExcel\Calculation\MathTrig::GCD($decimalPart, $decimalDivisor); |
522 | 522 | |
523 | - $adjustedDecimalPart = $decimalPart/$GCD; |
|
524 | - $adjustedDecimalDivisor = $decimalDivisor/$GCD; |
|
523 | + $adjustedDecimalPart = $decimalPart / $GCD; |
|
524 | + $adjustedDecimalDivisor = $decimalDivisor / $GCD; |
|
525 | 525 | |
526 | 526 | if ((strpos($format, '0') !== false) || (strpos($format, '#') !== false) || (substr($format, 0, 3) == '? ?')) { |
527 | 527 | if ($integerPart == 0) { |
@@ -617,13 +617,13 @@ discard block |
||
617 | 617 | break; |
618 | 618 | case 3: |
619 | 619 | $format = ($value > 0) ? |
620 | - $sections[0] : ( ($value < 0) ? |
|
620 | + $sections[0] : (($value < 0) ? |
|
621 | 621 | $sections[1] : $sections[2]); |
622 | 622 | $value = abs($value); // Use the absolute value |
623 | 623 | break; |
624 | 624 | case 4: |
625 | 625 | $format = ($value > 0) ? |
626 | - $sections[0] : ( ($value < 0) ? |
|
626 | + $sections[0] : (($value < 0) ? |
|
627 | 627 | $sections[1] : $sections[2]); |
628 | 628 | $value = abs($value); // Use the absolute value |
629 | 629 | break; |
@@ -684,7 +684,7 @@ discard block |
||
684 | 684 | |
685 | 685 | if (preg_match('/#?.*\?\/\?/', $format, $m)) { |
686 | 686 | //echo 'Format mask is fractional '.$format.' <br />'; |
687 | - if ($value != (int)$value) { |
|
687 | + if ($value != (int) $value) { |
|
688 | 688 | self::formatAsFraction($value, $format); |
689 | 689 | } |
690 | 690 | } else { |
@@ -385,10 +385,10 @@ |
||
385 | 385 | } |
386 | 386 | |
387 | 387 | /** |
388 | - * Get SubScript |
|
389 | - * |
|
390 | - * @return boolean |
|
391 | - */ |
|
388 | + * Get SubScript |
|
389 | + * |
|
390 | + * @return boolean |
|
391 | + */ |
|
392 | 392 | public function getSubScript() |
393 | 393 | { |
394 | 394 | if ($this->isSupervisor) { |
@@ -101,7 +101,7 @@ |
||
101 | 101 | /** |
102 | 102 | * Set Row Height |
103 | 103 | * |
104 | - * @param double $pValue |
|
104 | + * @param integer $pValue |
|
105 | 105 | * @return RowDimension |
106 | 106 | */ |
107 | 107 | public function setRowHeight($pValue = -1) |
@@ -37,14 +37,14 @@ |
||
37 | 37 | const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous'; |
38 | 38 | const HORIZONTAL_JUSTIFY = 'justify'; |
39 | 39 | const HORIZONTAL_FILL = 'fill'; |
40 | - const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
40 | + const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
41 | 41 | |
42 | 42 | /* Vertical alignment styles */ |
43 | 43 | const VERTICAL_BOTTOM = 'bottom'; |
44 | 44 | const VERTICAL_TOP = 'top'; |
45 | 45 | const VERTICAL_CENTER = 'center'; |
46 | 46 | const VERTICAL_JUSTIFY = 'justify'; |
47 | - const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
47 | + const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only |
|
48 | 48 | |
49 | 49 | /* Read order */ |
50 | 50 | const READORDER_CONTEXT = 0; |