@@ -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', |
@@ -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 |
@@ -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); |
@@ -260,8 +260,7 @@ discard block |
||
| 260 | 260 | if(!empty($this->cache)) |
| 261 | 261 | $this->cache->clean($variant, $this->culture); |
| 262 | 262 | return true; |
| 263 | - } |
|
| 264 | - else |
|
| 263 | + } else |
|
| 265 | 264 | return false; |
| 266 | 265 | } |
| 267 | 266 | return false; |
@@ -304,8 +303,7 @@ discard block |
||
| 304 | 303 | if(!empty($this->cache)) |
| 305 | 304 | $this->cache->clean($variant, $this->culture); |
| 306 | 305 | return true; |
| 307 | - } |
|
| 308 | - else |
|
| 306 | + } else |
|
| 309 | 307 | return false; |
| 310 | 308 | } |
| 311 | 309 | } |
@@ -354,8 +352,7 @@ discard block |
||
| 354 | 352 | if(!empty($this->cache)) |
| 355 | 353 | $this->cache->clean($variant, $this->culture); |
| 356 | 354 | return true; |
| 357 | - } |
|
| 358 | - else |
|
| 355 | + } else |
|
| 359 | 356 | return false; |
| 360 | 357 | } |
| 361 | 358 | } |
@@ -72,16 +72,13 @@ |
||
| 72 | 72 | try |
| 73 | 73 | { |
| 74 | 74 | return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null); |
| 75 | - } |
|
| 76 | - catch(TRpcException $e) |
|
| 75 | + } catch(TRpcException $e) |
|
| 77 | 76 | { |
| 78 | 77 | return $this->createErrorResponse($e); |
| 79 | - } |
|
| 80 | - catch(THttpException $e) |
|
| 78 | + } catch(THttpException $e) |
|
| 81 | 79 | { |
| 82 | 80 | throw $e; |
| 83 | - } |
|
| 84 | - catch(\Exception $e) |
|
| 81 | + } catch(\Exception $e) |
|
| 85 | 82 | { |
| 86 | 83 | return $this->createErrorResponse(new TRpcException('An internal error occured')); |
| 87 | 84 | } |
@@ -69,8 +69,7 @@ |
||
| 69 | 69 | try |
| 70 | 70 | { |
| 71 | 71 | return $this->handler->callMethod($this->getPayload()); |
| 72 | - } |
|
| 73 | - catch(TRpcException $e) |
|
| 72 | + } catch(TRpcException $e) |
|
| 74 | 73 | { |
| 75 | 74 | return $this->handler->createErrorResponse($e); |
| 76 | 75 | } |