@@ -516,7 +516,7 @@ |
||
516 | 516 | * @param string $themeFillTint |
517 | 517 | */ |
518 | 518 | protected function generateSHD($val, $color = '', $fill = '', |
519 | - $themeFill = '', $themeFillTint = '') |
|
519 | + $themeFill = '', $themeFillTint = '') |
|
520 | 520 | { |
521 | 521 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . ':shd ' . |
522 | 522 | CreateElement::NAMESPACEWORD . ':val="' . $val . '"'; |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * @access protected |
203 | 203 | */ |
204 | 204 | protected function generateSHD($val = 'horz-cross', $color = 'ff0000', |
205 | - $fill = '', $bgcolor = '', $themeFill = '') |
|
205 | + $fill = '', $bgcolor = '', $themeFill = '') |
|
206 | 206 | { |
207 | 207 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . ':shd w:val="' . |
208 | 208 | $val . '"'; |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * @access protected |
238 | 238 | */ |
239 | 239 | protected function generateTBLBOTTOM($val="single", $sz="4", $space='0', |
240 | - $color='auto') |
|
240 | + $color='auto') |
|
241 | 241 | { |
242 | 242 | $xml = '<' . CreateElement::NAMESPACEWORD . |
243 | 243 | ':bottom ' . CreateElement::NAMESPACEWORD . |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | * @access protected |
320 | 320 | */ |
321 | 321 | protected function generateTBLINSIDEH($val = "single", $sz = "4", |
322 | - $space = '0', $color = 'auto') |
|
322 | + $space = '0', $color = 'auto') |
|
323 | 323 | { |
324 | 324 | $xml = '<' . CreateElement::NAMESPACEWORD . |
325 | 325 | ':insideH ' . CreateElement::NAMESPACEWORD . |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | * @access protected |
342 | 342 | */ |
343 | 343 | protected function generateTBLINSIDEV($val = "single", $sz= "4", $space='0', |
344 | - $color= 'auto') |
|
344 | + $color= 'auto') |
|
345 | 345 | { |
346 | 346 | $xml = '<' . CreateElement::NAMESPACEWORD . ':insideV ' . |
347 | 347 | CreateElement::NAMESPACEWORD . ':val="' . $val . '" ' . |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | * @access protected |
363 | 363 | */ |
364 | 364 | protected function generateTBLLEFT($val = "single", $sz = "4", $space = '0', |
365 | - $color = 'auto') |
|
365 | + $color = 'auto') |
|
366 | 366 | { |
367 | 367 | $xml = '<' . CreateElement::NAMESPACEWORD . ':left ' . |
368 | 368 | CreateElement::NAMESPACEWORD . ':val="' . $val . '" ' . |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | * @access protected |
449 | 449 | */ |
450 | 450 | protected function generateTBLTOP($val = 'single', $sz = '4', $space = '0', |
451 | - $color = 'auto') |
|
451 | + $color = 'auto') |
|
452 | 452 | { |
453 | 453 | $xml = '<' . CreateElement::NAMESPACEWORD . ':top ' . |
454 | 454 | CreateElement::NAMESPACEWORD . ':val="' . $val . '" ' . |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | protected function generateWORKSHEET() |
171 | 171 | { |
172 | 172 | $this->_xml = '<?xml version="1.0" encoding="UTF-8" ' . |
173 | - 'standalone="yes" ?><worksheet ' . |
|
174 | - 'xmlns="http://schemas.openxmlformats.org/' . |
|
175 | - 'spreadsheetml/2006/main" ' . 'xmlns:r="http://schemas.' . |
|
176 | - 'openxmlformats.org/officeDocument/2006/relationships"' . |
|
177 | - '>__GENERATEWORKSHEET__</worksheet>'; |
|
173 | + 'standalone="yes" ?><worksheet ' . |
|
174 | + 'xmlns="http://schemas.openxmlformats.org/' . |
|
175 | + 'spreadsheetml/2006/main" ' . 'xmlns:r="http://schemas.' . |
|
176 | + 'openxmlformats.org/officeDocument/2006/relationships"' . |
|
177 | + '>__GENERATEWORKSHEET__</worksheet>'; |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | /** |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | * @access protected |
217 | 217 | */ |
218 | 218 | protected function generateSHEETVIEW($tabSelected = '1', |
219 | - $workbookViewId = '0') |
|
219 | + $workbookViewId = '0') |
|
220 | 220 | { |
221 | 221 | $xml = '<sheetView tabSelected="' . $tabSelected . |
222 | 222 | '" workbookViewId="' . $workbookViewId . |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | * @access protected |
248 | 248 | */ |
249 | 249 | protected function generateSHEETFORMATPR($baseColWidth = '10', |
250 | - $defaultRowHeight = '15') |
|
250 | + $defaultRowHeight = '15') |
|
251 | 251 | { |
252 | 252 | $xml = '<sheetFormatPr baseColWidth="' . $baseColWidth . |
253 | 253 | '" defaultRowHeight="' . $defaultRowHeight . |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | * @access protected |
278 | 278 | */ |
279 | 279 | protected function generateCOL($min = '1', $max = '1', |
280 | - $width = '11.85546875', $customWidth = '1') |
|
280 | + $width = '11.85546875', $customWidth = '1') |
|
281 | 281 | { |
282 | 282 | $xml = '<col min="' . $min . '" max="' . $max . '" width="' . $width . |
283 | 283 | '" customWidth="' . $customWidth . '"></col>'; |
@@ -359,8 +359,8 @@ discard block |
||
359 | 359 | * @access protected |
360 | 360 | */ |
361 | 361 | protected function generatePAGEMARGINS($left = '0.7', $rigth = '0.7', |
362 | - $bottom = '0.75', $top = '0.75', |
|
363 | - $header = '0.3', $footer = '0.3') |
|
362 | + $bottom = '0.75', $top = '0.75', |
|
363 | + $header = '0.3', $footer = '0.3') |
|
364 | 364 | { |
365 | 365 | $xml = '<pageMargins left="' . $left . '" right="' . $rigth . |
366 | 366 | '" top="' . $top . '" bottom="' . $bottom . |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | * @access protected |
380 | 380 | */ |
381 | 381 | protected function generatePAGESETUP($paperSize = '9', |
382 | - $orientation = 'portrait', $id = '1') |
|
382 | + $orientation = 'portrait', $id = '1') |
|
383 | 383 | { |
384 | 384 | $xml = '<pageSetup paperSize="' . $paperSize . |
385 | 385 | '" orientation="' . $orientation . '" r:id="rId' . $id . |
@@ -2438,7 +2438,7 @@ |
||
2438 | 2438 | 'relationships/' . $arrArgs[1]; |
2439 | 2439 | |
2440 | 2440 | return '<Relationship Id="' . $arrArgs[0] . '" Type="' . $strType . |
2441 | - '" Target="' . $arrArgs[2] . '"></Relationship>'; |
|
2441 | + '" Target="' . $arrArgs[2] . '"></Relationship>'; |
|
2442 | 2442 | } |
2443 | 2443 | |
2444 | 2444 | /** |
@@ -1542,7 +1542,7 @@ discard block |
||
1542 | 1542 | * @param string $customStyle |
1543 | 1543 | */ |
1544 | 1544 | protected function generateSTYLE($type, $styleId, $default = '', |
1545 | - $customStyle = '') |
|
1545 | + $customStyle = '') |
|
1546 | 1546 | { |
1547 | 1547 | $this->_xml .= '<' . CreateElement::NAMESPACEWORD . |
1548 | 1548 | ':style ' . CreateElement::NAMESPACEWORD . |
@@ -1835,7 +1835,7 @@ discard block |
||
1835 | 1835 | * @param string $themeColor |
1836 | 1836 | */ |
1837 | 1837 | protected function generatePBDR_BOTTOM($val, $sz, $space, $color, |
1838 | - $themeColor) |
|
1838 | + $themeColor) |
|
1839 | 1839 | { |
1840 | 1840 | $xml = '<' . CreateElement::NAMESPACEWORD . |
1841 | 1841 | ':pBdr ' . CreateElement::NAMESPACEWORD . |
@@ -1979,7 +1979,7 @@ discard block |
||
1979 | 1979 | * @param string $themeFillTint |
1980 | 1980 | */ |
1981 | 1981 | protected function generateSHD($val, $color='', $fill='', $themeFill='', |
1982 | - $themeFillTint='') |
|
1982 | + $themeFillTint='') |
|
1983 | 1983 | { |
1984 | 1984 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . |
1985 | 1985 | ':shd ' . CreateElement::NAMESPACEWORD . |
@@ -2086,8 +2086,8 @@ discard block |
||
2086 | 2086 | * @param string $themeTint |
2087 | 2087 | */ |
2088 | 2088 | protected function generateTBLBORDERS_TOP($val, $sz = '', $space = '', |
2089 | - $color = '', $themeColor = '', |
|
2090 | - $themeTint ='') |
|
2089 | + $color = '', $themeColor = '', |
|
2090 | + $themeTint ='') |
|
2091 | 2091 | { |
2092 | 2092 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . |
2093 | 2093 | ':top ' . CreateElement::NAMESPACEWORD . |
@@ -2132,8 +2132,8 @@ discard block |
||
2132 | 2132 | * @param string $themeTint |
2133 | 2133 | */ |
2134 | 2134 | protected function generateTBLBORDERS_LEFT($val, $sz = '', $space = '', |
2135 | - $color = '', $themeColor = '', |
|
2136 | - $themeTint = '') |
|
2135 | + $color = '', $themeColor = '', |
|
2136 | + $themeTint = '') |
|
2137 | 2137 | { |
2138 | 2138 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . ':left ' . |
2139 | 2139 | CreateElement::NAMESPACEWORD . |
@@ -2178,8 +2178,8 @@ discard block |
||
2178 | 2178 | * @param string $themeTint |
2179 | 2179 | */ |
2180 | 2180 | protected function generateTBLBORDERS_BOTTOM($val, $sz = '', $space = '', |
2181 | - $color = '', $themeColor = '', |
|
2182 | - $themeTint = '') |
|
2181 | + $color = '', $themeColor = '', |
|
2182 | + $themeTint = '') |
|
2183 | 2183 | { |
2184 | 2184 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . |
2185 | 2185 | ':bottom ' . CreateElement::NAMESPACEWORD . |
@@ -2270,8 +2270,8 @@ discard block |
||
2270 | 2270 | * @param string $themeTint |
2271 | 2271 | */ |
2272 | 2272 | protected function generateTBLBORDERS_INSIDEH($val, $sz='', $space='', |
2273 | - $color='', $themeColor='', |
|
2274 | - $themeTint='') |
|
2273 | + $color='', $themeColor='', |
|
2274 | + $themeTint='') |
|
2275 | 2275 | { |
2276 | 2276 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . |
2277 | 2277 | ':insideH ' . CreateElement::NAMESPACEWORD . ':val="' . $val . '"'; |
@@ -2315,8 +2315,8 @@ discard block |
||
2315 | 2315 | * @param string $themeTint |
2316 | 2316 | */ |
2317 | 2317 | protected function generateTBLBORDERS_INSIDEV($val, $sz='', $space='', |
2318 | - $color='', $themeColor='', |
|
2319 | - $themeTint='') |
|
2318 | + $color='', $themeColor='', |
|
2319 | + $themeTint='') |
|
2320 | 2320 | { |
2321 | 2321 | $xmlAux = '<' . CreateElement::NAMESPACEWORD . |
2322 | 2322 | ':insideV ' . CreateElement::NAMESPACEWORD . ':val="' . $val . '"'; |
@@ -2451,7 +2451,7 @@ discard block |
||
2451 | 2451 | * @param string $cstheme |
2452 | 2452 | */ |
2453 | 2453 | protected function generateRFONTS($asciiTheme, $eastAsiaTheme, $hAnsiTheme, |
2454 | - $cstheme) |
|
2454 | + $cstheme) |
|
2455 | 2455 | { |
2456 | 2456 | $xml = '<' . CreateElement::NAMESPACEWORD . |
2457 | 2457 | ':rFonts ' . CreateElement::NAMESPACEWORD . |
@@ -1,22 +1,22 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Licensed to the Apache Software Foundation (ASF) under one or more |
|
4 | - * contributor license agreements. See the NOTICE file distributed with |
|
5 | - * this work for additional information regarding copyright ownership. |
|
6 | - * The ASF licenses this file to You under the Apache License, Version 2.0 |
|
7 | - * (the "License"); you may not use this file except in compliance with |
|
8 | - * the License. You may obtain a copy of the License at |
|
9 | - * |
|
10 | - * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | - * |
|
12 | - * Unless required by applicable law or agreed to in writing, software |
|
13 | - * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | - * See the License for the specific language governing permissions and |
|
16 | - * limitations under the License. |
|
17 | - * |
|
18 | - * @package log4php |
|
19 | - */ |
|
3 | + * Licensed to the Apache Software Foundation (ASF) under one or more |
|
4 | + * contributor license agreements. See the NOTICE file distributed with |
|
5 | + * this work for additional information regarding copyright ownership. |
|
6 | + * The ASF licenses this file to You under the Apache License, Version 2.0 |
|
7 | + * (the "License"); you may not use this file except in compliance with |
|
8 | + * the License. You may obtain a copy of the License at |
|
9 | + * |
|
10 | + * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | + * |
|
12 | + * Unless required by applicable law or agreed to in writing, software |
|
13 | + * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | + * See the License for the specific language governing permissions and |
|
16 | + * limitations under the License. |
|
17 | + * |
|
18 | + * @package log4php |
|
19 | + */ |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * Abstract class that defines output logs strategies. |
@@ -26,236 +26,236 @@ discard block |
||
26 | 26 | */ |
27 | 27 | abstract class LoggerAppender { |
28 | 28 | |
29 | - /** |
|
30 | - * @var boolean closed appender flag |
|
31 | - */ |
|
32 | - protected $closed = false; |
|
29 | + /** |
|
30 | + * @var boolean closed appender flag |
|
31 | + */ |
|
32 | + protected $closed = false; |
|
33 | 33 | |
34 | - /** |
|
35 | - * The first filter in the filter chain |
|
36 | - * @var LoggerFilter |
|
37 | - */ |
|
38 | - protected $filter = null; |
|
34 | + /** |
|
35 | + * The first filter in the filter chain |
|
36 | + * @var LoggerFilter |
|
37 | + */ |
|
38 | + protected $filter = null; |
|
39 | 39 | |
40 | - /** |
|
41 | - * LoggerLayout for this appender. It can be null if appender has its own layout |
|
42 | - * @var LoggerLayout |
|
43 | - */ |
|
44 | - protected $layout = null; |
|
40 | + /** |
|
41 | + * LoggerLayout for this appender. It can be null if appender has its own layout |
|
42 | + * @var LoggerLayout |
|
43 | + */ |
|
44 | + protected $layout = null; |
|
45 | 45 | |
46 | - /** |
|
47 | - * @var string Appender name |
|
48 | - */ |
|
49 | - protected $name; |
|
46 | + /** |
|
47 | + * @var string Appender name |
|
48 | + */ |
|
49 | + protected $name; |
|
50 | 50 | |
51 | - /** |
|
52 | - * @var LoggerLevel There is no level threshold filtering by default. |
|
53 | - */ |
|
54 | - protected $threshold = null; |
|
51 | + /** |
|
52 | + * @var LoggerLevel There is no level threshold filtering by default. |
|
53 | + */ |
|
54 | + protected $threshold = null; |
|
55 | 55 | |
56 | - /** |
|
57 | - * @var boolean needs a layout formatting ? |
|
58 | - */ |
|
59 | - protected $requiresLayout = false; |
|
56 | + /** |
|
57 | + * @var boolean needs a layout formatting ? |
|
58 | + */ |
|
59 | + protected $requiresLayout = false; |
|
60 | 60 | |
61 | - /** |
|
62 | - * Constructor |
|
63 | - * |
|
64 | - * @param string $name appender name |
|
65 | - */ |
|
66 | - public function __construct($name = '') { |
|
67 | - $this->name = $name; |
|
68 | - } |
|
61 | + /** |
|
62 | + * Constructor |
|
63 | + * |
|
64 | + * @param string $name appender name |
|
65 | + */ |
|
66 | + public function __construct($name = '') { |
|
67 | + $this->name = $name; |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * Add a filter to the end of the filter list. |
|
72 | - * |
|
73 | - * @param LoggerFilter $newFilter add a new LoggerFilter |
|
74 | - */ |
|
75 | - public function addFilter($newFilter) { |
|
76 | - if($this->filter === null) { |
|
77 | - $this->filter = $newFilter; |
|
78 | - } else { |
|
79 | - $this->filter->addNext($newFilter); |
|
80 | - } |
|
81 | - } |
|
70 | + /** |
|
71 | + * Add a filter to the end of the filter list. |
|
72 | + * |
|
73 | + * @param LoggerFilter $newFilter add a new LoggerFilter |
|
74 | + */ |
|
75 | + public function addFilter($newFilter) { |
|
76 | + if($this->filter === null) { |
|
77 | + $this->filter = $newFilter; |
|
78 | + } else { |
|
79 | + $this->filter->addNext($newFilter); |
|
80 | + } |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * Clear the list of filters by removing all the filters in it. |
|
85 | - * @abstract |
|
86 | - */ |
|
87 | - public function clearFilters() { |
|
88 | - unset($this->filter); |
|
89 | - $this->filter = null; |
|
90 | - } |
|
83 | + /** |
|
84 | + * Clear the list of filters by removing all the filters in it. |
|
85 | + * @abstract |
|
86 | + */ |
|
87 | + public function clearFilters() { |
|
88 | + unset($this->filter); |
|
89 | + $this->filter = null; |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * Return the first filter in the filter chain for this Appender. |
|
94 | - * The return value may be <i>null</i> if no is filter is set. |
|
95 | - * @return LoggerFilter |
|
96 | - */ |
|
97 | - public function getFilter() { |
|
98 | - return $this->filter; |
|
99 | - } |
|
92 | + /** |
|
93 | + * Return the first filter in the filter chain for this Appender. |
|
94 | + * The return value may be <i>null</i> if no is filter is set. |
|
95 | + * @return LoggerFilter |
|
96 | + */ |
|
97 | + public function getFilter() { |
|
98 | + return $this->filter; |
|
99 | + } |
|
100 | 100 | |
101 | - /** |
|
102 | - * Return the first filter in the filter chain for this Appender. |
|
103 | - * The return value may be <i>null</i> if no is filter is set. |
|
104 | - * @return LoggerFilter |
|
105 | - */ |
|
106 | - public function getFirstFilter() { |
|
107 | - return $this->filter; |
|
108 | - } |
|
101 | + /** |
|
102 | + * Return the first filter in the filter chain for this Appender. |
|
103 | + * The return value may be <i>null</i> if no is filter is set. |
|
104 | + * @return LoggerFilter |
|
105 | + */ |
|
106 | + public function getFirstFilter() { |
|
107 | + return $this->filter; |
|
108 | + } |
|
109 | 109 | |
110 | 110 | |
111 | - /** |
|
112 | - * This method performs threshold checks and invokes filters before |
|
113 | - * delegating actual logging to the subclasses specific <i>append()</i> method. |
|
114 | - * @see LoggerAppender::doAppend() |
|
115 | - * @param LoggerLoggingEvent $event |
|
116 | - */ |
|
117 | - public function doAppend(LoggerLoggingEvent $event) { |
|
118 | - if($this->closed) { |
|
119 | - return; |
|
120 | - } |
|
111 | + /** |
|
112 | + * This method performs threshold checks and invokes filters before |
|
113 | + * delegating actual logging to the subclasses specific <i>append()</i> method. |
|
114 | + * @see LoggerAppender::doAppend() |
|
115 | + * @param LoggerLoggingEvent $event |
|
116 | + */ |
|
117 | + public function doAppend(LoggerLoggingEvent $event) { |
|
118 | + if($this->closed) { |
|
119 | + return; |
|
120 | + } |
|
121 | 121 | |
122 | - if(!$this->isAsSevereAsThreshold($event->getLevel())) { |
|
123 | - return; |
|
124 | - } |
|
122 | + if(!$this->isAsSevereAsThreshold($event->getLevel())) { |
|
123 | + return; |
|
124 | + } |
|
125 | 125 | |
126 | - $f = $this->getFirstFilter(); |
|
127 | - while($f !== null) { |
|
128 | - switch ($f->decide($event)) { |
|
129 | - case LoggerFilter::DENY: return; |
|
130 | - case LoggerFilter::ACCEPT: return $this->append($event); |
|
131 | - case LoggerFilter::NEUTRAL: $f = $f->getNext(); |
|
132 | - } |
|
133 | - } |
|
134 | - $this->append($event); |
|
135 | - } |
|
126 | + $f = $this->getFirstFilter(); |
|
127 | + while($f !== null) { |
|
128 | + switch ($f->decide($event)) { |
|
129 | + case LoggerFilter::DENY: return; |
|
130 | + case LoggerFilter::ACCEPT: return $this->append($event); |
|
131 | + case LoggerFilter::NEUTRAL: $f = $f->getNext(); |
|
132 | + } |
|
133 | + } |
|
134 | + $this->append($event); |
|
135 | + } |
|
136 | 136 | |
137 | - /** |
|
138 | - * Set the Layout for this appender. |
|
139 | - * @see LoggerAppender::setLayout() |
|
140 | - * @param LoggerLayout $layout |
|
141 | - */ |
|
142 | - public function setLayout($layout) { |
|
143 | - if($this->requiresLayout()) { |
|
144 | - $this->layout = $layout; |
|
145 | - } |
|
146 | - } |
|
137 | + /** |
|
138 | + * Set the Layout for this appender. |
|
139 | + * @see LoggerAppender::setLayout() |
|
140 | + * @param LoggerLayout $layout |
|
141 | + */ |
|
142 | + public function setLayout($layout) { |
|
143 | + if($this->requiresLayout()) { |
|
144 | + $this->layout = $layout; |
|
145 | + } |
|
146 | + } |
|
147 | 147 | |
148 | - /** |
|
149 | - * Returns this appender layout. |
|
150 | - * @see LoggerAppender::getLayout() |
|
151 | - * @return LoggerLayout |
|
152 | - */ |
|
153 | - public function getLayout() { |
|
154 | - return $this->layout; |
|
155 | - } |
|
148 | + /** |
|
149 | + * Returns this appender layout. |
|
150 | + * @see LoggerAppender::getLayout() |
|
151 | + * @return LoggerLayout |
|
152 | + */ |
|
153 | + public function getLayout() { |
|
154 | + return $this->layout; |
|
155 | + } |
|
156 | 156 | |
157 | - /** |
|
158 | - * Configurators call this method to determine if the appender |
|
159 | - * requires a layout. |
|
160 | - * |
|
161 | - * <p>If this method returns <i>true</i>, meaning that layout is required, |
|
162 | - * then the configurator will configure a layout using the configuration |
|
163 | - * information at its disposal. If this method returns <i>false</i>, |
|
164 | - * meaning that a layout is not required, then layout configuration will be |
|
165 | - * skipped even if there is available layout configuration |
|
166 | - * information at the disposal of the configurator.</p> |
|
167 | - * |
|
168 | - * <p>In the rather exceptional case, where the appender |
|
169 | - * implementation admits a layout but can also work without it, then |
|
170 | - * the appender should return <i>true</i>.</p> |
|
171 | - * |
|
172 | - * @see LoggerAppender::requiresLayout() |
|
173 | - * @return boolean |
|
174 | - */ |
|
175 | - public function requiresLayout() { |
|
176 | - return $this->requiresLayout; |
|
177 | - } |
|
157 | + /** |
|
158 | + * Configurators call this method to determine if the appender |
|
159 | + * requires a layout. |
|
160 | + * |
|
161 | + * <p>If this method returns <i>true</i>, meaning that layout is required, |
|
162 | + * then the configurator will configure a layout using the configuration |
|
163 | + * information at its disposal. If this method returns <i>false</i>, |
|
164 | + * meaning that a layout is not required, then layout configuration will be |
|
165 | + * skipped even if there is available layout configuration |
|
166 | + * information at the disposal of the configurator.</p> |
|
167 | + * |
|
168 | + * <p>In the rather exceptional case, where the appender |
|
169 | + * implementation admits a layout but can also work without it, then |
|
170 | + * the appender should return <i>true</i>.</p> |
|
171 | + * |
|
172 | + * @see LoggerAppender::requiresLayout() |
|
173 | + * @return boolean |
|
174 | + */ |
|
175 | + public function requiresLayout() { |
|
176 | + return $this->requiresLayout; |
|
177 | + } |
|
178 | 178 | |
179 | - /** |
|
180 | - * Get the name of this appender. |
|
181 | - * @see LoggerAppender::getName() |
|
182 | - * @return string |
|
183 | - */ |
|
184 | - public function getName() { |
|
185 | - return $this->name; |
|
186 | - } |
|
179 | + /** |
|
180 | + * Get the name of this appender. |
|
181 | + * @see LoggerAppender::getName() |
|
182 | + * @return string |
|
183 | + */ |
|
184 | + public function getName() { |
|
185 | + return $this->name; |
|
186 | + } |
|
187 | 187 | |
188 | 188 | /** |
189 | - * Set the name of this appender. |
|
190 | - * |
|
191 | - * The name is used by other components to identify this appender. |
|
192 | - * |
|
193 | - * |
|
194 | - * @param string $name |
|
195 | - */ |
|
196 | - public function setName($name) { |
|
197 | - $this->name = $name; |
|
198 | - } |
|
189 | + * Set the name of this appender. |
|
190 | + * |
|
191 | + * The name is used by other components to identify this appender. |
|
192 | + * |
|
193 | + * |
|
194 | + * @param string $name |
|
195 | + */ |
|
196 | + public function setName($name) { |
|
197 | + $this->name = $name; |
|
198 | + } |
|
199 | 199 | |
200 | - /** |
|
201 | - * Returns this appenders threshold level. |
|
202 | - * See the {@link setThreshold()} method for the meaning of this option. |
|
203 | - * @return LoggerLevel |
|
204 | - */ |
|
205 | - public function getThreshold() { |
|
206 | - return $this->threshold; |
|
207 | - } |
|
200 | + /** |
|
201 | + * Returns this appenders threshold level. |
|
202 | + * See the {@link setThreshold()} method for the meaning of this option. |
|
203 | + * @return LoggerLevel |
|
204 | + */ |
|
205 | + public function getThreshold() { |
|
206 | + return $this->threshold; |
|
207 | + } |
|
208 | 208 | |
209 | - /** |
|
210 | - * Set the threshold level of this appender. |
|
211 | - * |
|
212 | - * @param mixed $threshold can be a {@link LoggerLevel} object or a string. |
|
213 | - * @see LoggerOptionConverter::toLevel() |
|
214 | - */ |
|
215 | - public function setThreshold($threshold) { |
|
216 | - if(is_string($threshold)) { |
|
217 | - $this->threshold = LoggerOptionConverter::toLevel($threshold, null); |
|
218 | - } else if($threshold instanceof LoggerLevel) { |
|
219 | - $this->threshold = $threshold; |
|
220 | - } |
|
221 | - } |
|
209 | + /** |
|
210 | + * Set the threshold level of this appender. |
|
211 | + * |
|
212 | + * @param mixed $threshold can be a {@link LoggerLevel} object or a string. |
|
213 | + * @see LoggerOptionConverter::toLevel() |
|
214 | + */ |
|
215 | + public function setThreshold($threshold) { |
|
216 | + if(is_string($threshold)) { |
|
217 | + $this->threshold = LoggerOptionConverter::toLevel($threshold, null); |
|
218 | + } else if($threshold instanceof LoggerLevel) { |
|
219 | + $this->threshold = $threshold; |
|
220 | + } |
|
221 | + } |
|
222 | 222 | |
223 | - /** |
|
224 | - * Check whether the message level is below the appender's threshold. |
|
225 | - * |
|
226 | - * |
|
227 | - * If there is no threshold set, then the return value is always <i>true</i>. |
|
228 | - * @param LoggerLevel $level |
|
229 | - * @return boolean true if priority is greater or equal than threshold |
|
230 | - */ |
|
231 | - public function isAsSevereAsThreshold($level) { |
|
232 | - if($this->threshold === null) { |
|
233 | - return true; |
|
234 | - } |
|
235 | - return $level->isGreaterOrEqual($this->getThreshold()); |
|
236 | - } |
|
223 | + /** |
|
224 | + * Check whether the message level is below the appender's threshold. |
|
225 | + * |
|
226 | + * |
|
227 | + * If there is no threshold set, then the return value is always <i>true</i>. |
|
228 | + * @param LoggerLevel $level |
|
229 | + * @return boolean true if priority is greater or equal than threshold |
|
230 | + */ |
|
231 | + public function isAsSevereAsThreshold($level) { |
|
232 | + if($this->threshold === null) { |
|
233 | + return true; |
|
234 | + } |
|
235 | + return $level->isGreaterOrEqual($this->getThreshold()); |
|
236 | + } |
|
237 | 237 | |
238 | - /** |
|
239 | - * Derived appenders should override this method if option structure |
|
240 | - * requires it. |
|
241 | - */ |
|
242 | - abstract public function activateOptions(); |
|
238 | + /** |
|
239 | + * Derived appenders should override this method if option structure |
|
240 | + * requires it. |
|
241 | + */ |
|
242 | + abstract public function activateOptions(); |
|
243 | 243 | |
244 | - /** |
|
245 | - * Subclasses of {@link LoggerAppender} should implement |
|
246 | - * this method to perform actual logging. |
|
247 | - * |
|
248 | - * @param LoggerLoggingEvent $event |
|
249 | - * @see doAppend() |
|
250 | - * @abstract |
|
251 | - */ |
|
252 | - abstract protected function append(LoggerLoggingEvent $event); |
|
244 | + /** |
|
245 | + * Subclasses of {@link LoggerAppender} should implement |
|
246 | + * this method to perform actual logging. |
|
247 | + * |
|
248 | + * @param LoggerLoggingEvent $event |
|
249 | + * @see doAppend() |
|
250 | + * @abstract |
|
251 | + */ |
|
252 | + abstract protected function append(LoggerLoggingEvent $event); |
|
253 | 253 | |
254 | - /** |
|
255 | - * Release any resources allocated. |
|
256 | - * Subclasses of {@link LoggerAppender} should implement |
|
257 | - * this method to perform proper closing procedures. |
|
258 | - * @abstract |
|
259 | - */ |
|
260 | - abstract public function close(); |
|
254 | + /** |
|
255 | + * Release any resources allocated. |
|
256 | + * Subclasses of {@link LoggerAppender} should implement |
|
257 | + * this method to perform proper closing procedures. |
|
258 | + * @abstract |
|
259 | + */ |
|
260 | + abstract public function close(); |
|
261 | 261 | } |
@@ -1,22 +1,22 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Licensed to the Apache Software Foundation (ASF) under one or more |
|
4 | - * contributor license agreements. See the NOTICE file distributed with |
|
5 | - * this work for additional information regarding copyright ownership. |
|
6 | - * The ASF licenses this file to You under the Apache License, Version 2.0 |
|
7 | - * (the "License"); you may not use this file except in compliance with |
|
8 | - * the License. You may obtain a copy of the License at |
|
9 | - * |
|
10 | - * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | - * |
|
12 | - * Unless required by applicable law or agreed to in writing, software |
|
13 | - * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | - * See the License for the specific language governing permissions and |
|
16 | - * limitations under the License. |
|
17 | - * |
|
18 | - * @package log4php |
|
19 | - */ |
|
3 | + * Licensed to the Apache Software Foundation (ASF) under one or more |
|
4 | + * contributor license agreements. See the NOTICE file distributed with |
|
5 | + * this work for additional information regarding copyright ownership. |
|
6 | + * The ASF licenses this file to You under the Apache License, Version 2.0 |
|
7 | + * (the "License"); you may not use this file except in compliance with |
|
8 | + * the License. You may obtain a copy of the License at |
|
9 | + * |
|
10 | + * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | + * |
|
12 | + * Unless required by applicable law or agreed to in writing, software |
|
13 | + * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | + * See the License for the specific language governing permissions and |
|
16 | + * limitations under the License. |
|
17 | + * |
|
18 | + * @package log4php |
|
19 | + */ |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * LoggerException class |
@@ -1,22 +1,22 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Licensed to the Apache Software Foundation (ASF) under one or more |
|
4 | - * contributor license agreements. See the NOTICE file distributed with |
|
5 | - * this work for additional information regarding copyright ownership. |
|
6 | - * The ASF licenses this file to You under the Apache License, Version 2.0 |
|
7 | - * (the "License"); you may not use this file except in compliance with |
|
8 | - * the License. You may obtain a copy of the License at |
|
9 | - * |
|
10 | - * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | - * |
|
12 | - * Unless required by applicable law or agreed to in writing, software |
|
13 | - * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | - * See the License for the specific language governing permissions and |
|
16 | - * limitations under the License. |
|
17 | - * |
|
18 | - * @package log4php |
|
19 | - */ |
|
3 | + * Licensed to the Apache Software Foundation (ASF) under one or more |
|
4 | + * contributor license agreements. See the NOTICE file distributed with |
|
5 | + * this work for additional information regarding copyright ownership. |
|
6 | + * The ASF licenses this file to You under the Apache License, Version 2.0 |
|
7 | + * (the "License"); you may not use this file except in compliance with |
|
8 | + * the License. You may obtain a copy of the License at |
|
9 | + * |
|
10 | + * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | + * |
|
12 | + * Unless required by applicable law or agreed to in writing, software |
|
13 | + * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | + * See the License for the specific language governing permissions and |
|
16 | + * limitations under the License. |
|
17 | + * |
|
18 | + * @package log4php |
|
19 | + */ |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @package log4php |
@@ -24,27 +24,27 @@ discard block |
||
24 | 24 | */ |
25 | 25 | class LoggerMDCPatternConverter extends LoggerPatternConverter { |
26 | 26 | |
27 | - /** |
|
28 | - * @var string |
|
29 | - */ |
|
30 | - private $key; |
|
27 | + /** |
|
28 | + * @var string |
|
29 | + */ |
|
30 | + private $key; |
|
31 | 31 | |
32 | - /** |
|
33 | - * Constructor |
|
34 | - * |
|
35 | - * @param string $formattingInfo |
|
36 | - * @param string $key |
|
37 | - */ |
|
38 | - public function __construct($formattingInfo, $key) { |
|
39 | - parent::__construct($formattingInfo); |
|
40 | - $this->key = $key; |
|
41 | - } |
|
32 | + /** |
|
33 | + * Constructor |
|
34 | + * |
|
35 | + * @param string $formattingInfo |
|
36 | + * @param string $key |
|
37 | + */ |
|
38 | + public function __construct($formattingInfo, $key) { |
|
39 | + parent::__construct($formattingInfo); |
|
40 | + $this->key = $key; |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @param LoggerLoggingEvent $event |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function convert($event) { |
|
48 | - return $event->getMDC($this->key); |
|
49 | - } |
|
43 | + /** |
|
44 | + * @param LoggerLoggingEvent $event |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function convert($event) { |
|
48 | + return $event->getMDC($this->key); |
|
49 | + } |
|
50 | 50 | } |
@@ -24,30 +24,30 @@ |
||
24 | 24 | */ |
25 | 25 | class LoggerDatePatternConverter extends LoggerPatternConverter { |
26 | 26 | |
27 | - /** |
|
28 | - * @var string |
|
29 | - */ |
|
30 | - private $df; |
|
27 | + /** |
|
28 | + * @var string |
|
29 | + */ |
|
30 | + private $df; |
|
31 | 31 | |
32 | - /** |
|
33 | - * Constructor |
|
34 | - * |
|
35 | - * @param string $formattingInfo |
|
36 | - * @param string $df |
|
37 | - */ |
|
38 | - public function __construct($formattingInfo, $df) { |
|
39 | - parent::__construct($formattingInfo); |
|
40 | - $this->df = $df; |
|
41 | - } |
|
32 | + /** |
|
33 | + * Constructor |
|
34 | + * |
|
35 | + * @param string $formattingInfo |
|
36 | + * @param string $df |
|
37 | + */ |
|
38 | + public function __construct($formattingInfo, $df) { |
|
39 | + parent::__construct($formattingInfo); |
|
40 | + $this->df = $df; |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @param LoggerLoggingEvent $event |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function convert($event) { |
|
48 | - $timeStamp = $event->getTimeStamp(); |
|
49 | - $usecs = round(($timeStamp - (int)$timeStamp) * 1000); |
|
50 | - $this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' . sprintf('%03d', $usecs), $this->df); |
|
51 | - return date($this->df, $event->getTimeStamp()); |
|
52 | - } |
|
43 | + /** |
|
44 | + * @param LoggerLoggingEvent $event |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function convert($event) { |
|
48 | + $timeStamp = $event->getTimeStamp(); |
|
49 | + $usecs = round(($timeStamp - (int)$timeStamp) * 1000); |
|
50 | + $this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' . sprintf('%03d', $usecs), $this->df); |
|
51 | + return date($this->df, $event->getTimeStamp()); |
|
52 | + } |
|
53 | 53 | } |