@@ -163,8 +163,7 @@ |
||
| 163 | 163 | if($section->isDefault()) |
| 164 | 164 | { |
| 165 | 165 | $result = array_merge($result, $section->toArray()); |
| 166 | - } |
|
| 167 | - else |
|
| 166 | + } else |
|
| 168 | 167 | { |
| 169 | 168 | $result[$section->getName()] = $section->toArray(); |
| 170 | 169 | } |
@@ -159,8 +159,7 @@ discard block |
||
| 159 | 159 | if($hash === true) |
| 160 | 160 | { |
| 161 | 161 | $hash = 'true'; |
| 162 | - } |
|
| 163 | - else if($hash === false) |
|
| 162 | + } else if($hash === false) |
|
| 164 | 163 | { |
| 165 | 164 | $hash = 'false'; |
| 166 | 165 | } |
@@ -184,8 +183,7 @@ discard block |
||
| 184 | 183 | if($string === false) |
| 185 | 184 | { |
| 186 | 185 | $string = ''; |
| 187 | - } |
|
| 188 | - else if($quoteStyle === self::QUOTE_STYLE_SINGLE) |
|
| 186 | + } else if($quoteStyle === self::QUOTE_STYLE_SINGLE) |
|
| 189 | 187 | { |
| 190 | 188 | $string = mb_substr($string, 1, mb_strlen($string)-2); |
| 191 | 189 | $string = "'".str_replace("'", "\'", $string)."'"; |
@@ -322,8 +322,7 @@ |
||
| 322 | 322 | if($this->current < 1) |
| 323 | 323 | { |
| 324 | 324 | $this->current = 1; |
| 325 | - } |
|
| 326 | - else if($this->current > $pages) |
|
| 325 | + } else if($this->current > $pages) |
|
| 327 | 326 | { |
| 328 | 327 | $this->current = $pages; |
| 329 | 328 | } |
@@ -202,8 +202,7 @@ |
||
| 202 | 202 | if(!$this->isCommitted()) { |
| 203 | 203 | $this->createCommit($message)->execute(); |
| 204 | 204 | $this->clearCache(); |
| 205 | - } |
|
| 206 | - else |
|
| 205 | + } else |
|
| 207 | 206 | { |
| 208 | 207 | $this->log('Already committed, nothing to do.'); |
| 209 | 208 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if(empty($lines)) |
| 59 | 59 | { |
| 60 | 60 | $this->status = self::STATUS_NOT_MODIFIED; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->status = self::STATUS_UNKNOWN; |
| 65 | 64 | |
@@ -65,8 +65,7 @@ discard block |
||
| 65 | 65 | if(isset($data['serialized'])) |
| 66 | 66 | { |
| 67 | 67 | $this->parseSerialized($data['serialized']); |
| 68 | - } |
|
| 69 | - else |
|
| 68 | + } else |
|
| 70 | 69 | { |
| 71 | 70 | $this->parseTrace($data['trace']); |
| 72 | 71 | $this->position = $data['position']; |
@@ -75,8 +74,7 @@ discard block |
||
| 75 | 74 | if($this->hasClass()) |
| 76 | 75 | { |
| 77 | 76 | $this->type = self::TYPE_METHOD_CALL; |
| 78 | - } |
|
| 79 | - else if($this->hasFunction()) |
|
| 77 | + } else if($this->hasFunction()) |
|
| 80 | 78 | { |
| 81 | 79 | $this->type = self::TYPE_FUNCTION_CALL; |
| 82 | 80 | } |
@@ -55,8 +55,7 @@ |
||
| 55 | 55 | if(is_array($serialized)) |
| 56 | 56 | { |
| 57 | 57 | $this->parseSerialized($serialized); |
| 58 | - } |
|
| 59 | - else |
|
| 58 | + } else |
|
| 60 | 59 | { |
| 61 | 60 | $this->parseValue($value); |
| 62 | 61 | } |
@@ -59,8 +59,7 @@ discard block |
||
| 59 | 59 | try |
| 60 | 60 | { |
| 61 | 61 | throw new BaseException(''); |
| 62 | - } |
|
| 63 | - catch(BaseException $e) |
|
| 62 | + } catch(BaseException $e) |
|
| 64 | 63 | { |
| 65 | 64 | echo self::createInfo($e)->toString(); |
| 66 | 65 | } |
@@ -74,8 +73,7 @@ discard block |
||
| 74 | 73 | try |
| 75 | 74 | { |
| 76 | 75 | throw new BaseException(''); |
| 77 | - } |
|
| 78 | - catch(BaseException $e) |
|
| 76 | + } catch(BaseException $e) |
|
| 79 | 77 | { |
| 80 | 78 | echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">'; |
| 81 | 79 | echo self::createInfo($e)->toString(); |
@@ -89,14 +89,12 @@ discard block |
||
| 89 | 89 | if($startChar === ';') |
| 90 | 90 | { |
| 91 | 91 | $this->type = self::TYPE_COMMENT; |
| 92 | - } |
|
| 93 | - else if($startChar === '[') |
|
| 92 | + } else if($startChar === '[') |
|
| 94 | 93 | { |
| 95 | 94 | $this->type = self::TYPE_SECTION_DECLARATION; |
| 96 | 95 | $this->sectionName = trim($this->trimmed, '[]'); |
| 97 | 96 | $this->sectionName = trim($this->sectionName); // remove any whitespace |
| 98 | - } |
|
| 99 | - else |
|
| 97 | + } else |
|
| 100 | 98 | { |
| 101 | 99 | $pos = strpos($this->trimmed, '='); |
| 102 | 100 | if($pos === false) |
@@ -122,8 +120,7 @@ discard block |
||
| 122 | 120 | { |
| 123 | 121 | $value = trim($value, '"'); |
| 124 | 122 | $this->quoteStyle = '"'; |
| 125 | - } |
|
| 126 | - else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'") |
|
| 123 | + } else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'") |
|
| 127 | 124 | { |
| 128 | 125 | $value = trim($value, "'"); |
| 129 | 126 | $this->quoteStyle = "'"; |