@@ -191,8 +191,7 @@ discard block |
||
191 | 191 | if ($item->isDir()) |
192 | 192 | { |
193 | 193 | FileHelper::copyTree($itemPath, $target . '/' . $baseName); |
194 | - } |
|
195 | - else if($item->isFile()) |
|
194 | + } else if($item->isFile()) |
|
196 | 195 | { |
197 | 196 | self::copyFile($itemPath, $target . '/' . $baseName); |
198 | 197 | } |
@@ -225,8 +224,7 @@ discard block |
||
225 | 224 | if(!file_exists($targetFolder)) |
226 | 225 | { |
227 | 226 | self::createFolder($targetFolder); |
228 | - } |
|
229 | - else if(!is_writable($targetFolder)) |
|
227 | + } else if(!is_writable($targetFolder)) |
|
230 | 228 | { |
231 | 229 | throw new FileHelper_Exception( |
232 | 230 | sprintf('Target folder [%s] is not writable.', basename($targetFolder)), |
@@ -715,8 +713,7 @@ discard block |
||
715 | 713 | if(isset($options['relative-path']) && $options['relative-path'] === true) |
716 | 714 | { |
717 | 715 | $finder->setPathmodeRelative(); |
718 | - } |
|
719 | - else if(isset($options['absolute-path']) && $options['absolute-path'] === true) |
|
716 | + } else if(isset($options['absolute-path']) && $options['absolute-path'] === true) |
|
720 | 717 | { |
721 | 718 | $finder->setPathmodeAbsolute(); |
722 | 719 | } |
@@ -251,8 +251,7 @@ discard block |
||
251 | 251 | if(isset($this->info['scheme'])) |
252 | 252 | { |
253 | 253 | $this->info['scheme'] = strtolower($this->info['scheme']); |
254 | - } |
|
255 | - else |
|
254 | + } else |
|
256 | 255 | { |
257 | 256 | $scheme = URLInfo_Schemes::detectScheme($this->url); |
258 | 257 | if(!empty($scheme)) { |
@@ -300,8 +299,7 @@ discard block |
||
300 | 299 | if(is_array($val)) |
301 | 300 | { |
302 | 301 | $val = $this->restoreUnicodeChars($val); |
303 | - } |
|
304 | - else |
|
302 | + } else |
|
305 | 303 | { |
306 | 304 | $val = $this->restoreUnicodeChar($val); |
307 | 305 | } |
@@ -398,8 +398,7 @@ discard block |
||
398 | 398 | if($datefrom instanceof DateTime) |
399 | 399 | { |
400 | 400 | $converter->setDateFrom($datefrom); |
401 | - } |
|
402 | - else |
|
401 | + } else |
|
403 | 402 | { |
404 | 403 | $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom)); |
405 | 404 | } |
@@ -407,8 +406,7 @@ discard block |
||
407 | 406 | if($dateto instanceof DateTime) |
408 | 407 | { |
409 | 408 | $converter->setDateTo($dateto); |
410 | - } |
|
411 | - else if($dateto > 0) |
|
409 | + } else if($dateto > 0) |
|
412 | 410 | { |
413 | 411 | $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto)); |
414 | 412 | } |
@@ -105,8 +105,7 @@ |
||
105 | 105 | if($date->format('d.m.Y') === $today->format('d.m.Y')) |
106 | 106 | { |
107 | 107 | $label = t('Today'); |
108 | - } |
|
109 | - else |
|
108 | + } else |
|
110 | 109 | { |
111 | 110 | $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' '; |
112 | 111 |
@@ -769,8 +769,7 @@ discard block |
||
769 | 769 | { |
770 | 770 | $number = null; |
771 | 771 | $empty = true; |
772 | - } |
|
773 | - else |
|
772 | + } else |
|
774 | 773 | { |
775 | 774 | $number = (float)$number * 1; |
776 | 775 | } |
@@ -922,7 +921,9 @@ discard block |
||
922 | 921 | { |
923 | 922 | $number = floor($this->getNumber()); |
924 | 923 | |
925 | - if($number % 2 == 1) $number--; |
|
924 | + if($number % 2 == 1) { |
|
925 | + $number--; |
|
926 | + } |
|
926 | 927 | |
927 | 928 | return $this->setNumber($number); |
928 | 929 | } |
@@ -938,7 +939,9 @@ discard block |
||
938 | 939 | { |
939 | 940 | $number = ceil($this->getNumber()); |
940 | 941 | |
941 | - if($number % 2 == 1) $number++; |
|
942 | + if($number % 2 == 1) { |
|
943 | + $number++; |
|
944 | + } |
|
942 | 945 | |
943 | 946 | return $this->setNumber($number); |
944 | 947 | } |
@@ -107,12 +107,10 @@ |
||
107 | 107 | if(is_object($origin)) |
108 | 108 | { |
109 | 109 | $description = get_class($origin); |
110 | - } |
|
111 | - else if(is_array($origin)) |
|
110 | + } else if(is_array($origin)) |
|
112 | 111 | { |
113 | 112 | $description = ConvertHelper::callback2string($origin); |
114 | - } |
|
115 | - else |
|
113 | + } else |
|
116 | 114 | { |
117 | 115 | $description = $origin; |
118 | 116 | } |
@@ -210,12 +210,10 @@ |
||
210 | 210 | if($length === 3) |
211 | 211 | { |
212 | 212 | return self::parseHEX3($hex); |
213 | - } |
|
214 | - else if($length === 6) |
|
213 | + } else if($length === 6) |
|
215 | 214 | { |
216 | 215 | return self::parseHEX6($hex); |
217 | - } |
|
218 | - else if ($length === 8) |
|
216 | + } else if ($length === 8) |
|
219 | 217 | { |
220 | 218 | return self::parseHEX8($hex); |
221 | 219 | } |
@@ -119,8 +119,7 @@ discard block |
||
119 | 119 | if($datetime instanceof Microtime_ParseResult) |
120 | 120 | { |
121 | 121 | $parsed = $datetime; |
122 | - } |
|
123 | - else |
|
122 | + } else |
|
124 | 123 | { |
125 | 124 | $parsed = $this->parseDate($datetime, $timeZone); |
126 | 125 | } |
@@ -128,8 +127,7 @@ discard block |
||
128 | 127 | try |
129 | 128 | { |
130 | 129 | parent::__construct($parsed->getDateTime(), $parsed->getTimeZone()); |
131 | - } |
|
132 | - catch (Exception $e) |
|
130 | + } catch (Exception $e) |
|
133 | 131 | { |
134 | 132 | throw new Microtime_Exception( |
135 | 133 | 'Failed to create date from string.', |
@@ -83,8 +83,7 @@ discard block |
||
83 | 83 | if(is_array($subject)) |
84 | 84 | { |
85 | 85 | $this->parseSerialized($subject); |
86 | - } |
|
87 | - else |
|
86 | + } else |
|
88 | 87 | { |
89 | 88 | $this->parseException($subject); |
90 | 89 | } |
@@ -432,8 +431,7 @@ discard block |
||
432 | 431 | if (is_integer($code)) |
433 | 432 | { |
434 | 433 | $this->code = $code; |
435 | - } |
|
436 | - else |
|
434 | + } else |
|
437 | 435 | { |
438 | 436 | $this->message = 'Original error code: [' . $code . ']. ' . $this->message; |
439 | 437 | } |