Completed
Push — namespace2 ( 791eac...5c23fb )
by Fabio
08:41
created
framework/Data/SqlMap/Configuration/TParameterMap.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -177,8 +177,7 @@
 block discarded – undo
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',
Please login to merge, or discard this patch.
framework/Data/SqlMap/Configuration/TResultMap.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -164,8 +164,7 @@
 block discarded – undo
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',
Please login to merge, or discard this patch.
framework/Data/Common/Sqlite/TSqliteCommandBuilder.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
framework/Util/TVarDumper.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
framework/Util/TSimpleDateFormatter.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -225,8 +225,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
framework/Exceptions/TErrorHandler.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -219,8 +219,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
framework/Security/TSecurityManager.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
framework/Security/TAuthManager.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
framework/Security/TUserManager.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -113,8 +113,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.