@@ -42,8 +42,7 @@ discard block |
||
| 42 | 42 | { |
| 43 | 43 | $info->delete(); |
| 44 | 44 | return true; |
| 45 | - } |
|
| 46 | - catch (FileHelper_Exception $e) |
|
| 45 | + } catch (FileHelper_Exception $e) |
|
| 47 | 46 | { |
| 48 | 47 | // Ignore the exception, since we're returning false instead. |
| 49 | 48 | } |
@@ -78,8 +77,7 @@ discard block |
||
| 78 | 77 | try |
| 79 | 78 | { |
| 80 | 79 | FileHelper::deleteFile($item); |
| 81 | - } |
|
| 82 | - catch (FileHelper_Exception $e) |
|
| 80 | + } catch (FileHelper_Exception $e) |
|
| 83 | 81 | { |
| 84 | 82 | return false; |
| 85 | 83 | } |
@@ -125,8 +123,7 @@ discard block |
||
| 125 | 123 | if ($item->isFolder()) |
| 126 | 124 | { |
| 127 | 125 | self::copy($item, $target . '/' . $item->getName()); |
| 128 | - } |
|
| 129 | - else if($item->isFile()) |
|
| 126 | + } else if($item->isFile()) |
|
| 130 | 127 | { |
| 131 | 128 | $item |
| 132 | 129 | ->requireIsFile() |
@@ -148,14 +148,12 @@ |
||
| 148 | 148 | if ($diff > 0) |
| 149 | 149 | { |
| 150 | 150 | $diff = 1; |
| 151 | - } |
|
| 152 | - else |
|
| 151 | + } else |
|
| 153 | 152 | { |
| 154 | 153 | if ($diff < 0) |
| 155 | 154 | { |
| 156 | 155 | $diff = -1; |
| 157 | - } |
|
| 158 | - else |
|
| 156 | + } else |
|
| 159 | 157 | { |
| 160 | 158 | /* tie-breaker: first listed item wins */ |
| 161 | 159 | $diff = $a->getPosition() - $b->getPosition(); |
@@ -58,14 +58,12 @@ discard block |
||
| 58 | 58 | if($startChar === ';') |
| 59 | 59 | { |
| 60 | 60 | $this->type = self::TYPE_COMMENT; |
| 61 | - } |
|
| 62 | - else if($startChar === '[') |
|
| 61 | + } else if($startChar === '[') |
|
| 63 | 62 | { |
| 64 | 63 | $this->type = self::TYPE_SECTION_DECLARATION; |
| 65 | 64 | $this->sectionName = trim($this->trimmed, '[]'); |
| 66 | 65 | $this->sectionName = trim($this->sectionName); // remove any whitespace |
| 67 | - } |
|
| 68 | - else |
|
| 66 | + } else |
|
| 69 | 67 | { |
| 70 | 68 | $pos = strpos($this->trimmed, '='); |
| 71 | 69 | if($pos === false) |
@@ -94,8 +92,7 @@ discard block |
||
| 94 | 92 | { |
| 95 | 93 | $value = trim($value, '"'); |
| 96 | 94 | $this->quoteStyle = '"'; |
| 97 | - } |
|
| 98 | - else if($value[0] === "'" && $value[strlen($value) - 1] === "'") |
|
| 95 | + } else if($value[0] === "'" && $value[strlen($value) - 1] === "'") |
|
| 99 | 96 | { |
| 100 | 97 | $value = trim($value, "'"); |
| 101 | 98 | $this->quoteStyle = "'"; |
@@ -41,8 +41,7 @@ |
||
| 41 | 41 | if($this->hasScheme()) |
| 42 | 42 | { |
| 43 | 43 | $this->setScheme(strtolower($this->getScheme())); |
| 44 | - } |
|
| 45 | - else |
|
| 44 | + } else |
|
| 46 | 45 | { |
| 47 | 46 | $scheme = URISchemes::detectScheme($this->url); |
| 48 | 47 | if(!empty($scheme)) { |
@@ -285,8 +285,7 @@ |
||
| 285 | 285 | if(is_array($val)) |
| 286 | 286 | { |
| 287 | 287 | $val = $this->restoreUnicodeChars($val); |
| 288 | - } |
|
| 289 | - else |
|
| 288 | + } else |
|
| 290 | 289 | { |
| 291 | 290 | $val = $this->restoreUnicodeChar($val); |
| 292 | 291 | } |
@@ -50,13 +50,11 @@ |
||
| 50 | 50 | { |
| 51 | 51 | return $value; |
| 52 | 52 | } |
| 53 | - } |
|
| 54 | - else if (is_array(json_decode($value, true, 512, JSON_THROW_ON_ERROR))) |
|
| 53 | + } else if (is_array(json_decode($value, true, 512, JSON_THROW_ON_ERROR))) |
|
| 55 | 54 | { |
| 56 | 55 | return $value; |
| 57 | 56 | } |
| 58 | - } |
|
| 59 | - catch (Throwable $e) |
|
| 57 | + } catch (Throwable $e) |
|
| 60 | 58 | { |
| 61 | 59 | // Invalid JSON must return an empty string. |
| 62 | 60 | // The application is responsible for asserting |
@@ -84,8 +84,7 @@ discard block |
||
| 84 | 84 | try |
| 85 | 85 | { |
| 86 | 86 | return self::fromElement(new SimpleXMLElement($xmlString)); |
| 87 | - } |
|
| 88 | - catch (Exception $e) |
|
| 87 | + } catch (Exception $e) |
|
| 89 | 88 | { |
| 90 | 89 | throw new XMLHelper_Exception( |
| 91 | 90 | 'Cannot create new element from string.', |
@@ -140,8 +139,7 @@ discard block |
||
| 140 | 139 | unset($this->xml); |
| 141 | 140 | |
| 142 | 141 | return $this->json; |
| 143 | - } |
|
| 144 | - catch (Exception $e) |
|
| 142 | + } catch (Exception $e) |
|
| 145 | 143 | { |
| 146 | 144 | throw new XMLHelper_Exception( |
| 147 | 145 | 'Could not convert the XML source to JSON', |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | if($error instanceof XMLHelper_DOMErrors_Error) |
| 41 | 41 | { |
| 42 | 42 | $this->errors[] = $error; |
| 43 | - } |
|
| 44 | - else if($error instanceof LibXMLError) |
|
| 43 | + } else if($error instanceof LibXMLError) |
|
| 45 | 44 | { |
| 46 | 45 | $this->errors[] = new XMLHelper_DOMErrors_Error($error); |
| 47 | 46 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | try |
| 59 | 59 | { |
| 60 | 60 | $data = json_decode($serialized, true, 512, JSON_THROW_ON_ERROR); |
| 61 | - } |
|
| 62 | - catch (JsonException $e) |
|
| 61 | + } catch (JsonException $e) |
|
| 63 | 62 | { |
| 64 | 63 | throw new XMLHelper_Exception( |
| 65 | 64 | 'Could not unserialize error data', |