Completed
Pull Request — 3.4 (#46)
by David
18:51
created
src/Mouf/Database/TDBM/AbstractTDBMObject.php 1 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.
src/Mouf/Database/TDBM/TDBMService.php 1 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.
src/Mouf/Database/TDBM/TDBMObject.php 1 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.
src/Mouf/Database/TDBM/TDBMSchemaAnalyzer.php 1 patch
Indentation   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -15,96 +15,96 @@
 block discarded – undo
15 15
 class TDBMSchemaAnalyzer
16 16
 {
17 17
 
18
-    private $connection;
18
+	private $connection;
19 19
 
20
-    /**
21
-     * @var Schema
22
-     */
23
-    private $schema;
20
+	/**
21
+	 * @var Schema
22
+	 */
23
+	private $schema;
24 24
 
25
-    /**
26
-     * @var string
27
-     */
28
-    private $cachePrefix;
25
+	/**
26
+	 * @var string
27
+	 */
28
+	private $cachePrefix;
29 29
 
30
-    /**
31
-     * @var Cache
32
-     */
33
-    private $cache;
30
+	/**
31
+	 * @var Cache
32
+	 */
33
+	private $cache;
34 34
 
35
-    /**
36
-     * @var SchemaAnalyzer
37
-     */
38
-    private $schemaAnalyzer;
35
+	/**
36
+	 * @var SchemaAnalyzer
37
+	 */
38
+	private $schemaAnalyzer;
39 39
 
40
-    /**
41
-     * @param Connection $connection The DBAL DB connection to use
42
-     * @param Cache $cache A cache service to be used
43
-     * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
44
-     * 										 Will be automatically created if not passed.
45
-     */
46
-    public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) {
47
-        $this->connection = $connection;
48
-        $this->cache = $cache;
49
-        $this->schemaAnalyzer = $schemaAnalyzer;
50
-    }
40
+	/**
41
+	 * @param Connection $connection The DBAL DB connection to use
42
+	 * @param Cache $cache A cache service to be used
43
+	 * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
44
+	 * 										 Will be automatically created if not passed.
45
+	 */
46
+	public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer) {
47
+		$this->connection = $connection;
48
+		$this->cache = $cache;
49
+		$this->schemaAnalyzer = $schemaAnalyzer;
50
+	}
51 51
 
52
-    /**
53
-     * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
54
-     * @return string
55
-     */
56
-    public function getCachePrefix() {
57
-        if ($this->cachePrefix === null) {
58
-            $this->cachePrefix = hash('md4', $this->connection->getHost()."-".$this->connection->getPort()."-".$this->connection->getDatabase()."-".$this->connection->getDriver()->getName());
59
-        }
60
-        return $this->cachePrefix;
61
-    }
52
+	/**
53
+	 * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
54
+	 * @return string
55
+	 */
56
+	public function getCachePrefix() {
57
+		if ($this->cachePrefix === null) {
58
+			$this->cachePrefix = hash('md4', $this->connection->getHost()."-".$this->connection->getPort()."-".$this->connection->getDatabase()."-".$this->connection->getDriver()->getName());
59
+		}
60
+		return $this->cachePrefix;
61
+	}
62 62
 
63
-    /**
64
-     * Returns the (cached) schema.
65
-     *
66
-     * @return Schema
67
-     */
68
-    public function getSchema() {
69
-        if ($this->schema === null) {
70
-            $cacheKey = $this->getCachePrefix().'_schema';
71
-            if ($this->cache->contains($cacheKey)) {
72
-                $this->schema = $this->cache->fetch($cacheKey);
73
-            } else {
74
-                $this->schema = $this->connection->getSchemaManager()->createSchema();
75
-                $this->cache->save($cacheKey, $this->schema);
76
-            }
77
-        }
78
-        return $this->schema;
79
-    }
63
+	/**
64
+	 * Returns the (cached) schema.
65
+	 *
66
+	 * @return Schema
67
+	 */
68
+	public function getSchema() {
69
+		if ($this->schema === null) {
70
+			$cacheKey = $this->getCachePrefix().'_schema';
71
+			if ($this->cache->contains($cacheKey)) {
72
+				$this->schema = $this->cache->fetch($cacheKey);
73
+			} else {
74
+				$this->schema = $this->connection->getSchemaManager()->createSchema();
75
+				$this->cache->save($cacheKey, $this->schema);
76
+			}
77
+		}
78
+		return $this->schema;
79
+	}
80 80
 
