@@ -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', |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -225,8 +225,7 @@ discard block |
||
| 225 | 225 | $year = "{$date['year']}"; |
| 226 | 226 | $month = $date['mon']; |
| 227 | 227 | $day = $date['mday']; |
| 228 | - } |
|
| 229 | - else |
|
| 228 | + } else |
|
| 230 | 229 | { |
| 231 | 230 | $year = null; |
| 232 | 231 | $month = null; |
@@ -262,8 +261,7 @@ discard block |
||
| 262 | 261 | $year = $iYear + 2000; |
| 263 | 262 | } |
| 264 | 263 | $year = (int)$year; |
| 265 | - } |
|
| 266 | - elseif($token=='MM' || $token=='M') |
|
| 264 | + } elseif($token=='MM' || $token=='M') |
|
| 267 | 265 | { |
| 268 | 266 | $month=$this->getInteger($value,$i_val, |
| 269 | 267 | $this->length($token),2); |
@@ -273,8 +271,7 @@ discard block |
||
| 273 | 271 | //throw new TInvalidDataValueException('Invalid month', $value); |
| 274 | 272 | $i_val += strlen($month); |
| 275 | 273 | $month = $iMonth; |
| 276 | - } |
|
| 277 | - elseif ($token=='dd' || $token=='d') |
|
| 274 | + } elseif ($token=='dd' || $token=='d') |
|
| 278 | 275 | { |
| 279 | 276 | $day = $this->getInteger($value,$i_val, |
| 280 | 277 | $this->length($token), 2); |
@@ -284,8 +281,7 @@ discard block |
||
| 284 | 281 | //throw new TInvalidDataValueException('Invalid day', $value); |
| 285 | 282 | $i_val += strlen($day); |
| 286 | 283 | $day = $iDay; |
| 287 | - } |
|
| 288 | - else |
|
| 284 | + } else |
|
| 289 | 285 | { |
| 290 | 286 | if($this->substring($value, $i_val, $this->length($token)) != $token) |
| 291 | 287 | return null; |
@@ -199,8 +199,7 @@ discard block |
||
| 199 | 199 | $this -> _createCheck = true; |
| 200 | 200 | $this -> getApplication() -> setGlobalState($key, time()); |
| 201 | 201 | } |
| 202 | - } |
|
| 203 | - catch(Exception $e) |
|
| 202 | + } catch(Exception $e) |
|
| 204 | 203 | { |
| 205 | 204 | // DB table not exists |
| 206 | 205 | if($this->_autoCreate) |
@@ -223,8 +222,7 @@ discard block |
||
| 223 | 222 | |
| 224 | 223 | $this -> _createCheck = true; |
| 225 | 224 | $this -> getApplication() -> setGlobalState($key, time()); |
| 226 | - } |
|
| 227 | - else |
|
| 225 | + } else |
|
| 228 | 226 | throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable); |
| 229 | 227 | } |
| 230 | 228 | $this->_cacheInitialized = true; |
@@ -293,8 +291,7 @@ discard block |
||
| 293 | 291 | return $config->getDbConnection(); |
| 294 | 292 | else |
| 295 | 293 | throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID); |
| 296 | - } |
|
| 297 | - else |
|
| 294 | + } else |
|
| 298 | 295 | { |
| 299 | 296 | $db=new TDbConnection; |
| 300 | 297 | if($this->_connectionString!=='') |
@@ -304,8 +301,7 @@ discard block |
||
| 304 | 301 | $db->setUsername($this->_username); |
| 305 | 302 | if($this->_password!=='') |
| 306 | 303 | $db->setPassword($this->_password); |
| 307 | - } |
|
| 308 | - else |
|
| 304 | + } else |
|
| 309 | 305 | { |
| 310 | 306 | // default to SQLite3 database |
| 311 | 307 | $dbFile=$this->getApplication()->getRuntimePath().'/sqlite3.cache'; |
@@ -462,8 +458,7 @@ discard block |
||
| 462 | 458 | $sql='SELECT value FROM '.$this->_cacheTable.' WHERE itemkey=\''.$key.'\' AND (expire=0 OR expire>'.time().') ORDER BY expire DESC'; |
| 463 | 459 | $command=$this->getDbConnection()->createCommand($sql); |
| 464 | 460 | return unserialize($command->queryScalar()); |
| 465 | - } |
|
| 466 | - catch(Exception $e) |
|
| 461 | + } catch(Exception $e) |
|
| 467 | 462 | { |
| 468 | 463 | $this->initializeCache(true); |
| 469 | 464 | return unserialize($command->queryScalar()); |
@@ -506,16 +501,14 @@ discard block |
||
| 506 | 501 | $command->bindValue(':value',serialize($value),PDO::PARAM_LOB); |
| 507 | 502 | $command->execute(); |
| 508 | 503 | return true; |
| 509 | - } |
|
| 510 | - catch(Exception $e) |
|
| 504 | + } catch(Exception $e) |
|
| 511 | 505 | { |
| 512 | 506 | try |
| 513 | 507 | { |
| 514 | 508 | $this->initializeCache(true); |
| 515 | 509 | $command->execute(); |
| 516 | 510 | return true; |
| 517 | - } |
|
| 518 | - catch(Exception $e) |
|
| 511 | + } catch(Exception $e) |
|
| 519 | 512 | { |
| 520 | 513 | return false; |
| 521 | 514 | } |
@@ -537,8 +530,7 @@ discard block |
||
| 537 | 530 | $command->bindValue(':key',$key,PDO::PARAM_STR); |
| 538 | 531 | $command->execute(); |
| 539 | 532 | return true; |
| 540 | - } |
|
| 541 | - catch(Exception $e) |
|
| 533 | + } catch(Exception $e) |
|
| 542 | 534 | { |
| 543 | 535 | $this->initializeCache(true); |
| 544 | 536 | $command->execute(); |
@@ -557,16 +549,14 @@ discard block |
||
| 557 | 549 | { |
| 558 | 550 | $command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}"); |
| 559 | 551 | $command->execute(); |
| 560 | - } |
|
| 561 | - catch(Exception $e) |
|
| 552 | + } catch(Exception $e) |
|
| 562 | 553 | { |
| 563 | 554 | try |
| 564 | 555 | { |
| 565 | 556 | $this->initializeCache(true); |
| 566 | 557 | $command->execute(); |
| 567 | 558 | return true; |
| 568 | - } |
|
| 569 | - catch(Exception $e) |
|
| 559 | + } catch(Exception $e) |
|
| 570 | 560 | { |
| 571 | 561 | return false; |
| 572 | 562 | } |
@@ -219,8 +219,7 @@ discard block |
||
| 219 | 219 | echo "<body><h1>Recursive Error</h1>\n"; |
| 220 | 220 | echo "<pre>".$exception->__toString()."</pre>\n"; |
| 221 | 221 | echo "</body></html>"; |
| 222 | - } |
|
| 223 | - else |
|
| 222 | + } else |
|
| 224 | 223 | { |
| 225 | 224 | error_log("Error happened while processing an existing error:\n".$exception->__toString()); |
| 226 | 225 | header('HTTP/1.0 500 Internal Error'); |
@@ -251,15 +250,13 @@ discard block |
||
| 251 | 250 | if($fileName==='') |
| 252 | 251 | $fileName='---embedded template---'; |
| 253 | 252 | $errorLine=$exception->getLineNumber(); |
| 254 | - } |
|
| 255 | - else |
|
| 253 | + } else |
|
| 256 | 254 | { |
| 257 | 255 | if(($trace=$this->getExactTrace($exception))!==null) |
| 258 | 256 | { |
| 259 | 257 | $fileName=$trace['file']; |
| 260 | 258 | $errorLine=$trace['line']; |
| 261 | - } |
|
| 262 | - else |
|
| 259 | + } else |
|
| 263 | 260 | { |
| 264 | 261 | $fileName=$exception->getFile(); |
| 265 | 262 | $errorLine=$exception->getLine(); |
@@ -350,8 +347,7 @@ discard block |
||
| 350 | 347 | $result=$trace[0]; |
| 351 | 348 | elseif(isset($trace[1])) |
| 352 | 349 | $result=$trace[1]; |
| 353 | - } |
|
| 354 | - else if($exception instanceof TInvalidOperationException) |
|
| 350 | + } else if($exception instanceof TInvalidOperationException) |
|
| 355 | 351 | { |
| 356 | 352 | // in case of getter or setter error, find out the exact file and row |
| 357 | 353 | if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null) |
@@ -388,8 +384,7 @@ discard block |
||
| 388 | 384 | { |
| 389 | 385 | $line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",' ',$lines[$i]))); |
| 390 | 386 | $source.="<div class=\"error\">".$line."</div>"; |
| 391 | - } |
|
| 392 | - else |
|
| 387 | + } else |
|
| 393 | 388 | $source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",' ',$lines[$i]))); |
| 394 | 389 | } |
| 395 | 390 | return $source; |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |