@@ -63,8 +63,7 @@ discard block |
||
| 63 | 63 | { |
| 64 | 64 | $this->_connection->getPdoInstance()->commit(); |
| 65 | 65 | $this->_active=false; |
| 66 | - } |
|
| 67 | - else |
|
| 66 | + } else |
|
| 68 | 67 | throw new TDbException('dbtransaction_transaction_inactive'); |
| 69 | 68 | } |
| 70 | 69 | |
@@ -78,8 +77,7 @@ discard block |
||
| 78 | 77 | { |
| 79 | 78 | $this->_connection->getPdoInstance()->rollBack(); |
| 80 | 79 | $this->_active=false; |
| 81 | - } |
|
| 82 | - else |
|
| 80 | + } else |
|
| 83 | 81 | throw new TDbException('dbtransaction_transaction_inactive'); |
| 84 | 82 | } |
| 85 | 83 | |
@@ -68,8 +68,7 @@ |
||
| 68 | 68 | $manager->configureXml($file); |
| 69 | 69 | $this->cacheSqlMapManager($manager); |
| 70 | 70 | } |
| 71 | - } |
|
| 72 | - elseif($this->getConnectionID() !== '') { |
|
| 71 | + } elseif($this->getConnectionID() !== '') { |
|
| 73 | 72 | $manager->setDbConnection($this->getDbConnection()); |
| 74 | 73 | } |
| 75 | 74 | return $manager; |
@@ -177,8 +177,7 @@ |
||
| 177 | 177 | try |
| 178 | 178 | { |
| 179 | 179 | return TPropertyAccess::get($object, $property->getProperty()); |
| 180 | - } |
|
| 181 | - catch (TInvalidPropertyException $e) |
|
| 180 | + } catch (TInvalidPropertyException $e) |
|
| 182 | 181 | { |
| 183 | 182 | throw new TSqlMapException( |
| 184 | 183 | 'sqlmap_unable_to_get_property_for_parameter', |
@@ -164,8 +164,7 @@ |
||
| 164 | 164 | return $handler->createNewInstance(); |
| 165 | 165 | else |
| 166 | 166 | return $registry->createInstanceOf($this->getClass()); |
| 167 | - } |
|
| 168 | - catch (TSqlMapException $e) |
|
| 167 | + } catch (TSqlMapException $e) |
|
| 169 | 168 | { |
| 170 | 169 | throw new TSqlMapException( |
| 171 | 170 | 'sqlmap_unable_to_create_new_instance', |
@@ -113,8 +113,7 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | $userFile = include $this->_userFile; |
| 115 | 115 | $this->loadUserDataFromPhp($userFile); |
| 116 | - } |
|
| 117 | - else |
|
| 116 | + } else |
|
| 118 | 117 | { |
| 119 | 118 | $dom=new TXmlDocument; |
| 120 | 119 | $dom->loadFromFile($this->_userFile); |
@@ -310,8 +309,7 @@ discard block |
||
| 310 | 309 | $user=new TUser($this); |
| 311 | 310 | $user->setIsGuest(true); |
| 312 | 311 | return $user; |
| 313 | - } |
|
| 314 | - else |
|
| 312 | + } else |
|
| 315 | 313 | { |
| 316 | 314 | $username=strtolower($username); |
| 317 | 315 | if(isset($this->_users[$username])) |
@@ -322,8 +320,7 @@ discard block |
||
| 322 | 320 | if(isset($this->_roles[$username])) |
| 323 | 321 | $user->setRoles($this->_roles[$username]); |
| 324 | 322 | return $user; |
| 325 | - } |
|
| 326 | - else |
|
| 323 | + } else |
|
| 327 | 324 | return null; |
| 328 | 325 | } |
| 329 | 326 | } |
@@ -112,8 +112,7 @@ |
||
| 112 | 112 | && strlen($datetime[1]) == 1) |
| 113 | 113 | { |
| 114 | 114 | $pattern = $datetime; |
| 115 | - } |
|
| 116 | - else //no subpattern, try the presets |
|
| 115 | + } else //no subpattern, try the presets |
|
| 117 | 116 | $pattern = $this->getPreset($string); |
| 118 | 117 | |
| 119 | 118 | //no presets found, use the string as the pattern |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $status=TPropertyValue::ensureInteger($status); |
| 282 | 282 | if(isset(self::$HTTP_STATUS_CODES[$status])) { |
| 283 | 283 | $this->_reason=self::$HTTP_STATUS_CODES[$status]; |
| 284 | - }else{ |
|
| 284 | + } else{ |
|
| 285 | 285 | if($reason===null || $reason==='') { |
| 286 | 286 | throw new TInvalidDataValueException("response_status_reason_missing"); |
| 287 | 287 | } |
@@ -377,8 +377,7 @@ discard block |
||
| 377 | 377 | { |
| 378 | 378 | foreach($headers as $h) |
| 379 | 379 | header($h); |
| 380 | - } |
|
| 381 | - else |
|
| 380 | + } else |
|
| 382 | 381 | { |
| 383 | 382 | header('Pragma: public'); |
| 384 | 383 | header('Expires: 0'); |
@@ -488,13 +487,11 @@ discard block |
||
| 488 | 487 | { |
| 489 | 488 | $this->_bufferOutput = false; |
| 490 | 489 | ob_end_flush(); |
| 491 | - } |
|
| 492 | - else |
|
| 490 | + } else |
|
| 493 | 491 | ob_flush(); |
| 494 | 492 | flush(); |
| 495 | 493 | } |
| 496 | - } |
|
| 497 | - else |
|
| 494 | + } else |
|
| 498 | 495 | flush(); |
| 499 | 496 | } |
| 500 | 497 | |
@@ -645,8 +642,7 @@ discard block |
||
| 645 | 642 | $cookie->getSecure(), |
| 646 | 643 | $cookie->getHttpOnly() |
| 647 | 644 | ); |
| 648 | - } |
|
| 649 | - else { |
|
| 645 | + } else { |
|
| 650 | 646 | setcookie( |
| 651 | 647 | $cookie->getName(), |
| 652 | 648 | $cookie->getValue(), |
@@ -119,8 +119,7 @@ discard block |
||
| 119 | 119 | { |
| 120 | 120 | $this->raiseCallbackEvent($param); |
| 121 | 121 | return true; |
| 122 | - } |
|
| 123 | - else return false; |
|
| 122 | + } else return false; |
|
| 124 | 123 | } |
| 125 | 124 | |
| 126 | 125 | /** |
@@ -163,8 +162,7 @@ discard block |
||
| 163 | 162 | parent::render($writer); |
| 164 | 163 | if ($this->getActiveControl()->canUpdateClientSide()) |
| 165 | 164 | $this->getPage()->getCallbackClient()->replaceContent($this, $writer); |
| 166 | - } |
|
| 167 | - else |
|
| 165 | + } else |
|
| 168 | 166 | { |
| 169 | 167 | $this->getPage()->getAdapter()->registerControlToRender($this, $writer); |
| 170 | 168 | // If we update a TActiveTableRow on callback, we shouldn't update all childs, |
@@ -518,16 +518,14 @@ |
||
| 518 | 518 | { |
| 519 | 519 | $this->setIsValid(true); |
| 520 | 520 | $this->onValidationSuccess(); |
| 521 | - } |
|
| 522 | - else |
|
| 521 | + } else |
|
| 523 | 522 | { |
| 524 | 523 | if($target) |
| 525 | 524 | $target->setIsValid(false); |
| 526 | 525 | $this->setIsValid(false); |
| 527 | 526 | $this->onValidationError(); |
| 528 | 527 | } |
| 529 | - } |
|
| 530 | - else |
|
| 528 | + } else |
|
| 531 | 529 | { |
| 532 | 530 | $this->evaluateIsValid(); |
| 533 | 531 | $this->setIsValid(true); |