81
-    /**
82
-     * Returns the list of pivot tables linked to table $tableName
83
-     * @param string $tableName
84
-     * @return array|string[]
85
-     */
86
-    public function getPivotTableLinkedToTable($tableName) {
87
-        $cacheKey = $this->getCachePrefix().'_pivottables_link';
88
-        if ($this->cache->contains($cacheKey)) {
89
-            return $this->cache->fetch($cacheKey);
90
-        }
81
+	/**
82
+	 * Returns the list of pivot tables linked to table $tableName
83
+	 * @param string $tableName
84
+	 * @return array|string[]
85
+	 */
86
+	public function getPivotTableLinkedToTable($tableName) {
87
+		$cacheKey = $this->getCachePrefix().'_pivottables_link';
88
+		if ($this->cache->contains($cacheKey)) {
89
+			return $this->cache->fetch($cacheKey);
90
+		}
91 91
 
92
-        $pivotTables = [];
92
+		$pivotTables = [];
93 93
 
94
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
95
-        foreach ($junctionTables as $table) {
96
-            $fks = $table->getForeignKeys();
97
-            foreach ($fks as $fk) {
98
-                if ($fk->getForeignTableName() == $tableName) {
99
-                    $pivotTables[] = $table->getName();
100
-                    break;
101
-                }
102
-            }
103
-        }
94
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
95
+		foreach ($junctionTables as $table) {
96
+			$fks = $table->getForeignKeys();
97
+			foreach ($fks as $fk) {
98
+				if ($fk->getForeignTableName() == $tableName) {
99
+					$pivotTables[] = $table->getName();
100
+					break;
101
+				}
102
+			}
103
+		}
104 104
 
105
-        $this->cache->save($cacheKey, $pivotTables);
106
-        return $pivotTables;
107
-    }
105
+		$this->cache->save($cacheKey, $pivotTables);
106
+		return $pivotTables;
107
+	}
108 108
 
109 109
 
110 110
 }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,10 +59,10 @@  discard block
 block discarded – undo
59 59
 		}
60 60
 				
61 61
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
62
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
62
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
63 63
 
64 64
 			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
