@@ -198,8 +198,7 @@ discard block |
||
| 198 | 198 | } else { |
| 199 | 199 | $this->addValueLine($name, $values[$i]); |
| 200 | 200 | } |
| 201 | - } |
|
| 202 | - else |
|
| 201 | + } else |
|
| 203 | 202 | { |
| 204 | 203 | $this->deleteLine($lines[$i]); |
| 205 | 204 | } |
@@ -219,8 +218,7 @@ discard block |
||
| 219 | 218 | foreach($lines as $delete) { |
| 220 | 219 | $this->deleteLine($delete); |
| 221 | 220 | } |
| 222 | - } |
|
| 223 | - else |
|
| 221 | + } else |
|
| 224 | 222 | { |
| 225 | 223 | $this->addValueLine($name, $value); |
| 226 | 224 | } |
@@ -258,8 +256,7 @@ discard block |
||
| 258 | 256 | if(empty($lines)) |
| 259 | 257 | { |
| 260 | 258 | $this->addValueLine($name, $value); |
| 261 | - } |
|
| 262 | - else |
|
| 259 | + } else |
|
| 263 | 260 | { |
| 264 | 261 | $found = false; |
| 265 | 262 | |
@@ -151,8 +151,7 @@ discard block |
||
| 151 | 151 | $this->sourceImage = $resource; |
| 152 | 152 | $this->type = $type; |
| 153 | 153 | $this->info = self::getImageSize($resource); |
| 154 | - } |
|
| 155 | - else |
|
| 154 | + } else |
|
| 156 | 155 | { |
| 157 | 156 | $this->file = $sourceFile; |
| 158 | 157 | if (!file_exists($this->file)) { |
@@ -561,8 +560,7 @@ discard block |
||
| 561 | 560 | if ($this->width <= $this->height) |
| 562 | 561 | { |
| 563 | 562 | $this->resampleByWidth($width); |
| 564 | - } |
|
| 565 | - else |
|
| 563 | + } else |
|
| 566 | 564 | { |
| 567 | 565 | $this->resampleByHeight($height); |
| 568 | 566 | } |
@@ -1037,8 +1035,7 @@ discard block |
||
| 1037 | 1035 | { |
| 1038 | 1036 | $bg2 = imagecolorallocatealpha($im2, $color['red'], $color['green'], $color['blue'], $color['alpha']); |
| 1039 | 1037 | imagecolortransparent($im2, $bg2); |
| 1040 | - } |
|
| 1041 | - else |
|
| 1038 | + } else |
|
| 1042 | 1039 | { |
| 1043 | 1040 | $bg2 = imagecolorallocate($im2, $color['red'], $color['green'], $color['blue']); |
| 1044 | 1041 | } |
@@ -1348,8 +1345,7 @@ discard block |
||
| 1348 | 1345 | if(method_exists(__CLASS__, $method)) |
| 1349 | 1346 | { |
| 1350 | 1347 | $info = call_user_func(array(__CLASS__, $method), $pathOrResource); |
| 1351 | - } |
|
| 1352 | - else |
|
| 1348 | + } else |
|
| 1353 | 1349 | { |
| 1354 | 1350 | $info = getimagesize($pathOrResource); |
| 1355 | 1351 | } |
@@ -181,8 +181,7 @@ discard block |
||
| 181 | 181 | if($datefrom instanceof \DateTime) |
| 182 | 182 | { |
| 183 | 183 | $converter->setDateFrom($datefrom); |
| 184 | - } |
|
| 185 | - else |
|
| 184 | + } else |
|
| 186 | 185 | { |
| 187 | 186 | $converter->setDateFrom(self::timestamp2date($datefrom)); |
| 188 | 187 | } |
@@ -190,8 +189,7 @@ discard block |
||
| 190 | 189 | if($dateto instanceof \DateTime) |
| 191 | 190 | { |
| 192 | 191 | $converter->setDateTo($dateto); |
| 193 | - } |
|
| 194 | - else if($dateto > 0) |
|
| 192 | + } else if($dateto > 0) |
|
| 195 | 193 | { |
| 196 | 194 | $converter->setDateTo(self::timestamp2date($dateto)); |
| 197 | 195 | } |
@@ -92,8 +92,7 @@ |
||
| 92 | 92 | if (mb_strlen($actual.$word) <= $width) |
| 93 | 93 | { |
| 94 | 94 | $actual .= $word.' '; |
| 95 | - } |
|
| 96 | - else |
|
| 95 | + } else |
|
| 97 | 96 | { |
| 98 | 97 | if ($actual != '') { |
| 99 | 98 | $line .= rtrim($actual).$break; |
@@ -204,13 +204,11 @@ |
||
| 204 | 204 | $tooltip, |
| 205 | 205 | $parts |
| 206 | 206 | ); |
| 207 | - } |
|
| 208 | - else |
|
| 207 | + } else |
|
| 209 | 208 | { |
| 210 | 209 | continue; |
| 211 | 210 | } |
| 212 | - } |
|
| 213 | - else |
|
| 211 | + } else |
|
| 214 | 212 | { |
| 215 | 213 | $tag = sprintf( |
| 216 | 214 | '<span class="link-param">%s</span>', |
@@ -141,14 +141,12 @@ |
||
| 141 | 141 | if ($diff > 0) |
| 142 | 142 | { |
| 143 | 143 | $diff = 1; |
| 144 | - } |
|
| 145 | - else |
|
| 144 | + } else |
|
| 146 | 145 | { |
| 147 | 146 | if ($diff < 0) |
| 148 | 147 | { |
| 149 | 148 | $diff = -1; |
| 150 | - } |
|
| 151 | - else |
|
| 149 | + } else |
|
| 152 | 150 | { |
| 153 | 151 | /* tie-breaker: first listed item wins */ |
| 154 | 152 | $diff = $a['pos'] - $b['pos']; |
@@ -215,8 +215,7 @@ discard block |
||
| 215 | 215 | if ($item->isDir()) |
| 216 | 216 | { |
| 217 | 217 | FileHelper::copyTree(str_replace('\\', '/', $itemPath), $target . '/' . $baseName); |
| 218 | - } |
|
| 219 | - else if($item->isFile()) |
|
| 218 | + } else if($item->isFile()) |
|
| 220 | 219 | { |
| 221 | 220 | self::copyFile($itemPath, $target . '/' . $baseName); |
| 222 | 221 | } |
@@ -260,8 +259,7 @@ discard block |
||
| 260 | 259 | if(!file_exists($targetFolder)) |
| 261 | 260 | { |
| 262 | 261 | self::createFolder($targetFolder); |
| 263 | - } |
|
| 264 | - else if(!is_writable($targetFolder)) |
|
| 262 | + } else if(!is_writable($targetFolder)) |
|
| 265 | 263 | { |
| 266 | 264 | throw new FileHelper_Exception( |
| 267 | 265 | sprintf('Target folder [%s] is not writable.', basename($targetFolder)), |
@@ -760,8 +758,7 @@ discard block |
||
| 760 | 758 | if(isset($options['relative-path']) && $options['relative-path'] === true) |
| 761 | 759 | { |
| 762 | 760 | $finder->setPathmodeRelative(); |
| 763 | - } |
|
| 764 | - else if(isset($options['absolute-path']) && $options['absolute-path'] === true) |
|
| 761 | + } else if(isset($options['absolute-path']) && $options['absolute-path'] === true) |
|
| 765 | 762 | { |
| 766 | 763 | $finder->setPathmodeAbsolute(); |
| 767 | 764 | } |
@@ -45,8 +45,7 @@ |
||
| 45 | 45 | if(is_object(json_decode($value))) { |
| 46 | 46 | return $value; |
| 47 | 47 | } |
| 48 | - } |
|
| 49 | - else |
|
| 48 | + } else |
|
| 50 | 49 | { |
| 51 | 50 | if(is_array(json_decode($value, true))) { |
| 52 | 51 | return $value; |
@@ -202,8 +202,7 @@ |
||
| 202 | 202 | if($this->valueType === self::VALUE_TYPE_ID_LIST) |
| 203 | 203 | { |
| 204 | 204 | $value = $this->validateType_idList($value, $validator); |
| 205 | - } |
|
| 206 | - else |
|
| 205 | + } else |
|
| 207 | 206 | { |
| 208 | 207 | $value = $validator->validate($value); |
| 209 | 208 | } |