Completed
Pull Request — 3.4 (#46)
by David
20:58
created
src/Mouf/Database/TDBM/TDBMService.php 1 patch
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -441,10 +441,11 @@  discard block
 block discarded – undo
441 441
 			/*$data =*/ $this->connection->getTableInfo($table_name);
442 442
 		} catch (TDBMException $exception) {
443 443
 			$probable_table_name = $this->connection->checkTableExist($table_name);
444
-			if ($probable_table_name == null)
445
-			throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist.");
446
-			else
447
-			throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist. Maybe you meant the table '$probable_table_name'.");
444
+			if ($probable_table_name == null) {
445
+						throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist.");
446
+			} else {
447
+						throw new TDBMException("Error while calling TDBMObject::getNewObject(): The table named '$table_name' does not exist. Maybe you meant the table '$probable_table_name'.");
448
+			}
448 449
 		}
449 450
 
450 451
 		if ($className === null) {
@@ -886,8 +887,9 @@  discard block
 block discarded – undo
886 887
 		// Fourth, let's apply the same steps to the orderby_bag
887 888
 		// 4-1 orderby_bag should be an array, if it is a singleton, let's put it in an array.
888 889
 
889
-		if (!is_array($orderby_bag))
890
-		$orderby_bag = array($orderby_bag);
890
+		if (!is_array($orderby_bag)) {
891
+				$orderby_bag = array($orderby_bag);
892
+		}
891 893
 
892 894
 		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
893 895
 		$orderby_bag2 = array();
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Utils/TDBMDaoGenerator.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@
 block discarded – undo
230 230
                 $defaultSort = $data['column_name'];
231 231
                 if (count($matches == 3)){
232 232
                     $defaultSortDirection = $matches[2];
233
-                }else{
233
+                } else{
234 234
                     $defaultSortDirection = 'ASC';
235 235
                 }
236 236
             }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/MapIterator.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,12 +27,10 @@
 block discarded – undo
27 27
     public function __construct($iterator, callable $callable) {
28 28
         if (is_array($iterator)) {
29 29
             $this->iterator = new \ArrayIterator($iterator);
30
-        }
31
-        elseif (!($iterator instanceof Iterator))
30
+        } elseif (!($iterator instanceof Iterator))
32 31
         {
33 32
             throw new TDBMException("\$iterator parameter must be an instance of Iterator");
34
-        }
35
-        else
33
+        } else
36 34
         {
37 35
             $this->iterator = $iterator;
38 36
         }
Please login to merge, or discard this patch.