65
-            if ($autoloadNamespaces) {
65
+			if ($autoloadNamespaces) {
66 66
 				$this->autoloadDetected = true;
67 67
 				$rootNamespace = $autoloadNamespaces[0];
68 68
 				$this->daoNamespace = $rootNamespace."Dao";
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 		
139 139
 		$tdbmService = new InstanceProxy($name);
140 140
 		/* @var $tdbmService TDBMService */
141
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
141
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
142 142
 
143 143
 
144 144
 		$moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php 1 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.
src/Mouf/Database/TDBM/TDBMObjectStateEnum.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
  * @author David Negrier
26 26
  */
27 27
 final class TDBMObjectStateEnum extends AbstractTDBMObject {
28
-    const STATE_DETACHED = "detached";
29
-    const STATE_NEW = "new";
30
-    const STATE_NOT_LOADED = "not loaded";
31
-    const STATE_LOADED = "loaded";
32
-    const STATE_DIRTY = "dirty";
33
-    const STATE_DELETED = "deleted";
28
+	const STATE_DETACHED = "detached";
29
+	const STATE_NEW = "new";
30
+	const STATE_NOT_LOADED = "not loaded";
31
+	const STATE_LOADED = "loaded";
32
+	const STATE_DIRTY = "dirty";
33
+	const STATE_DELETED = "deleted";
34 34
 }
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/DbRow.php 1 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.
src/Mouf/Database/TDBM/MapIterator.php 1 patch
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -9,85 +9,85 @@
 block discarded – undo
9 9
  */
10 10
 class MapIterator implements Iterator {
11 11
 
12
-    /**
13
-     * @var Iterator
14
-     */
15
-    protected $iterator;
12
+	/**
13
+	 * @var Iterator
14
+	 */
15
+	protected $iterator;
16 16
 
17
-    /**
18
-     * @var callable Modifies the current item in iterator
19
-     */
20
-    protected $callable;
17
+	/**
18
+	 * @var callable Modifies the current item in iterator
19
+	 */
20
+	protected $callable;
21 21
 
22
-    /**
23
-     * @param $iterator Iterator|array
24
-     * @param $callable callable This can have two parameters
25
-     * @throws TDBMException
26
-     */
27
-    public function __construct($iterator, callable $callable) {
28
-        if (is_array($iterator)) {
29
-            $this->iterator = new \ArrayIterator($iterator);
30
-        }
31
-        elseif (!($iterator instanceof Iterator))
32
-        {
33
-            throw new TDBMException("\$iterator parameter must be an instance of Iterator");
34
-        }
35
-        else
36
-        {
37
-            $this->iterator = $iterator;
38
-        }
22
+	/**
23
+	 * @param $iterator Iterator|array
24
+	 * @param $callable callable This can have two parameters
25
+	 * @throws TDBMException
26
+	 */
27
+	public function __construct($iterator, callable $callable) {
28
+		if (is_array($iterator)) {
29
+			$this->iterator = new \ArrayIterator($iterator);
30
+		}
31
+		elseif (!($iterator instanceof Iterator))
32
+		{
33
+			throw new TDBMException("\$iterator parameter must be an instance of Iterator");
34
+		}
35
+		else
36
+		{
37
+			$this->iterator = $iterator;
38
+		}
39 39
 
40
-        if ($callable instanceof \Closure) {
41
-            // make sure there's one argument
42
-            $reflection = new \ReflectionObject($callable);
43
-            if ($reflection->hasMethod('__invoke')) {
44
-                $method = $reflection->getMethod('__invoke');
45
-                if ($method->getNumberOfParameters() !== 1) {
46
-                    throw new TDBMException("\$callable must accept one and only one parameter.");
47
-                }
48
-            }
49
-        }
40
+		if ($callable instanceof \Closure) {
41
+			// make sure there's one argument
42
+			$reflection = new \ReflectionObject($callable);
43
+			if ($reflection->hasMethod('__invoke')) {
44
+				$method = $reflection->getMethod('__invoke');
45
+				if ($method->getNumberOfParameters() !== 1) {
46
+					throw new TDBMException("\$callable must accept one and only one parameter.");
47
+				}
48
+			}
49
+		}
50 50
 
51
-        $this->callable = $callable;
52
-    }
51
+		$this->callable = $callable;
52
+	}
53 53
 
54
-    /**
55
-     * Alters the current item with $this->callable and returns a new item.
56
-     * Be careful with your types as we can't do static type checking here!
57
-     * @return mixed
58
-     */
59
-    public function current()
60
-    {
61
-        $callable = $this->callable;
62
-        return $callable($this->iterator->current());
63
-    }
54
+	/**
55
+	 * Alters the current item with $this->callable and returns a new item.
56
+	 * Be careful with your types as we can't do static type checking here!
57
+	 * @return mixed
58
+	 */
59
+	public function current()
60
+	{
61
+		$callable = $this->callable;
62
+		return $callable($this->iterator->current());
63
+	}
64 64
 
65
-    public function next()
66
-    {
67
-        $this->iterator->next();
68
-    }
65
+	public function next()
66
+	{
67
+		$this->iterator->next();
68
+	}
69 69
 
70
-    public function key()
71
-    {
72
-        return $this->iterator->key();
73
-    }
70
+	public function key()
71
+	{
72
+		return $this->iterator->key();
73
+	}
74 74
 
75
-    public function valid()
76
-    {
77
-        return $this->iterator->valid();
78
-    }
75
+	public function valid()
76
+	{
77
+		return $this->iterator->valid();
78
+	}
79 79
 
80
-    public function rewind()
81
-    {
82
-        $this->iterator->rewind();
83
-    }
80
+	public function rewind()
81
+	{
82
+		$this->iterator->rewind();
83
+	}
84 84
 
85
-    /**
86
-     * Casts the iterator to a PHP array.
87
-     *
88
-     * @return array
89
-     */
90
-    public function toArray() {
91
-        return iterator_to_array($this);
92
-    }
85
+	/**
86
+	 * Casts the iterator to a PHP array.
87
+	 *
88
+	 * @return array
89
+	 */
90
+	public function toArray() {
91
+		return iterator_to_array($this);
92
+	}
93 93
 }
Please login to merge, or discard this patch.