@@ -70,8 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | $fcontent = include $fname; |
| 72 | 72 | $this->loadFromPhp($fcontent, dirname($fname)); |
| 73 | - } |
|
| 74 | - else |
|
| 73 | + } else |
|
| 75 | 74 | { |
| 76 | 75 | $dom = new TXmlDocument; |
| 77 | 76 | $dom->loadFromFile($fname); |
@@ -218,8 +217,7 @@ discard block |
||
| 218 | 217 | if(isset($this->_aliases[$id])) |
| 219 | 218 | throw new TConfigurationException('appconfig_alias_redefined', $id); |
| 220 | 219 | $this->_aliases[$id] = $p; |
| 221 | - } |
|
| 222 | - else |
|
| 220 | + } else |
|
| 223 | 221 | throw new TConfigurationException('appconfig_alias_invalid'); |
| 224 | 222 | $this->_empty = false; |
| 225 | 223 | break; |
@@ -286,8 +284,7 @@ discard block |
||
| 286 | 284 | else |
| 287 | 285 | $this->_modules[$id] = [$type,$properties->toArray(),$element]; |
| 288 | 286 | $this->_empty = false; |
| 289 | - } |
|
| 290 | - else |
|
| 287 | + } else |
|
| 291 | 288 | throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName()); |
| 292 | 289 | } |
| 293 | 290 | } |
@@ -331,8 +328,7 @@ discard block |
||
| 331 | 328 | $element->setParent(null); |
| 332 | 329 | $this->_services[$id] = [$type,$properties->toArray(),$element]; |
| 333 | 330 | $this->_empty = false; |
| 334 | - } |
|
| 335 | - else |
|
| 331 | + } else |
|
| 336 | 332 | throw new TConfigurationException('appconfig_services_invalid', $element->getTagName()); |
| 337 | 333 | } |
| 338 | 334 | } |
@@ -356,8 +352,7 @@ discard block |
||
| 356 | 352 | $properties['id'] = $id; |
| 357 | 353 | $this->_parameters[$id] = [$type,$properties]; |
| 358 | 354 | } |
| 359 | - } |
|
| 360 | - else |
|
| 355 | + } else |
|
| 361 | 356 | { |
| 362 | 357 | $this->_parameters[$id] = $parameter; |
| 363 | 358 | } |
@@ -384,12 +379,10 @@ discard block |
||
| 384 | 379 | $this->_parameters[$id] = $element; |
| 385 | 380 | else |
| 386 | 381 | $this->_parameters[$id] = $value; |
| 387 | - } |
|
| 388 | - else |
|
| 382 | + } else |
|
| 389 | 383 | $this->_parameters[$id] = [$type,$properties->toArray()]; |
| 390 | 384 | $this->_empty = false; |
| 391 | - } |
|
| 392 | - else |
|
| 385 | + } else |
|
| 393 | 386 | throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName()); |
| 394 | 387 | } |
| 395 | 388 | } |
@@ -41,8 +41,7 @@ |
||
| 41 | 41 | return ($decision > 0); |
| 42 | 42 | } |
| 43 | 43 | return true; |
| 44 | - } |
|
| 45 | - else |
|
| 44 | + } else |
|
| 46 | 45 | return false; |
| 47 | 46 | } |
| 48 | 47 | |
@@ -117,8 +117,7 @@ discard block |
||
| 117 | 117 | { |
| 118 | 118 | $userFile = include $this->_userFile; |
| 119 | 119 | $this->loadUserDataFromPhp($userFile); |
| 120 | - } |
|
| 121 | - else |
|
| 120 | + } else |
|
| 122 | 121 | { |
| 123 | 122 | $dom = new TXmlDocument; |
| 124 | 123 | $dom->loadFromFile($this->_userFile); |
@@ -314,8 +313,7 @@ discard block |
||
| 314 | 313 | $user = new TUser($this); |
| 315 | 314 | $user->setIsGuest(true); |
| 316 | 315 | return $user; |
| 317 | - } |
|
| 318 | - else |
|
| 316 | + } else |
|
| 319 | 317 | { |
| 320 | 318 | $username = strtolower($username); |
| 321 | 319 | if(isset($this->_users[$username])) |
@@ -326,8 +324,7 @@ discard block |
||
| 326 | 324 | if(isset($this->_roles[$username])) |
| 327 | 325 | $user->setRoles($this->_roles[$username]); |
| 328 | 326 | return $user; |
| 329 | - } |
|
| 330 | - else |
|
| 327 | + } else |
|
| 331 | 328 | return null; |
| 332 | 329 | } |
| 333 | 330 | } |
@@ -123,8 +123,7 @@ discard block |
||
| 123 | 123 | $user = Prado::createComponent($this->_userClass, $this); |
| 124 | 124 | $user->setIsGuest(true); |
| 125 | 125 | return $user; |
| 126 | - } |
|
| 127 | - else |
|
| 126 | + } else |
|
| 128 | 127 | return $this->_userFactory->createUser($username); |
| 129 | 128 | } |
| 130 | 129 | |
@@ -175,8 +174,7 @@ discard block |
||
| 175 | 174 | return $conn->getDbConnection(); |
| 176 | 175 | else |
| 177 | 176 | throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID); |
| 178 | - } |
|
| 179 | - else |
|
| 177 | + } else |
|
| 180 | 178 | throw new TConfigurationException('dbusermanager_connectionid_required'); |
| 181 | 179 | } |
| 182 | 180 | |
@@ -99,8 +99,7 @@ |
||
| 99 | 99 | { |
| 100 | 100 | $this->_everyone = true; |
| 101 | 101 | break; |
| 102 | - } |
|
| 103 | - elseif($user === '?') |
|
| 102 | + } elseif($user === '?') |
|
| 104 | 103 | $this->_guest = true; |
| 105 | 104 | elseif($user === '@') |
| 106 | 105 | $this->_authenticated = true; |
@@ -83,8 +83,7 @@ |
||
| 83 | 83 | $this->_d[] = $item; |
| 84 | 84 | ++$this->_c; |
| 85 | 85 | } |
| 86 | - } |
|
| 87 | - elseif($data !== null) |
|
| 86 | + } elseif($data !== null) |
|
| 88 | 87 | throw new TInvalidDataTypeException('stack_data_not_iterable'); |
| 89 | 88 | } |
| 90 | 89 | |
@@ -84,8 +84,7 @@ |
||
| 84 | 84 | $this->_d[] = $item; |
| 85 | 85 | ++$this->_c; |
| 86 | 86 | } |
| 87 | - } |
|
| 88 | - elseif($data !== null) |
|
| 87 | + } elseif($data !== null) |
|
| 89 | 88 | throw new TInvalidDataTypeException('queue_data_not_iterable'); |
| 90 | 89 | } |
| 91 | 90 | |
@@ -124,11 +124,9 @@ discard block |
||
| 124 | 124 | { |
| 125 | 125 | eval('$array=array' . $value . ';'); |
| 126 | 126 | return $array; |
| 127 | - } |
|
| 128 | - else |
|
| 127 | + } else |
|
| 129 | 128 | return $len > 0?[$value]:[]; |
| 130 | - } |
|
| 131 | - else |
|
| 129 | + } else |
|
| 132 | 130 | return (array)$value; |
| 133 | 131 | } |
| 134 | 132 | |
@@ -171,8 +169,7 @@ discard block |
||
| 171 | 169 | throw new TInvalidDataValueException( |
| 172 | 170 | 'propertyvalue_enumvalue_invalid', $value, |
| 173 | 171 | implode(' | ', $types[$enums]->getConstants())); |
| 174 | - } |
|
| 175 | - elseif(!is_array($enums)) |
|
| 172 | + } elseif(!is_array($enums)) |
|
| 176 | 173 | { |
| 177 | 174 | $enums = func_get_args(); |
| 178 | 175 | array_shift($enums); |
@@ -142,8 +142,7 @@ |
||
| 142 | 142 | { |
| 143 | 143 | $fcontent = include $fname; |
| 144 | 144 | $this->loadFromPhp($fcontent, dirname($fname), $configPagePath); |
| 145 | - } |
|
| 146 | - else |
|
| 145 | + } else |
|
| 147 | 146 | { |
| 148 | 147 | $dom = new TXmlDocument; |
| 149 | 148 | if($dom->loadFromFile($fname)) |