Completed
Pull Request — 3.4 (#46)
by David
04:49
created
src/Mouf/Database/TDBM/AbstractTDBMObject.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -515,7 +515,7 @@
 block discarded – undo
515 515
 	/**
516 516
 	 * Returns the tables used in the filter in an array.
517 517
 	 *
518
-	 * @return array<string>
518
+	 * @return integer[]
519 519
 	 */
520 520
 	public function getUsedTables() {
521 521
 		return array_keys($this->dbRows);
Please login to merge, or discard this patch.
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -547,23 +547,23 @@
 block discarded – undo
547 547
 		return $sql_where;
548 548
 	}
549 549
 
550
-    /**
551
-     * Override the native php clone function for TDBMObjects
552
-     */
553
-    public function __clone(){
554
-        $this->_dbLoadIfNotLoaded();
555
-        //First lets set the status to new (to enter the save function)
556
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
557
-
558
-        // Add the current TDBMObject to the save object list
559
-        $this->tdbmService->_addToToSaveObjectList($this);
560
-
561
-        //Now unset the PK from the row
562
-        $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
563
-        foreach ($pk_array as $pk) {
564
-            $this->dbRow[$pk] = null;
565
-        }
566
-    }
550
+	/**
551
+	 * Override the native php clone function for TDBMObjects
552
+	 */
553
+	public function __clone(){
554
+		$this->_dbLoadIfNotLoaded();
555
+		//First lets set the status to new (to enter the save function)
556
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
557
+
558
+		// Add the current TDBMObject to the save object list
559
+		$this->tdbmService->_addToToSaveObjectList($this);
560
+
561
+		//Now unset the PK from the row
562
+		$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
563
+		foreach ($pk_array as $pk) {
564
+			$this->dbRow[$pk] = null;
565
+		}
566
+	}
567 567
 
568 568
 	/**
569 569
 	 * Returns raw database rows.
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @throws TDBMException
96 96
 	 * @throws TDBMInvalidOperationException
97 97
 	 */
98
-	public function __construct($tableName=null, array $primaryKeys=array(), TDBMService $tdbmService=null) {
98
+	public function __construct($tableName = null, array $primaryKeys = array(), TDBMService $tdbmService = null) {
99 99
 		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
100 100
 		if (!empty($tableName)) {
101 101
 			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
200 200
 	 * @param string $state
201 201
 	 */
202
-	public function _setStatus($state){
202
+	public function _setStatus($state) {
203 203
 		$this->status = $state;
204 204
 
205 205
 		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 	public function get($var, $tableName = null) {
212 212
 		if ($tableName === null) {
213
-			if (count($this->dbRows) > 1) {
213
+			if (count($this->dbRows)>1) {
214 214
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
215 215
 			} elseif (count($this->dbRows) === 1) {
216 216
 				$tableName = array_keys($this->dbRows)[0];
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 	 */
237 237
 	public function has($var, $tableName = null) {
238 238
 		if ($tableName === null) {
239
-			if (count($this->dbRows) > 1) {
239
+			if (count($this->dbRows)>1) {
240 240
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
241 241
 			} elseif (count($this->dbRows) === 1) {
242 242
 				$tableName = array_keys($this->dbRows)[0];
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 	
257 257
 	public function set($var, $value, $tableName = null) {
258 258
 		if ($tableName === null) {
259
-			if (count($this->dbRows) > 1) {
259
+			if (count($this->dbRows)>1) {
260 260
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
261 261
 			} elseif (count($this->dbRows) === 1) {
262 262
 				$tableName = array_keys($this->dbRows)[0];
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 	 */
282 282
 	public function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null) {
283 283
 		if ($tableName === null) {
284
-			if (count($this->dbRows) > 1) {
284
+			if (count($this->dbRows)>1) {
285 285
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
286 286
 			} elseif (count($this->dbRows) === 1) {
287 287
 				$tableName = array_keys($this->dbRows)[0];
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	 */
307 307
 	public function getRef($foreignKeyName, $tableName = null) {
308 308
 		if ($tableName === null) {
309
-			if (count($this->dbRows) > 1) {
309
+			if (count($this->dbRows)>1) {
310 310
 				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
311 311
 			} elseif (count($this->dbRows) === 1) {
312 312
 				$tableName = array_keys($this->dbRows)[0];
@@ -421,13 +421,13 @@  discard block
 block discarded – undo
421 421
 	 */
422 422
 	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status) {
423 423
 		$storage = $this->getRelationshipStorage($pivotTableName);
424
-		$storage->attach($remoteBean, [ 'status' => $status, 'reverse' => false ]);
424
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
425 425
 		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
426 426
 			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
427 427
 		}
428 428
 
429 429
 		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
430
-		$remoteStorage->attach($this, [ 'status' => $status, 'reverse' => true ]);
430
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
431 431
 	}
432 432
 
433 433
 	/**
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 	 * Implement the unique JsonSerializable method
497 497
 	 * @return array
498 498
 	 */
499
-	public function jsonSerialize(){
499
+	public function jsonSerialize() {
500 500
 		// FIXME
501 501
 		$this->_dbLoadIfNotLoaded();
502 502
 		return $this->dbRow;
@@ -526,23 +526,23 @@  discard block
 block discarded – undo
526 526
 	 *
527 527
 	 * @return string
528 528
 	 */
529
-	private function getPrimaryKeyWhereStatement () {
529
+	private function getPrimaryKeyWhereStatement() {
530 530
 		// Let's first get the primary keys
531 531
 		$pk_table = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
532 532
 		// Now for the object_id
533 533
 		$object_id = $this->TDBMObject_id;
534 534
 		// If there is only one primary key:
535
-		if (count($pk_table)==1) {
535
+		if (count($pk_table) == 1) {
536 536
 			$sql_where = $this->db_connection->escapeDBItem($this->dbTableName).'.'.$this->db_connection->escapeDBItem($pk_table[0])."=".$this->db_connection->quoteSmart($this->TDBMObject_id);
537 537
 		} else {
538 538
 			$ids = unserialize($object_id);
539
-			$i=0;
539
+			$i = 0;
540 540
 			$sql_where_array = array();
541 541
 			foreach ($pk_table as $pk) {
542 542
 				$sql_where_array[] = $this->db_connection->escapeDBItem($this->dbTableName).'.'.$this->db_connection->escapeDBItem($pk)."=".$this->db_connection->quoteSmart($ids[$i]);
543 543
 				$i++;
544 544
 			}
545
-			$sql_where = implode(" AND ",$sql_where_array);
545
+			$sql_where = implode(" AND ", $sql_where_array);
546 546
 		}
547 547
 		return $sql_where;
548 548
 	}
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
     /**
551 551
      * Override the native php clone function for TDBMObjects
552 552
      */
553
-    public function __clone(){
553
+    public function __clone() {
554 554
         $this->_dbLoadIfNotLoaded();
555 555
         //First lets set the status to new (to enter the save function)
556 556
         $this->status = TDBMObjectStateEnum::STATE_NEW;
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 	private function registerTable($tableName) {
578 578
 		$dbRow = new DbRow($this, $tableName);
579 579
 
580
-		if (in_array($this->status, [ TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY ])) {
580
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
581 581
 			// Let's get the primary key for the new table
582 582
 			$anotherDbRow = array_values($this->dbRows)[0];
583 583
 			/* @var $anotherDbRow DbRow */
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php 4 patches
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -138,9 +138,7 @@  discard block
 block discarded – undo
138 138
 	 * @Action
139 139
 	 * @param string $daonamespace
140 140
 	 * @param string $beannamespace
141
-	 * @param int $keepSupport
142 141
 	 * @param int $storeInUtc
143
-	 * @param int $castDatesToDateTime
144 142
 	 * @param string $selfedit
145 143
 	 * @throws \Mouf\MoufException
146 144
 	 */
@@ -168,6 +166,9 @@  discard block
 block discarded – undo
168 166
 	
169 167
 	protected $errorMsg;
170 168
 	
169
+	/**
170
+	 * @param string $msg
171
+	 */
171 172
 	private function displayErrorMsg($msg) {
172 173
 		$this->errorMsg = $msg;
173 174
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);
Please login to merge, or discard this patch.
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -2,12 +2,8 @@
 block discarded – undo
2 2
 namespace Mouf\Database\TDBM\Controllers;
3 3
 
4 4
 use Mouf\Composer\ClassNameMapper;
5
-use Mouf\MoufUtils;
6
-
7 5
 use Mouf\Actions\InstallUtils;
8
-
9 6
 use Mouf\MoufManager;
10
-
11 7
 use Mouf\Html\HtmlElement\HtmlBlock;
12 8
 use Mouf\Mvc\Splash\Controllers\Controller;
13 9
 
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -109,12 +109,12 @@  discard block
 block discarded – undo
109 109
 		$this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService");
110 110
 		
111 111
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
112
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
112
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
113 113
 
114
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
114
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
115 115
 			if ($autoloadNamespaces) {
116 116
 				$this->autoloadDetected = true;
117
-                $rootNamespace = $autoloadNamespaces[0];
117
+				$rootNamespace = $autoloadNamespaces[0];
118 118
 				$this->daoNamespace = $rootNamespace."Dao";
119 119
 				$this->beanNamespace = $rootNamespace."Dao\\Bean";
120 120
 			} else {
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @param string $selfedit
145 145
 	 * @throws \Mouf\MoufException
146 146
 	 */
147
-    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
147
+	public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
148 148
 		$this->selfedit = $selfedit;
149 149
 		
150 150
 		if ($selfedit == "true") {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 	 * @param string $selfedit
145 145
 	 * @throws \Mouf\MoufException
146 146
 	 */
147
-    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") {
147
+    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = "false") {
148 148
 		$this->selfedit = $selfedit;
149 149
 		
150 150
 		if ($selfedit == "true") {
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/DbRow.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -328,7 +328,7 @@
 block discarded – undo
328 328
 	/**
329 329
 	 * Returns the tables used in the filter in an array.
330 330
 	 *
331
-	 * @return array<string>
331
+	 * @return string[]
332 332
 	 */
333 333
 	public function getUsedTables() {
334 334
 		return array($this->dbTableName);
Please login to merge, or discard this patch.
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -249,36 +249,36 @@  discard block
 block discarded – undo
249 249
 	public function setRef($foreignKeyName, AbstractTDBMObject $bean = null) {
250 250
 		$this->references[$foreignKeyName] = $bean;
251 251
 
252
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
253
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
254
-            $this->tdbmService->_addToToSaveObjectList($this);
255
-        }
252
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
253
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
254
+			$this->tdbmService->_addToToSaveObjectList($this);
255
+		}
256 256
 	}
257 257
 
258
-    /**
259
-     * @param string $foreignKeyName A unique name for this reference
260
-     * @return AbstractTDBMObject|null
261
-     */
262
-    public function getRef($foreignKeyName) {
258
+	/**
259
+	 * @param string $foreignKeyName A unique name for this reference
260
+	 * @return AbstractTDBMObject|null
261
+	 */
262
+	public function getRef($foreignKeyName) {
263 263
 		if (isset($this->references[$foreignKeyName])) {
264 264
 			return $this->references[$foreignKeyName];
265 265
 		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
266
-            // If the object is new and has no property, then it has to be empty.
267
-            return null;
268
-        } else {
269
-            $this->_dbLoadIfNotLoaded();
266
+			// If the object is new and has no property, then it has to be empty.
267
+			return null;
268
+		} else {
269
+			$this->_dbLoadIfNotLoaded();
270 270
 
271
-            // Let's match the name of the columns to the primary key values
272
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
271
+			// Let's match the name of the columns to the primary key values
272
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
273 273
 
274
-            $values = [];
275
-            foreach ($fk->getLocalColumns() as $column) {
276
-                $values[] = $this->dbRow[$column];
277
-            }
274
+			$values = [];
275
+			foreach ($fk->getLocalColumns() as $column) {
276
+				$values[] = $this->dbRow[$column];
277
+			}
278 278
 
279
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
279
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
280 280
 
281
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
281
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
282 282
 		}
283 283
 	}
284 284
 
@@ -334,23 +334,23 @@  discard block
 block discarded – undo
334 334
 		return array($this->dbTableName);
335 335
 	}
336 336
 
337
-    /**
338
-     * Override the native php clone function for TDBMObjects
339
-     */
340
-    public function __clone(){
341
-        $this->_dbLoadIfNotLoaded();
342
-        //First lets set the status to new (to enter the save function)
343
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
337
+	/**
338
+	 * Override the native php clone function for TDBMObjects
339
+	 */
340
+	public function __clone(){
341
+		$this->_dbLoadIfNotLoaded();
342
+		//First lets set the status to new (to enter the save function)
343
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
344 344
 
345
-        // Add the current TDBMObject to the save object list
346
-        $this->tdbmService->_addToToSaveObjectList($this);
345
+		// Add the current TDBMObject to the save object list
346
+		$this->tdbmService->_addToToSaveObjectList($this);
347 347
 
348
-        //Now unset the PK from the row
349
-        $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
350
-        foreach ($pk_array as $pk) {
351
-            $this->dbRow[$pk] = null;
352
-        }
353
-    }
348
+		//Now unset the PK from the row
349
+		$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
350
+		foreach ($pk_array as $pk) {
351
+			$this->dbRow[$pk] = null;
352
+		}
353
+	}
354 354
 
355 355
 	/**
356 356
 	 * Returns raw database row.
@@ -358,35 +358,35 @@  discard block
 block discarded – undo
358 358
 	 * @return array
359 359
 	 */
360 360
 	public function _getDbRow() {
361
-        // Let's merge $dbRow and $references
362
-        $dbRow = $this->dbRow;
363
-
364
-        foreach ($this->references as $foreignKeyName => $reference) {
365
-            // Let's match the name of the columns to the primary key values
366
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
367
-            $refDbRows = $reference->_getDbRows();
368
-            $firstRefDbRow = reset($refDbRows);
369
-            $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
370
-            $localColumns = $fk->getLocalColumns();
371
-
372
-            for ($i=0, $count=count($localColumns); $i<$count; $i++) {
373
-                $dbRow[$localColumns[$i]] = $pkValues[$i];
374
-            }
375
-        }
361
+		// Let's merge $dbRow and $references
362
+		$dbRow = $this->dbRow;
363
+
364
+		foreach ($this->references as $foreignKeyName => $reference) {
365
+			// Let's match the name of the columns to the primary key values
366
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
367
+			$refDbRows = $reference->_getDbRows();
368
+			$firstRefDbRow = reset($refDbRows);
369
+			$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
370
+			$localColumns = $fk->getLocalColumns();
371
+
372
+			for ($i=0, $count=count($localColumns); $i<$count; $i++) {
373
+				$dbRow[$localColumns[$i]] = $pkValues[$i];
374
+			}
375
+		}
376 376
 
377 377
 		return $dbRow;
378 378
 	}
379 379
 
380
-    /**
381
-     * Returns references array.
382
-     *
383
-     * @return AbstractTDBMObject[]
384
-     */
385
-    public function _getReferences() {
386
-        return $this->references;
387
-    }
380
+	/**
381
+	 * Returns references array.
382
+	 *
383
+	 * @return AbstractTDBMObject[]
384
+	 */
385
+	public function _getReferences() {
386
+		return $this->references;
387
+	}
388 388
 
389
-    /**
389
+	/**
390 390
 	 * @return array
391 391
 	 */
392 392
 	public function _getPrimaryKeys()
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * @throws TDBMException
95 95
 	 * @throws TDBMInvalidOperationException
96 96
 	 */
97
-	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys=array(), TDBMService $tdbmService=null, array $dbRow = array()) {
97
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array()) {
98 98
 		$this->object = $object;
99 99
 		$this->dbTableName = $table_name;
100 100
 
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
142 142
 	 * @param string $state
143 143
 	 */
144
-	public function _setStatus($state){
144
+	public function _setStatus($state) {
145 145
 		$this->status = $state;
146 146
 	}
147 147
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 			$sql = "SELECT * FROM ".$connection->quoteIdentifier($this->dbTableName)." WHERE ".$sql_where;
164 164
 			$result = $connection->executeQuery($sql, $parameters);
165 165
 
166
-			if ($result->rowCount()==0)
166
+			if ($result->rowCount() == 0)
167 167
 			{
168 168
 				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" with ID \"".$this->TDBMObject_id."\".");
169 169
 			}
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 	 * Implement the unique JsonSerializable method
311 311
 	 * @return array
312 312
 	 */
313
-	public function jsonSerialize(){
313
+	public function jsonSerialize() {
314 314
 		$this->_dbLoadIfNotLoaded();
315 315
 		return $this->dbRow;
316 316
 	}
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
     /**
338 338
      * Override the native php clone function for TDBMObjects
339 339
      */
340
-    public function __clone(){
340
+    public function __clone() {
341 341
         $this->_dbLoadIfNotLoaded();
342 342
         //First lets set the status to new (to enter the save function)
343 343
         $this->status = TDBMObjectStateEnum::STATE_NEW;
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
             $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
370 370
             $localColumns = $fk->getLocalColumns();
371 371
 
372
-            for ($i=0, $count=count($localColumns); $i<$count; $i++) {
372
+            for ($i = 0, $count = count($localColumns); $i<$count; $i++) {
373 373
                 $dbRow[$localColumns[$i]] = $pkValues[$i];
374 374
             }
375 375
         }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/OrderBySQLString.php 4 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Mouf\Database\TDBM\Filters;
3 3
 
4
-use Doctrine\DBAL\Driver\Connection;
5
-
6 4
 /*
7 5
  Copyright (C) 2006-2011 David Négrier - THE CODING MACHINE
8 6
 
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -133,14 +133,14 @@
 block discarded – undo
133 133
 		$work_table = explode("'", $work_str);
134 134
 
135 135
 		if (count($work_table) == 0)
136
-		    return '';
136
+			return '';
137 137
 
138 138
 		// if we start with a ', let's remove the first text
139 139
 		if (strstr($work_str,"'") === 0)
140
-		    array_shift($work_table);
140
+			array_shift($work_table);
141 141
 			
142 142
 		if (count($work_table) == 0)
143
-		    return '';
143
+			return '';
144 144
 
145 145
 		// Now, let's take only the stuff outside the quotes.
146 146
 		$work_str2 = '';
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 * 
61 61
 	 * @param string $sqlString
62 62
 	 */
63
-	public function __construct($sqlString=null) {
63
+	public function __construct($sqlString = null) {
64 64
 		$this->sqlString = $sqlString;
65 65
 	}
66 66
 	
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 			$result = -1;
87 87
 			while (true) {
88 88
 				$result = strrpos($phrase, "'", $result+1);
89
-				if ($result===false) {
90
-					if ($sentence!='')
89
+				if ($result === false) {
90
+					if ($sentence != '')
91 91
 					$sentence .= ',';
92 92
 					$sentence .= $phrase;
93 93
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 				else
103 103
 				{
104 104
 					$valid_result = true;
105
-					if ($result>0 && $phrase{$result-1}=='\\') {
105
+					if ($result>0 && $phrase{$result-1} == '\\') {
106 106
 						$valid_result = false;
107 107
 					}
108 108
 					if ($valid_result)
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		// First, let's remove all the stuff in quotes:
129 129
 
130 130
 		// Let's remove all the \' found
131
-		$work_str = str_replace("\\'",'',$this->sqlString);
131
+		$work_str = str_replace("\\'", '', $this->sqlString);
132 132
 		// Now, let's split the string using '
133 133
 		$work_table = explode("'", $work_str);
134 134
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		    return '';
137 137
 
138 138
 		// if we start with a ', let's remove the first text
139
-		if (strstr($work_str,"'") === 0)
139
+		if (strstr($work_str, "'") === 0)
140 140
 		    array_shift($work_table);
141 141
 			
142 142
 		if (count($work_table) == 0)
@@ -147,13 +147,13 @@  discard block
 block discarded – undo
147 147
 
148 148
 		$i = 0;
149 149
 		foreach ($work_table as $str_fragment) {
150
-			if (($i % 2) == 0)
150
+			if (($i%2) == 0)
151 151
 			$work_str2 .= $str_fragment.' ';
152 152
 			$i++;
153 153
 		}
154 154
 
155 155
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
156
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
156
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
157 157
 
158 158
 		$tables_used = $capture_result[1];
159 159
 		// remove doubles:
Please login to merge, or discard this patch.
Braces   +19 added lines, -14 removed lines patch added patch discarded remove patch
@@ -87,8 +87,9 @@  discard block
 block discarded – undo
87 87
 			while (true) {
88 88
 				$result = strrpos($phrase, "'", $result+1);
89 89
 				if ($result===false) {
90
-					if ($sentence!='')
91
-					$sentence .= ',';
90
+					if ($sentence!='') {
91
+										$sentence .= ',';
92
+					}
92 93
 					$sentence .= $phrase;
93 94
 
94 95
 					if ($is_inside_quotes) {
@@ -98,15 +99,15 @@  discard block
 block discarded – undo
98 99
 						$sentence = '';
99 100
 						break;
100 101
 					}
101
-				}
102
-				else
102
+				} else
103 103
 				{
104 104
 					$valid_result = true;
105 105
 					if ($result>0 && $phrase{$result-1}=='\\') {
106 106
 						$valid_result = false;
107 107
 					}
108
-					if ($valid_result)
109
-					$is_inside_quotes = !$is_inside_quotes;
108
+					if ($valid_result) {
109
+										$is_inside_quotes = !$is_inside_quotes;
110
+					}
110 111
 				}
111 112
 			}
112 113
 
@@ -132,23 +133,27 @@  discard block
 block discarded – undo
132 133
 		// Now, let's split the string using '
133 134
 		$work_table = explode("'", $work_str);
134 135
 
135
-		if (count($work_table) == 0)
136
-		    return '';
136
+		if (count($work_table) == 0) {
137
+				    return '';
138
+		}
137 139
 
138 140
 		// if we start with a ', let's remove the first text
139
-		if (strstr($work_str,"'") === 0)
140
-		    array_shift($work_table);
141
+		if (strstr($work_str,"'") === 0) {
142
+				    array_shift($work_table);
143
+		}
141 144
 			
142
-		if (count($work_table) == 0)
143
-		    return '';
145
+		if (count($work_table) == 0) {
146
+				    return '';
147
+		}
144 148
 
145 149
 		// Now, let's take only the stuff outside the quotes.
146 150
 		$work_str2 = '';
147 151
 
148 152
 		$i = 0;
149 153
 		foreach ($work_table as $str_fragment) {
150
-			if (($i % 2) == 0)
151
-			$work_str2 .= $str_fragment.' ';
154
+			if (($i % 2) == 0) {
155
+						$work_str2 .= $str_fragment.' ';
156
+			}
152 157
 			$i++;
153 158
 		}
154 159
 
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/MapIterator.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
     protected $callable;
19 19
 
20 20
     /**
21
-     * @param $iterator Iterator|array
21
+     * @param InnerResultIterator $iterator Iterator|array
22 22
      * @param $callable callable This can have two parameters
23 23
      * @throws Exception
24 24
      */
Please login to merge, or discard this patch.
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -7,85 +7,85 @@
 block discarded – undo
7 7
  */
8 8
 class MapIterator implements \Iterator {
9 9
 
10
-    /**
11
-     * @var Iterator
12
-     */
13
-    protected $iterator;
10
+	/**
11
+	 * @var Iterator
12
+	 */
13
+	protected $iterator;
14 14
 
15
-    /**
16
-     * @var callable Modifies the current item in iterator
17
-     */
18
-    protected $callable;
15
+	/**
16
+	 * @var callable Modifies the current item in iterator
17
+	 */
18
+	protected $callable;
19 19
 
20
-    /**
21
-     * @param $iterator Iterator|array
22
-     * @param $callable callable This can have two parameters
23
-     * @throws Exception
24
-     */
25
-    public function __construct($iterator, callable $callable) {
26
-        if (is_array($iterator)) {
27
-            $this->iterator = new \ArrayIterator($iterator);
28
-        }
29
-        elseif (!($iterator instanceof \Iterator))
30
-        {
31
-            throw new TDBMException("\$iterator parameter must be an instance of Iterator");
32
-        }
33
-        else
34
-        {
35
-            $this->iterator = $iterator;
36
-        }
20
+	/**
21
+	 * @param $iterator Iterator|array
22
+	 * @param $callable callable This can have two parameters
23
+	 * @throws Exception
24
+	 */
25
+	public function __construct($iterator, callable $callable) {
26
+		if (is_array($iterator)) {
27
+			$this->iterator = new \ArrayIterator($iterator);
28
+		}
29
+		elseif (!($iterator instanceof \Iterator))
30
+		{
31
+			throw new TDBMException("\$iterator parameter must be an instance of Iterator");
32
+		}
33
+		else
34
+		{
35
+			$this->iterator = $iterator;
36
+		}
37 37
 
38
-        if ($callable instanceof \Closure) {
39
-            // make sure there's one argument
40
-            $reflection = new \ReflectionObject($callable);
41
-            if ($reflection->hasMethod('__invoke')) {
42
-                $method = $reflection->getMethod('__invoke');
43
-                if ($method->getNumberOfParameters() !== 1) {
44
-                    throw new TDBMException("\$callable must accept one and only one parameter.");
45
-                }
46
-            }
47
-        }
38
+		if ($callable instanceof \Closure) {
39
+			// make sure there's one argument
40
+			$reflection = new \ReflectionObject($callable);
41
+			if ($reflection->hasMethod('__invoke')) {
42
+				$method = $reflection->getMethod('__invoke');
43
+				if ($method->getNumberOfParameters() !== 1) {
44
+					throw new TDBMException("\$callable must accept one and only one parameter.");
45
+				}
46
+			}
47
+		}
48 48
 
49
-        $this->callable = $callable;
50
-    }
49
+		$this->callable = $callable;
50
+	}
51 51
 
52
-    /**
53
-     * Alters the current item with $this->callable and returns a new item.
54
-     * Be careful with your types as we can't do static type checking here!
55
-     * @return mixed
56
-     */
57
-    public function current()
58
-    {
59
-        $callable = $this->callable;
60
-        return $callable($this->iterator->current());
61
-    }
52
+	/**
53
+	 * Alters the current item with $this->callable and returns a new item.
54
+	 * Be careful with your types as we can't do static type checking here!
55
+	 * @return mixed
56
+	 */
57
+	public function current()
58
+	{
59
+		$callable = $this->callable;
60
+		return $callable($this->iterator->current());
61
+	}
62 62
 
63
-    public function next()
64
-    {
65
-        $this->iterator->next();
66
-    }
63
+	public function next()
64
+	{
65
+		$this->iterator->next();
66
+	}
67 67
 
68
-    public function key()
69
-    {
70
-        return $this->iterator->key();
71
-    }
68
+	public function key()
69
+	{
70
+		return $this->iterator->key();
71
+	}
72 72
 
73
-    public function valid()
74
-    {
75
-        return $this->iterator->valid();
76
-    }
73
+	public function valid()
74
+	{
75
+		return $this->iterator->valid();
76
+	}
77 77
 
78
-    public function rewind()
79
-    {
80
-        $this->iterator->rewind();
81
-    }
78
+	public function rewind()
79
+	{
80
+		$this->iterator->rewind();
81
+	}
82 82
 
83
-    /**
84
-     * Casts the iterator to a PHP array.
85
-     *
86
-     * @return array
87
-     */
88
-    public function toArray() {
89
-        return iterator_to_array($this);
90
-    }
83
+	/**
84
+	 * Casts the iterator to a PHP array.
85
+	 *
86
+	 * @return array
87
+	 */
88
+	public function toArray() {
89
+		return iterator_to_array($this);
90
+	}
91 91
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,12 +25,10 @@
 block discarded – undo
25 25
     public function __construct($iterator, callable $callable) {
26 26
         if (is_array($iterator)) {
27 27
             $this->iterator = new \ArrayIterator($iterator);
28
-        }
29
-        elseif (!($iterator instanceof \Iterator))
28
+        } elseif (!($iterator instanceof \Iterator))
30 29
         {
31 30
             throw new TDBMException("\$iterator parameter must be an instance of Iterator");
32
-        }
33
-        else
31
+        } else
34 32
         {
35 33
             $this->iterator = $iterator;
36 34
         }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/PageIterator.php 3 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,6 +63,9 @@  discard block
 block discarded – undo
63 63
 
64 64
 	private $innerResultIterator;
65 65
 
66
+	/**
67
+	 * @param integer $offset
68
+	 */
66 69
 	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
67 70
 	{
68 71
 		$this->parentResult = $parentResult;
@@ -108,7 +111,7 @@  discard block
 block discarded – undo
108 111
 	}
109 112
 
110 113
 	/**
111
-	 * @return int
114
+	 * @return double
112 115
 	 */
113 116
 	public function getCurrentPage()
114 117
 	{
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 	 */
113 113
 	public function getCurrentPage()
114 114
 	{
115
-		return floor($this->offset / $this->limit) + 1;
115
+		return floor($this->offset/$this->limit)+1;
116 116
 	}
117 117
 
118 118
 	/**
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,6 @@
 block discarded – undo
18 18
  along with this program; if not, write to the Free Software
19 19
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
20 20
  */
21
-use Doctrine\DBAL\Driver\Connection;
22 21
 
23 22
 
24 23
 /**
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/TDBMObject.php 4 patches
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@  discard block
 block discarded – undo
35 35
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
36 36
 {
37 37
 
38
+    /**
39
+     * @param string $var
40
+     */
38 41
     public function __get($var)
39 42
     {
40 43
         return $this->get($var);
@@ -51,6 +54,10 @@  discard block
 block discarded – undo
51 54
         return $this->has($var);
52 55
     }
53 56
 
57
+    /**
58
+     * @param string $var
59
+     * @param string|null $value
60
+     */
54 61
     public function __set($var, $value)
55 62
     {
56 63
         $this->set($var, $value);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,6 @@
 block discarded – undo
18 18
  along with this program; if not, write to the Free Software
19 19
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
20 20
  */
21
-use Doctrine\DBAL\Driver\Connection;
22 21
 
23 22
 
24 23
 /**
Please login to merge, or discard this patch.
Indentation   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -35,117 +35,117 @@
 block discarded – undo
35 35
 class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator
36 36
 {
37 37
 
38
-    public function __get($var)
39
-    {
40
-        return $this->get($var);
41
-    }
42
-
43
-    /**
44
-     * Returns true if a column is set, false otherwise.
45
-     *
46
-     * @param string $var
47
-     * @return boolean
48
-     */
49
-    public function __isset($var)
50
-    {
51
-        return $this->has($var);
52
-    }
53
-
54
-    public function __set($var, $value)
55
-    {
56
-        $this->set($var, $value);
57
-    }
58
-
59
-    /**
60
-     * Implements array behaviour for our object.
61
-     *
62
-     * @param string $offset
63
-     * @param string $value
64
-     */
65
-    public function offsetSet($offset, $value)
66
-    {
67
-        $this->__set($offset, $value);
68
-    }
69
-
70
-    /**
71
-     * Implements array behaviour for our object.
72
-     *
73
-     * @param string $offset
74
-     * @return bool
75
-     */
76
-    public function offsetExists($offset)
77
-    {
78
-        $this->_dbLoadIfNotLoaded();
79
-        return isset($this->dbRow[$offset]);
80
-    }
81
-
82
-    /**
83
-     * Implements array behaviour for our object.
84
-     *
85
-     * @param string $offset
86
-     */
87
-    public function offsetUnset($offset)
88
-    {
89
-        $this->__set($offset, null);
90
-    }
91
-
92
-    /**
93
-     * Implements array behaviour for our object.
94
-     *
95
-     * @param string $offset
96
-     * @return mixed|null
97
-     */
98
-    public function offsetGet($offset)
99
-    {
100
-        return $this->__get($offset);
101
-    }
102
-
103
-    private $_validIterator = false;
104
-
105
-    /**
106
-     * Implements iterator behaviour for our object (so we can each column).
107
-     */
108
-    public function rewind()
109
-    {
110
-        $this->_dbLoadIfNotLoaded();
111
-        if (count($this->dbRow) > 0) {
112
-            $this->_validIterator = true;
113
-        } else {
114
-            $this->_validIterator = false;
115
-        }
116
-        reset($this->dbRow);
117
-    }
118
-
119
-    /**
120
-     * Implements iterator behaviour for our object (so we can each column).
121
-     */
122
-    public function next()
123
-    {
124
-        $val = next($this->dbRow);
125
-        $this->_validIterator = !($val === false);
126
-    }
127
-
128
-    /**
129
-     * Implements iterator behaviour for our object (so we can each column).
130
-     */
131
-    public function key()
132
-    {
133
-        return key($this->dbRow);
134
-    }
135
-
136
-    /**
137
-     * Implements iterator behaviour for our object (so we can each column).
138
-     */
139
-    public function current()
140
-    {
141
-        return current($this->dbRow);
142
-    }
143
-
144
-    /**
145
-     * Implements iterator behaviour for our object (so we can each column).
146
-     */
147
-    public function valid()
148
-    {
149
-        return $this->_validIterator;
150
-    }
38
+	public function __get($var)
39
+	{
40
+		return $this->get($var);
41
+	}
42
+
43
+	/**
44
+	 * Returns true if a column is set, false otherwise.
45
+	 *
46
+	 * @param string $var
47
+	 * @return boolean
48
+	 */
49
+	public function __isset($var)
50
+	{
51
+		return $this->has($var);
52
+	}
53
+
54
+	public function __set($var, $value)
55
+	{
56
+		$this->set($var, $value);
57
+	}
58
+
59
+	/**
60
+	 * Implements array behaviour for our object.
61
+	 *
62
+	 * @param string $offset
63
+	 * @param string $value
64
+	 */
65
+	public function offsetSet($offset, $value)
66
+	{
67
+		$this->__set($offset, $value);
68
+	}
69
+
70
+	/**
71
+	 * Implements array behaviour for our object.
72
+	 *
73
+	 * @param string $offset
74
+	 * @return bool
75
+	 */
76
+	public function offsetExists($offset)
77
+	{
78
+		$this->_dbLoadIfNotLoaded();
79
+		return isset($this->dbRow[$offset]);
80
+	}
81
+
82
+	/**
83
+	 * Implements array behaviour for our object.
84
+	 *
85
+	 * @param string $offset
86
+	 */
87
+	public function offsetUnset($offset)
88
+	{
89
+		$this->__set($offset, null);
90
+	}
91
+
92
+	/**
93
+	 * Implements array behaviour for our object.
94
+	 *
95
+	 * @param string $offset
96
+	 * @return mixed|null
97
+	 */
98
+	public function offsetGet($offset)
99
+	{
100
+		return $this->__get($offset);
101
+	}
102
+
103
+	private $_validIterator = false;
104
+
105
+	/**
106
+	 * Implements iterator behaviour for our object (so we can each column).
107
+	 */
108
+	public function rewind()
109
+	{
110
+		$this->_dbLoadIfNotLoaded();
111
+		if (count($this->dbRow) > 0) {
112
+			$this->_validIterator = true;
113
+		} else {
114
+			$this->_validIterator = false;
115
+		}
116
+		reset($this->dbRow);
117
+	}
118
+
119
+	/**
120
+	 * Implements iterator behaviour for our object (so we can each column).
121
+	 */
122
+	public function next()
123
+	{
124
+		$val = next($this->dbRow);
125
+		$this->_validIterator = !($val === false);
126
+	}
127
+
128
+	/**
129
+	 * Implements iterator behaviour for our object (so we can each column).
130
+	 */
131
+	public function key()
132
+	{
133
+		return key($this->dbRow);
134
+	}
135
+
136
+	/**
137
+	 * Implements iterator behaviour for our object (so we can each column).
138
+	 */
139
+	public function current()
140
+	{
141
+		return current($this->dbRow);
142
+	}
143
+
144
+	/**
145
+	 * Implements iterator behaviour for our object (so we can each column).
146
+	 */
147
+	public function valid()
148
+	{
149
+		return $this->_validIterator;
150
+	}
151 151
 }
152 152
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
     public function rewind()
109 109
     {
110 110
         $this->_dbLoadIfNotLoaded();
111
-        if (count($this->dbRow) > 0) {
111
+        if (count($this->dbRow)>0) {
112 112
             $this->_validIterator = true;
113 113
         } else {
114 114
             $this->_validIterator = false;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/TDBMService.php 5 patches
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -22,16 +22,12 @@
 block discarded – undo
22 22
 use Doctrine\Common\Cache\Cache;
23 23
 use Doctrine\Common\Cache\VoidCache;
24 24
 use Doctrine\DBAL\Connection;
25
-use Doctrine\DBAL\DBALException;
26
-use Doctrine\DBAL\Schema\Column;
27 25
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
28
-use Doctrine\DBAL\Schema\Schema;
29 26
 use Mouf\Database\MagicQuery;
30 27
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
31 28
 use Mouf\Database\TDBM\Filters\OrderBySQLString;
32 29
 use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
33 30
 use Mouf\Utils\Cache\CacheInterface;
34
-use SQLParser\Node\ColRef;
35 31
 
36 32
 /**
37 33
  * The TDBMService class is the main TDBM class. It provides methods to retrieve TDBMObject instances
Please login to merge, or discard this patch.
Indentation   +168 added lines, -168 removed lines patch added patch discarded remove patch
@@ -510,7 +510,7 @@  discard block
 block discarded – undo
510 510
 			case TDBMObjectStateEnum::STATE_DETACHED:
511 511
 				throw new TDBMInvalidOperationException('Cannot delete a detached object');
512 512
 			case TDBMObjectStateEnum::STATE_NEW:
513
-                $this->deleteManyToManyRelationships($object);
513
+				$this->deleteManyToManyRelationships($object);
514 514
 				foreach ($object->_getDbRows() as $dbRow) {
515 515
 					$this->removeFromToSaveObjectList($dbRow);
516 516
 				}
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
 				}
522 522
 			case TDBMObjectStateEnum::STATE_NOT_LOADED:
523 523
 			case TDBMObjectStateEnum::STATE_LOADED:
524
-                $this->deleteManyToManyRelationships($object);
524
+				$this->deleteManyToManyRelationships($object);
525 525
 				// Let's delete db rows, in reverse order.
526 526
 				foreach (array_reverse($object->_getDbRows()) as $dbRow) {
527 527
 					$tableName = $dbRow->_getDbTableName();
@@ -541,63 +541,63 @@  discard block
 block discarded – undo
541 541
 		$object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
542 542
 	}
543 543
 
544
-    /**
545
-     * Removes all many to many relationships for this object.
546
-     * @param AbstractTDBMObject $object
547
-     */
548
-    private function deleteManyToManyRelationships(AbstractTDBMObject $object) {
549
-        foreach ($object->_getDbRows() as $tableName => $dbRow) {
550
-            $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
551
-            foreach ($pivotTables as $pivotTable) {
552
-                $remoteBeans = $object->_getRelationships($pivotTable);
553
-                foreach ($remoteBeans as $remoteBean) {
554
-                    $object->_removeRelationship($pivotTable, $remoteBean);
555
-                }
556
-            }
557
-        }
558
-        $this->persistManyToManyRelationships($object);
559
-    }
560
-
561
-
562
-    /**
563
-     * This function removes the given object from the database. It will also remove all objects relied to the one given
564
-     * by parameter before all.
565
-     *
566
-     * Notice: if the object has a multiple primary key, the function will not work.
567
-     *
568
-     * @param AbstractTDBMObject $objToDelete
569
-     */
570
-    public function deleteCascade(AbstractTDBMObject $objToDelete) {
571
-        $this->deleteAllConstraintWithThisObject($objToDelete);
572
-        $this->delete($objToDelete);
573
-    }
574
-
575
-    /**
576
-     * This function is used only in TDBMService (private function)
577
-     * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter
578
-     *
579
-     * @param TDBMObject $obj
580
-     * @return TDBMObjectArray
581
-     */
582
-    private function deleteAllConstraintWithThisObject(TDBMObject $obj) {
583
-        $tableFrom = $this->connection->escapeDBItem($obj->_getDbTableName());
584
-        $constraints = $this->connection->getConstraintsFromTable($tableFrom);
585
-        foreach ($constraints as $constraint) {
586
-            $tableTo = $this->connection->escapeDBItem($constraint["table1"]);
587
-            $colFrom = $this->connection->escapeDBItem($constraint["col2"]);
588
-            $colTo = $this->connection->escapeDBItem($constraint["col1"]);
589
-            $idVarName = $this->connection->escapeDBItem($obj->getPrimaryKey()[0]);
590
-            $idValue = $this->connection->quoteSmart($obj->TDBMObject_id);
591
-            $sql = "SELECT DISTINCT ".$tableTo.".*"
592
-                    ." FROM ".$tableFrom
593
-                    ." LEFT JOIN ".$tableTo." ON ".$tableFrom.".".$colFrom." = ".$tableTo.".".$colTo
594
-                    ." WHERE ".$tableFrom.".".$idVarName."=".$idValue;
595
-            $result = $this->getObjectsFromSQL($constraint["table1"], $sql);
596
-            foreach ($result as $tdbmObj) {
597
-                $this->deleteCascade($tdbmObj);
598
-            }
599
-        }
600
-    }
544
+	/**
545
+	 * Removes all many to many relationships for this object.
546
+	 * @param AbstractTDBMObject $object
547
+	 */
548
+	private function deleteManyToManyRelationships(AbstractTDBMObject $object) {
549
+		foreach ($object->_getDbRows() as $tableName => $dbRow) {
550
+			$pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
551
+			foreach ($pivotTables as $pivotTable) {
552
+				$remoteBeans = $object->_getRelationships($pivotTable);
553
+				foreach ($remoteBeans as $remoteBean) {
554
+					$object->_removeRelationship($pivotTable, $remoteBean);
555
+				}
556
+			}
557
+		}
558
+		$this->persistManyToManyRelationships($object);
559
+	}
560
+
561
+
562
+	/**
563
+	 * This function removes the given object from the database. It will also remove all objects relied to the one given
564
+	 * by parameter before all.
565
+	 *
566
+	 * Notice: if the object has a multiple primary key, the function will not work.
567
+	 *
568
+	 * @param AbstractTDBMObject $objToDelete
569
+	 */
570
+	public function deleteCascade(AbstractTDBMObject $objToDelete) {
571
+		$this->deleteAllConstraintWithThisObject($objToDelete);
572
+		$this->delete($objToDelete);
573
+	}
574
+
575
+	/**
576
+	 * This function is used only in TDBMService (private function)
577
+	 * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter
578
+	 *
579
+	 * @param TDBMObject $obj
580
+	 * @return TDBMObjectArray
581
+	 */
582
+	private function deleteAllConstraintWithThisObject(TDBMObject $obj) {
583
+		$tableFrom = $this->connection->escapeDBItem($obj->_getDbTableName());
584
+		$constraints = $this->connection->getConstraintsFromTable($tableFrom);
585
+		foreach ($constraints as $constraint) {
586
+			$tableTo = $this->connection->escapeDBItem($constraint["table1"]);
587
+			$colFrom = $this->connection->escapeDBItem($constraint["col2"]);
588
+			$colTo = $this->connection->escapeDBItem($constraint["col1"]);
589
+			$idVarName = $this->connection->escapeDBItem($obj->getPrimaryKey()[0]);
590
+			$idValue = $this->connection->quoteSmart($obj->TDBMObject_id);
591
+			$sql = "SELECT DISTINCT ".$tableTo.".*"
592
+					." FROM ".$tableFrom
593
+					." LEFT JOIN ".$tableTo." ON ".$tableFrom.".".$colFrom." = ".$tableTo.".".$colTo
594
+					." WHERE ".$tableFrom.".".$idVarName."=".$idValue;
595
+			$result = $this->getObjectsFromSQL($constraint["table1"], $sql);
596
+			foreach ($result as $tdbmObj) {
597
+				$this->deleteCascade($tdbmObj);
598
+			}
599
+		}
600
+	}
601 601
 
602 602
 	/**
603 603
 	 * This function performs a save() of all the objects that have been modified.
@@ -997,8 +997,8 @@  discard block
 block discarded – undo
997 997
 	}
998 998
 
999 999
 	/**
1000
- 	* @param array<string, string> $tableToBeanMap
1001
- 	*/
1000
+	 * @param array<string, string> $tableToBeanMap
1001
+	 */
1002 1002
 	public function setTableToBeanMap(array $tableToBeanMap) {
1003 1003
 		$this->tableToBeanMap = $tableToBeanMap;
1004 1004
 	}
@@ -1045,7 +1045,7 @@  discard block
 block discarded – undo
1045 1045
 
1046 1046
 				// Let's save all references in NEW or DETACHED state (we need their primary key)
1047 1047
 				foreach ($references as $fkName => $reference) {
1048
-                    $refStatus = $reference->_getStatus();
1048
+					$refStatus = $reference->_getStatus();
1049 1049
 					if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
1050 1050
 						$this->save($reference);
1051 1051
 					}
@@ -1204,94 +1204,94 @@  discard block
 block discarded – undo
1204 1204
 			throw new TDBMInvalidOperationException("This object has been deleted. It cannot be saved.");
1205 1205
 		}
1206 1206
 
1207
-        // Finally, let's save all the many to many relationships to this bean.
1208
-        $this->persistManyToManyRelationships($object);
1207
+		// Finally, let's save all the many to many relationships to this bean.
1208
+		$this->persistManyToManyRelationships($object);
1209 1209
 	}
1210 1210
 
1211
-    private function persistManyToManyRelationships(AbstractTDBMObject $object) {
1212
-        foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
1213
-            $tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
1214
-            list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
1215
-
1216
-            foreach ($storage as $remoteBean) {
1217
-                /* @var $remoteBean AbstractTDBMObject */
1218
-                $statusArr = $storage[$remoteBean];
1219
-                $status = $statusArr['status'];
1220
-                $reverse = $statusArr['reverse'];
1221
-                if ($reverse) {
1222
-                    continue;
1223
-                }
1224
-
1225
-                if ($status === 'new') {
1226
-                    $remoteBeanStatus = $remoteBean->_getStatus();
1227
-                    if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
1228
-                        // Let's save remote bean if needed.
1229
-                        $this->save($remoteBean);
1230
-                    }
1211
+	private function persistManyToManyRelationships(AbstractTDBMObject $object) {
1212
+		foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
1213
+			$tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
1214
+			list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
1215
+
1216
+			foreach ($storage as $remoteBean) {
1217
+				/* @var $remoteBean AbstractTDBMObject */
1218
+				$statusArr = $storage[$remoteBean];
1219
+				$status = $statusArr['status'];
1220
+				$reverse = $statusArr['reverse'];
1221
+				if ($reverse) {
1222
+					continue;
1223
+				}
1231 1224
 
1232
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
1225
+				if ($status === 'new') {
1226
+					$remoteBeanStatus = $remoteBean->_getStatus();
1227
+					if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
1228
+						// Let's save remote bean if needed.
1229
+						$this->save($remoteBean);
1230
+					}
1233 1231
 
1234
-                    $types = [];
1232
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
1235 1233
 
1236
-                    foreach ($filters as $columnName => $value) {
1237
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
1238
-                        $types[] = $columnDescriptor->getType();
1239
-                    }
1234
+					$types = [];
1235
+
1236
+					foreach ($filters as $columnName => $value) {
1237
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
1238
+						$types[] = $columnDescriptor->getType();
1239
+					}
1240 1240
 
1241
-                    $this->connection->insert($pivotTableName, $filters, $types);
1241
+					$this->connection->insert($pivotTableName, $filters, $types);
1242 1242
 
1243
-                    // Finally, let's mark relationships as saved.
1244
-                    $statusArr['status'] = 'loaded';
1245
-                    $storage[$remoteBean] = $statusArr;
1246
-                    $remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
1247
-                    $remoteStatusArr = $remoteStorage[$object];
1248
-                    $remoteStatusArr['status'] = 'loaded';
1249
-                    $remoteStorage[$object] = $remoteStatusArr;
1243
+					// Finally, let's mark relationships as saved.
1244
+					$statusArr['status'] = 'loaded';
1245
+					$storage[$remoteBean] = $statusArr;
1246
+					$remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
1247
+					$remoteStatusArr = $remoteStorage[$object];
1248
+					$remoteStatusArr['status'] = 'loaded';
1249
+					$remoteStorage[$object] = $remoteStatusArr;
1250 1250
 
1251
-                } elseif ($status === 'delete') {
1252
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
1251
+				} elseif ($status === 'delete') {
1252
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
1253 1253
 
1254
-                    $types = [];
1254
+					$types = [];
1255 1255
 
1256
-                    foreach ($filters as $columnName => $value) {
1257
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
1258
-                        $types[] = $columnDescriptor->getType();
1259
-                    }
1256
+					foreach ($filters as $columnName => $value) {
1257
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
1258
+						$types[] = $columnDescriptor->getType();
1259
+					}
1260
+
1261
+					$this->connection->delete($pivotTableName, $filters, $types);
1262
+
1263
+					// Finally, let's remove relationships completely from bean.
1264
+					$storage->detach($remoteBean);
1265
+					$remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
1266
+				}
1267
+			}
1268
+		}
1269
+	}
1260 1270
 
1261
-                    $this->connection->delete($pivotTableName, $filters, $types);
1262
-
1263
-                    // Finally, let's remove relationships completely from bean.
1264
-                    $storage->detach($remoteBean);
1265
-                    $remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
1266
-                }
1267
-            }
1268
-        }
1269
-    }
1270
-
1271
-    private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk) {
1272
-        $localBeanPk = $this->getPrimaryKeyValues($localBean);
1273
-        $remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
1274
-        $localColumns = $localFk->getLocalColumns();
1275
-        $remoteColumns = $remoteFk->getLocalColumns();
1276
-
1277
-        $localFilters = array_combine($localColumns, $localBeanPk);
1278
-        $remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
1279
-
1280
-        return array_merge($localFilters, $remoteFilters);
1281
-    }
1282
-
1283
-    /**
1284
-     * Returns the "values" of the primary key.
1285
-     * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
1286
-     *
1287
-     * @param AbstractTDBMObject $bean
1288
-     * @return array numerically indexed array of values.
1289
-     */
1290
-    private function getPrimaryKeyValues(AbstractTDBMObject $bean) {
1291
-        $dbRows = $bean->_getDbRows();
1292
-        $dbRow = reset($dbRows);
1293
-        return array_values($dbRow->_getPrimaryKeys());
1294
-    }
1271
+	private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk) {
1272
+		$localBeanPk = $this->getPrimaryKeyValues($localBean);
1273
+		$remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
1274
+		$localColumns = $localFk->getLocalColumns();
1275
+		$remoteColumns = $remoteFk->getLocalColumns();
1276
+
1277
+		$localFilters = array_combine($localColumns, $localBeanPk);
1278
+		$remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
1279
+
1280
+		return array_merge($localFilters, $remoteFilters);
1281
+	}
1282
+
1283
+	/**
1284
+	 * Returns the "values" of the primary key.
1285
+	 * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
1286
+	 *
1287
+	 * @param AbstractTDBMObject $bean
1288
+	 * @return array numerically indexed array of values.
1289
+	 */
1290
+	private function getPrimaryKeyValues(AbstractTDBMObject $bean) {
1291
+		$dbRows = $bean->_getDbRows();
1292
+		$dbRow = reset($dbRows);
1293
+		return array_values($dbRow->_getPrimaryKeys());
1294
+	}
1295 1295
 
1296 1296
 	/**
1297 1297
 	 * Returns a unique hash used to store the object based on its primary key.
@@ -1774,39 +1774,39 @@  discard block
 block discarded – undo
1774 1774
 	 */
1775 1775
 	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) {
1776 1776
 
1777
-        list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
1778
-        /* @var $localFk ForeignKeyConstraint */
1779
-        /* @var $remoteFk ForeignKeyConstraint */
1780
-        $remoteTable = $remoteFk->getForeignTableName();
1777
+		list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
1778
+		/* @var $localFk ForeignKeyConstraint */
1779
+		/* @var $remoteFk ForeignKeyConstraint */
1780
+		$remoteTable = $remoteFk->getForeignTableName();
1781 1781
 
1782 1782
 
1783
-        $primaryKeys = $this->getPrimaryKeyValues($bean);
1784
-        $columnNames = array_map(function($name) use ($pivotTableName) { return $pivotTableName.'.'.$name; }, $localFk->getLocalColumns());
1783
+		$primaryKeys = $this->getPrimaryKeyValues($bean);
1784
+		$columnNames = array_map(function($name) use ($pivotTableName) { return $pivotTableName.'.'.$name; }, $localFk->getLocalColumns());
1785 1785
 
1786
-        $filter = array_combine($columnNames, $primaryKeys);
1786
+		$filter = array_combine($columnNames, $primaryKeys);
1787 1787
 
1788
-        return $this->findObjects($remoteTable, $filter);
1788
+		return $this->findObjects($remoteTable, $filter);
1789 1789
 	}
1790 1790
 
1791
-    /**
1792
-     * @param $pivotTableName
1793
-     * @param AbstractTDBMObject $bean The LOCAL bean
1794
-     * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean.
1795
-     * @throws TDBMException
1796
-     */
1797
-    private function getPivotTableForeignKeys($pivotTableName, AbstractTDBMObject $bean) {
1798
-        $fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
1799
-        $table1 = $fks[0]->getForeignTableName();
1800
-        $table2 = $fks[1]->getForeignTableName();
1801
-
1802
-        $beanTables = array_map(function(DbRow $dbRow) { return $dbRow->_getDbTableName(); }, $bean->_getDbRows());
1803
-
1804
-        if (in_array($table1, $beanTables)) {
1805
-            return [$fks[0], $fks[1]];
1806
-        } elseif (in_array($table2, $beanTables)) {
1807
-            return [$fks[1], $fks[0]];
1808
-        } else {
1809
-            throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2}");
1810
-        }
1811
-    }
1791
+	/**
1792
+	 * @param $pivotTableName
1793
+	 * @param AbstractTDBMObject $bean The LOCAL bean
1794
+	 * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean.
1795
+	 * @throws TDBMException
1796
+	 */
1797
+	private function getPivotTableForeignKeys($pivotTableName, AbstractTDBMObject $bean) {
1798
+		$fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
1799
+		$table1 = $fks[0]->getForeignTableName();
1800
+		$table2 = $fks[1]->getForeignTableName();
1801
+
1802
+		$beanTables = array_map(function(DbRow $dbRow) { return $dbRow->_getDbTableName(); }, $bean->_getDbRows());
1803
+
1804
+		if (in_array($table1, $beanTables)) {
1805
+			return [$fks[0], $fks[1]];
1806
+		} elseif (in_array($table2, $beanTables)) {
1807
+			return [$fks[1], $fks[0]];
1808
+		} else {
1809
+			throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2}");
1810
+		}
1811
+	}
1812 1812
 }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 	 * @param string $className Optional: The name of the class to instanciate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
431 431
 	 * @return TDBMObject
432 432
 	 */
433
-	public function getNewObject($table_name, $auto_assign_id=true, $className = null) {
433
+	public function getNewObject($table_name, $auto_assign_id = true, $className = null) {
434 434
 		if ($this->connection == null) {
435 435
 			throw new TDBMException("Error while calling TDBMObject::getNewObject(): No connection has been established on the database!");
436 436
 		}
@@ -464,8 +464,8 @@  discard block
 block discarded – undo
464 464
 		$object = new $className($this, $table_name);
465 465
 
466 466
 		if ($auto_assign_id && !$this->isPrimaryKeyAutoIncrement($table_name)) {
467
-			$pk_table =  $this->getPrimaryKeyColumns($table_name);
468
-			if (count($pk_table)==1)
467
+			$pk_table = $this->getPrimaryKeyColumns($table_name);
468
+			if (count($pk_table) == 1)
469 469
 			{
470 470
 				$root_table = $this->connection->findRootSequenceTable($table_name);
471 471
 				$id = $this->connection->nextId($root_table);
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 					$sql = "SELECT MAX(".$this->connection->escapeDBItem($pk_table[0]).") AS maxkey FROM ".$root_table;
476 476
 					$res = $this->connection->getAll($sql);
477 477
 					// NOTE: this will work only if the ID is an integer!
478
-					$newid = $res[0]['maxkey'] + 1;
478
+					$newid = $res[0]['maxkey']+1;
479 479
 					if ($newid>$id) {
480 480
 						$id = $newid;
481 481
 					}
@@ -892,9 +892,9 @@  discard block
 block discarded – undo
892 892
 		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
893 893
 		$orderby_bag2 = array();
894 894
 		foreach ($orderby_bag as $thing) {
895
-			if (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
895
+			if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
896 896
 				$orderby_bag2[] = $thing;
897
-			} elseif (is_a($thing,'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
897
+			} elseif (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
898 898
 				$orderby_bag2[] = $thing;
899 899
 			} elseif (is_string($thing)) {
900 900
 				$orderby_bag2[] = new OrderBySQLString($thing);
@@ -1405,7 +1405,7 @@  discard block
 block discarded – undo
1405 1405
 		$schemaAnalyzer = $this->schemaAnalyzer;
1406 1406
 
1407 1407
 		foreach ($tables as $currentTable) {
1408
-			$allParents = [ $currentTable ];
1408
+			$allParents = [$currentTable];
1409 1409
 			$currentFk = null;
1410 1410
 			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
1411 1411
 				$currentTable = $currentFk->getForeignTableName();
@@ -1447,7 +1447,7 @@  discard block
 block discarded – undo
1447 1447
 		// Let's scan the parent tables
1448 1448
 		$currentTable = $table;
1449 1449
 
1450
-		$parentTables = [ ];
1450
+		$parentTables = [];
1451 1451
 
1452 1452
 		// Get parent relationship
1453 1453
 		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
@@ -1538,7 +1538,7 @@  discard block
 block discarded – undo
1538 1538
 	 * @return ResultIterator An object representing an array of results.
1539 1539
 	 * @throws TDBMException
1540 1540
 	 */
1541
-	public function findObjects($mainTable, $filter=null, array $parameters = array(), $orderString=null, array $additionalTablesFetch = array(), $mode = null, $className=null) {
1541
+	public function findObjects($mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, $className = null) {
1542 1542
 		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
1543 1543
 		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
1544 1544
 			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
@@ -1607,7 +1607,7 @@  discard block
 block discarded – undo
1607 1607
 			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
1608 1608
 		}
1609 1609
 
1610
-		$mode = $mode?:$this->mode;
1610
+		$mode = $mode ?: $this->mode;
1611 1611
 
1612 1612
 		return new ResultIterator($sql, $countSql, $parameters, $columnDescList, $this->objectStorage, $className, $this, $this->magicQuery, $mode);
1613 1613
 	}
@@ -1621,7 +1621,7 @@  discard block
 block discarded – undo
1621 1621
 	 * @return AbstractTDBMObject
1622 1622
 	 * @throws TDBMException
1623 1623
 	 */
1624
-	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className=null) {
1624
+	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className = null) {
1625 1625
 		$primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
1626 1626
 		$hash = $this->getObjectHash($primaryKeys);
1627 1627
 
@@ -1641,7 +1641,7 @@  discard block
 block discarded – undo
1641 1641
 			// Only allowed if no inheritance.
1642 1642
 			if (count($tables) === 1) {
1643 1643
 				if ($className === null) {
1644
-					$className = isset($this->tableToBeanMap[$table])?$this->tableToBeanMap[$table]:"Mouf\\Database\\TDBM\\TDBMObject";
1644
+					$className = isset($this->tableToBeanMap[$table]) ? $this->tableToBeanMap[$table] : "Mouf\\Database\\TDBM\\TDBMObject";
1645 1645
 				}
1646 1646
 
1647 1647
 				// Let's construct the bean
@@ -1670,11 +1670,11 @@  discard block
 block discarded – undo
1670 1670
 	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters.
1671 1671
 	 * @throws TDBMException
1672 1672
 	 */
1673
-	public function findObject($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
1673
+	public function findObject($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
1674 1674
 		$objects = $this->findObjects($mainTable, $filterString, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
1675 1675
 		$page = $objects->take(0, 2);
1676 1676
 		$count = $page->count();
1677
-		if ($count > 1) {
1677
+		if ($count>1) {
1678 1678
 			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
1679 1679
 		} elseif ($count === 0) {
1680 1680
 			return null;
@@ -1694,7 +1694,7 @@  discard block
 block discarded – undo
1694 1694
 	 * @return AbstractTDBMObject The object we want
1695 1695
 	 * @throws TDBMException
1696 1696
 	 */
1697
-	public function findObjectOrFail($mainTable, $filterString=null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
1697
+	public function findObjectOrFail($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null) {
1698 1698
 		$bean = $this->findObject($mainTable, $filterString, $parameters, $additionalTablesFetch, $className);
1699 1699
 		if ($bean === null) {
1700 1700
 			throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
Please login to merge, or discard this 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.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -985,7 +985,7 @@  discard block
 block discarded – undo
985 985
 	 * This is used internally by TDBM to add an object to the list of objects that have been
986 986
 	 * created/updated but not saved yet.
987 987
 	 *
988
-	 * @param AbstractTDBMObject $myObject
988
+	 * @param DbRow $myObject
989 989
 	 */
990 990
 	public function _addToToSaveObjectList(DbRow $myObject) {
991 991
 		$this->toSaveObjects[] = $myObject;
@@ -1621,7 +1621,7 @@  discard block
 block discarded – undo
1621 1621
 	}
1622 1622
 
1623 1623
 	/**
1624
-	 * @param $table
1624
+	 * @param string $table
1625 1625
 	 * @param array $primaryKeys
1626 1626
 	 * @param array $additionalTablesFetch
1627 1627
 	 * @param bool $lazy Whether to perform lazy loading on this object or not.
@@ -1778,7 +1778,7 @@  discard block
 block discarded – undo
1778 1778
 	/**
1779 1779
 	 * @param $pivotTableName
1780 1780
 	 * @param AbstractTDBMObject $bean
1781
-	 * @return AbstractTDBMObject[]
1781
+	 * @return ResultIterator
1782 1782
 	 */
1783 1783
 	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean) {
1784 1784
 
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Utils/ScalarBeanPropertyDescriptor.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@
 block discarded – undo
27 27
     /**
28 28
      * Returns the foreignkey the column is part of, if any. null otherwise.
29 29
      *
30
-     * @param Column $column
31
-     * @return ForeignKeyConstraint|null
30
+     * @return boolean
32 31
      */
33 32
     public function getForeignKey() {
34 33
         return false;
Please login to merge, or discard this patch.
Indentation   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -12,88 +12,88 @@  discard block
 block discarded – undo
12 12
  */
13 13
 class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
14 14
 {
15
-    /**
16
-     * @var Column
17
-     */
18
-    private $column;
19
-
20
-
21
-    public function __construct(Table $table, Column $column) {
22
-        parent::__construct($table);
23
-        $this->table = $table;
24
-        $this->column = $column;
25
-    }
26
-
27
-    /**
28
-     * Returns the foreignkey the column is part of, if any. null otherwise.
29
-     *
30
-     * @param Column $column
31
-     * @return ForeignKeyConstraint|null
32
-     */
33
-    public function getForeignKey() {
34
-        return false;
35
-    }
36
-
37
-    /**
38
-     * Returns the param annotation for this property (useful for constructor).
39
-     *
40
-     * @return string
41
-     */
42
-    public function getParamAnnotation() {
43
-        $className = $this->getClassName();
44
-        $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
45
-
46
-        $str = "     * @param %s %s";
47
-        return sprintf($str, $paramType, $this->getVariableName());
48
-    }
49
-
50
-    public function getUpperCamelCaseName() {
51
-        return TDBMDaoGenerator::toCamelCase($this->column->getName());
52
-    }
53
-
54
-    /**
55
-     * Returns the name of the class linked to this property or null if this is not a foreign key
56
-     * @return null|string
57
-     */
58
-    public function getClassName() {
59
-        return null;
60
-    }
61
-
62
-    /**
63
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
64
-     * @return bool
65
-     */
66
-    public function isCompulsory() {
67
-        return $this->column->getNotnull() && !$this->column->getAutoincrement();
68
-    }
69
-
70
-    /**
71
-     * Returns true if the property is the primary key
72
-     * @return bool
73
-     */
74
-    public function isPrimaryKey() {
75
-        return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
76
-    }
77
-
78
-    /**
79
-     * Returns the PHP code for getters and setters
80
-     * @return string
81
-     */
82
-    public function getGetterSetterCode() {
83
-
84
-        $type = $this->column->getType();
85
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
86
-
87
-        $columnGetterName = $this->getGetterName();
88
-        $columnSetterName = $this->getSetterName();
89
-
90
-        if ($normalizedType == "\\DateTimeInterface") {
91
-            $castTo = "\\DateTimeInterface ";
92
-        } else {
93
-            $castTo = "";
94
-        }
95
-
96
-        $getterAndSetterCode = '    /**
15
+	/**
16
+	 * @var Column
17
+	 */
18
+	private $column;
19
+
20
+
21
+	public function __construct(Table $table, Column $column) {
22
+		parent::__construct($table);
23
+		$this->table = $table;
24
+		$this->column = $column;
25
+	}
26
+
27
+	/**
28
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
29
+	 *
30
+	 * @param Column $column
31
+	 * @return ForeignKeyConstraint|null
32
+	 */
33
+	public function getForeignKey() {
34
+		return false;
35
+	}
36
+
37
+	/**
38
+	 * Returns the param annotation for this property (useful for constructor).
39
+	 *
40
+	 * @return string
41
+	 */
42
+	public function getParamAnnotation() {
43
+		$className = $this->getClassName();
44
+		$paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
45
+
46
+		$str = "     * @param %s %s";
47
+		return sprintf($str, $paramType, $this->getVariableName());
48
+	}
49
+
50
+	public function getUpperCamelCaseName() {
51
+		return TDBMDaoGenerator::toCamelCase($this->column->getName());
52
+	}
53
+
54
+	/**
55
+	 * Returns the name of the class linked to this property or null if this is not a foreign key
56
+	 * @return null|string
57
+	 */
58
+	public function getClassName() {
59
+		return null;
60
+	}
61
+
62
+	/**
63
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
64
+	 * @return bool
65
+	 */
66
+	public function isCompulsory() {
67
+		return $this->column->getNotnull() && !$this->column->getAutoincrement();
68
+	}
69
+
70
+	/**
71
+	 * Returns true if the property is the primary key
72
+	 * @return bool
73
+	 */
74
+	public function isPrimaryKey() {
75
+		return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
76
+	}
77
+
78
+	/**
79
+	 * Returns the PHP code for getters and setters
80
+	 * @return string
81
+	 */
82
+	public function getGetterSetterCode() {
83
+
84
+		$type = $this->column->getType();
85
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
86
+
87
+		$columnGetterName = $this->getGetterName();
88
+		$columnSetterName = $this->getSetterName();
89
+
90
+		if ($normalizedType == "\\DateTimeInterface") {
91
+			$castTo = "\\DateTimeInterface ";
92
+		} else {
93
+			$castTo = "";
94
+		}
95
+
96
+		$getterAndSetterCode = '    /**
97 97
      * The getter for the "%s" column.
98 98
      *
99 99
      * @return %s
@@ -112,23 +112,23 @@  discard block
 block discarded – undo
112 112
     }
113 113
 
114 114
 ';
115
-        return sprintf($getterAndSetterCode,
116
-            // Getter
117
-            $this->column->getName(),
118
-            $normalizedType,
119
-            $columnGetterName,
120
-            var_export($this->column->getName(), true),
121
-            var_export($this->table->getName(), true),
122
-            // Setter
123
-            $this->column->getName(),
124
-            $normalizedType,
125
-            $this->column->getName(),
126
-            $columnSetterName,
127
-            $castTo,
128
-            $this->column->getName(),
129
-            var_export($this->column->getName(), true),
130
-            $this->column->getName(),
131
-            var_export($this->table->getName(), true)
132
-        );
133
-    }
115
+		return sprintf($getterAndSetterCode,
116
+			// Getter
117
+			$this->column->getName(),
118
+			$normalizedType,
119
+			$columnGetterName,
120
+			var_export($this->column->getName(), true),
121
+			var_export($this->table->getName(), true),
122
+			// Setter
123
+			$this->column->getName(),
124
+			$normalizedType,
125
+			$this->column->getName(),
126
+			$columnSetterName,
127
+			$castTo,
128
+			$this->column->getName(),
129
+			var_export($this->column->getName(), true),
130
+			$this->column->getName(),
131
+			var_export($this->table->getName(), true)
132
+		);
133
+	}
134 134
 }
Please login to merge, or discard this patch.