thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Utils/ObjectBeanPropertyDescriptor.php

Indentation +118 added lines, -118 removed lines

@@ -14,122 +14,122 @@ 
 class ObjectBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
 
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $foreignKey;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) {
-        parent::__construct($table);
-        $this->foreignKey = $foreignKey;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
-
-
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey() {
-        return $this->foreignKey;
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key
-     * @return null|string
-     */
-    public function getClassName() {
-        return TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation() {
-        $str = "     * @param %s %s";
-        return sprintf($str, $this->getClassName(), $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName() {
-        // First, are there many column or only one?
-        // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
-            $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
-            if ($this->alternativeName) {
-                $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
-
-                $name .= 'By'.implode('And', $camelizedColumns);
-            }
-        } else {
-            $column = $this->foreignKey->getLocalColumns()[0];
-            // Let's remove any _id or id_.
-            if (strpos(strtolower($column), "id_") === 0) {
-                $column = substr($column, 3);
-            }
-            if (strrpos(strtolower($column), "_id") === strlen($column)-3) {
-                $column = substr($column, 0, strlen($column)-3);
-            }
-            $name = TDBMDaoGenerator::toCamelCase($column);
-            if ($this->alternativeName) {
-                $name .= 'Object';
-            }
-        }
-        return $name;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     * @return bool
-     */
-    public function isCompulsory() {
-        // Are all columns nullable?
-        $localColumnNames = $this->foreignKey->getLocalColumns();
-
-        foreach ($localColumnNames as $name) {
-            $column = $this->table->getColumn($name);
-            if ($column->getNotnull()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if the property is the primary key
-     * @return bool
-     */
-    public function isPrimaryKey() {
-        $fkColumns = $this->foreignKey->getLocalColumns();
-        sort($fkColumns);
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-        sort($pkColumns);
-
-        return $fkColumns == $pkColumns;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters
-     * @return string
-     */
-    public function getGetterSetterCode() {
-        $tableName = $this->table->getName();
-        $getterName = $this->getGetterName();
-        $setterName = $this->getSetterName();
-
-        $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
-
-        $str = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $foreignKey;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer) {
+		parent::__construct($table);
+		$this->foreignKey = $foreignKey;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
+
+
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey() {
+		return $this->foreignKey;
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key
+	 * @return null|string
+	 */
+	public function getClassName() {
+		return TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation() {
+		$str = "     * @param %s %s";
+		return sprintf($str, $this->getClassName(), $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName() {
+		// First, are there many column or only one?
+		// If one column, we name the setter after it. Otherwise, we name the setter after the table name
+		if (count($this->foreignKey->getLocalColumns()) > 1) {
+			$name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
+			if ($this->alternativeName) {
+				$camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
+
+				$name .= 'By'.implode('And', $camelizedColumns);
+			}
+		} else {
+			$column = $this->foreignKey->getLocalColumns()[0];
+			// Let's remove any _id or id_.
+			if (strpos(strtolower($column), "id_") === 0) {
+				$column = substr($column, 3);
+			}
+			if (strrpos(strtolower($column), "_id") === strlen($column)-3) {
+				$column = substr($column, 0, strlen($column)-3);
+			}
+			$name = TDBMDaoGenerator::toCamelCase($column);
+			if ($this->alternativeName) {
+				$name .= 'Object';
+			}
+		}
+		return $name;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 * @return bool
+	 */
+	public function isCompulsory() {
+		// Are all columns nullable?
+		$localColumnNames = $this->foreignKey->getLocalColumns();
+
+		foreach ($localColumnNames as $name) {
+			$column = $this->table->getColumn($name);
+			if ($column->getNotnull()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if the property is the primary key
+	 * @return bool
+	 */
+	public function isPrimaryKey() {
+		$fkColumns = $this->foreignKey->getLocalColumns();
+		sort($fkColumns);
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+		sort($pkColumns);
+
+		return $fkColumns == $pkColumns;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters
+	 * @return string
+	 */
+	public function getGetterSetterCode() {
+		$tableName = $this->table->getName();
+		$getterName = $this->getGetterName();
+		$setterName = $this->getSetterName();
+
+		$referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
+
+		$str = '    /**
      * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(" and ", $this->foreignKey->getLocalColumns()).' column.
      *
      * @return '.$referencedBeanName.'
@@ -148,6 +148,6 @@ 
     }
 
 ';
-        return $str;
-    }
+		return $str;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
     public function getUpperCamelCaseName() {
         // First, are there many column or only one?
         // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
+        if (count($this->foreignKey->getLocalColumns())>1) {
             $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
             if ($this->alternativeName) {
                 $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
@@ -144,7 +144,7 @@ 
      * @param '.$referencedBeanName.' $object
      */
     public function '.$setterName.'('.$referencedBeanName.' $object = null) {
-        $this->setRef(' . var_export($this->foreignKey->getName(), true) . ', $object, '.var_export($tableName, true).');
+        $this->setRef(' . var_export($this->foreignKey->getName(), true).', $object, '.var_export($tableName, true).');
     }
 
 ';

src/Mouf/Database/TDBM/Utils/BeanDescriptor.php

Indentation +410 added lines, -410 removed lines

@@ -15,232 +15,232 @@ 
  */
 class BeanDescriptor
 {
-    /**
-     * @var Table
-     */
-    private $table;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @var AbstractBeanPropertyDescriptor[]
-     */
-    private $beanPropertyDescriptors = [];
-
-    public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema) {
-        $this->table = $table;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->initBeanPropertyDescriptors();
-    }
-
-    private function initBeanPropertyDescriptors() {
-        $this->beanPropertyDescriptors = $this->getProperties($this->table);
-    }
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @param Table $table
-     * @param Column $column
-     * @return ForeignKeyConstraint|null
-     */
-    private function isPartOfForeignKey(Table $table, Column $column) {
-        $localColumnName = $column->getName();
-        foreach ($table->getForeignKeys() as $foreignKey) {
-            foreach ($foreignKey->getColumns() as $columnName) {
-                if ($columnName === $localColumnName) {
-                    return $foreignKey;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getBeanPropertyDescriptors()
-    {
-        return $this->beanPropertyDescriptors;
-    }
-
-    /**
-     * Returns the list of columns that are not nullable and not autogenerated for a given table and its parent.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getConstructorProperties() {
-
-        $constructorProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
-           return $property->isCompulsory();
-        });
-
-        return $constructorProperties;
-    }
-
-    /**
-     * Returns the list of properties exposed as getters and setters in this class.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getExposedProperties() {
-        $exposedProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
-            return $property->getTable()->getName() == $this->table->getName();
-        });
-
-        return $exposedProperties;
-    }
-
-    /**
-     * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys
-     * from junction tables and from inheritance.
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    public function getIncomingForeignKeys() {
-
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        $junctionTableNames = array_map(function(Table $table) { return $table->getName(); }, $junctionTables);
-        $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($this->table->getName());
-
-        $fks = [];
-        foreach ($this->schema->getTables() as $table) {
-            foreach ($table->getForeignKeys() as $fk) {
-                if ($fk->getForeignTableName() === $this->table->getName()) {
-                    if (in_array($fk->getLocalTableName(), $junctionTableNames)) {
-                        continue;
-                    }
-                    foreach ($childrenRelationships as $childFk) {
-                        if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) {
-                            continue 2;
-                        }
-                    }
-                    $fks[] = $fk;
-                }
-            }
-        }
-
-        return $fks;
-    }
-
-    /**
-     * Returns the list of properties for this table (including parent tables).
-     *
-     * @param Table $table
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    private function getProperties(Table $table)
-    {
-        $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-        if ($parentRelationship) {
-            $parentTable = $this->schema->getTable($parentRelationship->getForeignTableName());
-            $properties = $this->getProperties($parentTable);
-            // we merge properties by overriding property names.
-            $localProperties = $this->getPropertiesForTable($table);
-            foreach ($localProperties as $name => $property) {
-                // We do not override properties if this is a primary key!
-                if ($property->isPrimaryKey()) {
-                    continue;
-                }
-                $properties[$name] = $property;
-            }
-            //$properties = array_merge($properties, $localProperties);
-
-        } else {
-            $properties = $this->getPropertiesForTable($table);
-        }
-
-        return $properties;
-    }
-
-        /**
-     * Returns the list of properties for this table (ignoring parent tables).
-     *
-     * @param Table $table
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    private function getPropertiesForTable(Table $table)
-    {
-        $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-        if ($parentRelationship) {
-            $ignoreColumns = $parentRelationship->getLocalColumns();
-        } else {
-            $ignoreColumns = [];
-        }
-
-        $beanPropertyDescriptors = [];
-
-        foreach ($table->getColumns() as $column) {
-            if (array_search($column->getName(), $ignoreColumns) !== false) {
-                continue;
-            }
-
-            $fk = $this->isPartOfForeignKey($table, $column);
-            if ($fk !== null) {
-                // Check that previously added descriptors are not added on same FK (can happen with multi key FK).
-                foreach ($beanPropertyDescriptors as $beanDescriptor) {
-                    if ($beanDescriptor instanceof ObjectBeanPropertyDescriptor && $beanDescriptor->getForeignKey() === $fk) {
-                        continue 2;
-                    }
-                }
-                // Check that this property is not an inheritance relationship
-                $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-                if ($parentRelationship === $fk) {
-                    continue;
-                }
-
-                $beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->schemaAnalyzer);
-            } else {
-                $beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column);
-            }
-        }
-
-        // Now, let's get the name of all properties and let's check there is no duplicate.
-        /** @var $names AbstractBeanPropertyDescriptor[] */
-        $names = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $name = $beanDescriptor->getUpperCamelCaseName();
-            if (isset($names[$name])) {
-                $names[$name]->useAlternativeName();
-                $beanDescriptor->useAlternativeName();
-            } else {
-                $names[$name] = $beanDescriptor;
-            }
-        }
-
-        // Final check (throw exceptions if problem arises)
-        $names = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $name = $beanDescriptor->getUpperCamelCaseName();
-            if (isset($names[$name])) {
-                throw new TDBMException("Unsolvable name conflict while generating method name");
-            } else {
-                $names[$name] = $beanDescriptor;
-            }
-        }
-
-        // Last step, let's rebuild the list with a map:
-        $beanPropertyDescriptorsMap = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $beanPropertyDescriptorsMap[$beanDescriptor->getLowerCamelCaseName()] = $beanDescriptor;
-        }
-
-        return $beanPropertyDescriptorsMap;
-    }
-
-    public function generateBeanConstructor() {
-        $constructorProperties = $this->getConstructorProperties();
-
-        $constructorCode = "    /**
+	/**
+	 * @var Table
+	 */
+	private $table;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @var AbstractBeanPropertyDescriptor[]
+	 */
+	private $beanPropertyDescriptors = [];
+
+	public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema) {
+		$this->table = $table;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->initBeanPropertyDescriptors();
+	}
+
+	private function initBeanPropertyDescriptors() {
+		$this->beanPropertyDescriptors = $this->getProperties($this->table);
+	}
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @param Table $table
+	 * @param Column $column
+	 * @return ForeignKeyConstraint|null
+	 */
+	private function isPartOfForeignKey(Table $table, Column $column) {
+		$localColumnName = $column->getName();
+		foreach ($table->getForeignKeys() as $foreignKey) {
+			foreach ($foreignKey->getColumns() as $columnName) {
+				if ($columnName === $localColumnName) {
+					return $foreignKey;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getBeanPropertyDescriptors()
+	{
+		return $this->beanPropertyDescriptors;
+	}
+
+	/**
+	 * Returns the list of columns that are not nullable and not autogenerated for a given table and its parent.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getConstructorProperties() {
+
+		$constructorProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
+		   return $property->isCompulsory();
+		});
+
+		return $constructorProperties;
+	}
+
+	/**
+	 * Returns the list of properties exposed as getters and setters in this class.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getExposedProperties() {
+		$exposedProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
+			return $property->getTable()->getName() == $this->table->getName();
+		});
+
+		return $exposedProperties;
+	}
+
+	/**
+	 * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys
+	 * from junction tables and from inheritance.
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	public function getIncomingForeignKeys() {
+
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		$junctionTableNames = array_map(function(Table $table) { return $table->getName(); }, $junctionTables);
+		$childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($this->table->getName());
+
+		$fks = [];
+		foreach ($this->schema->getTables() as $table) {
+			foreach ($table->getForeignKeys() as $fk) {
+				if ($fk->getForeignTableName() === $this->table->getName()) {
+					if (in_array($fk->getLocalTableName(), $junctionTableNames)) {
+						continue;
+					}
+					foreach ($childrenRelationships as $childFk) {
+						if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) {
+							continue 2;
+						}
+					}
+					$fks[] = $fk;
+				}
+			}
+		}
+
+		return $fks;
+	}
+
+	/**
+	 * Returns the list of properties for this table (including parent tables).
+	 *
+	 * @param Table $table
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	private function getProperties(Table $table)
+	{
+		$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+		if ($parentRelationship) {
+			$parentTable = $this->schema->getTable($parentRelationship->getForeignTableName());
+			$properties = $this->getProperties($parentTable);
+			// we merge properties by overriding property names.
+			$localProperties = $this->getPropertiesForTable($table);
+			foreach ($localProperties as $name => $property) {
+				// We do not override properties if this is a primary key!
+				if ($property->isPrimaryKey()) {
+					continue;
+				}
+				$properties[$name] = $property;
+			}
+			//$properties = array_merge($properties, $localProperties);
+
+		} else {
+			$properties = $this->getPropertiesForTable($table);
+		}
+
+		return $properties;
+	}
+
+		/**
+		 * Returns the list of properties for this table (ignoring parent tables).
+		 *
+		 * @param Table $table
+		 * @return AbstractBeanPropertyDescriptor[]
+		 */
+	private function getPropertiesForTable(Table $table)
+	{
+		$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+		if ($parentRelationship) {
+			$ignoreColumns = $parentRelationship->getLocalColumns();
+		} else {
+			$ignoreColumns = [];
+		}
+
+		$beanPropertyDescriptors = [];
+
+		foreach ($table->getColumns() as $column) {
+			if (array_search($column->getName(), $ignoreColumns) !== false) {
+				continue;
+			}
+
+			$fk = $this->isPartOfForeignKey($table, $column);
+			if ($fk !== null) {
+				// Check that previously added descriptors are not added on same FK (can happen with multi key FK).
+				foreach ($beanPropertyDescriptors as $beanDescriptor) {
+					if ($beanDescriptor instanceof ObjectBeanPropertyDescriptor && $beanDescriptor->getForeignKey() === $fk) {
+						continue 2;
+					}
+				}
+				// Check that this property is not an inheritance relationship
+				$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+				if ($parentRelationship === $fk) {
+					continue;
+				}
+
+				$beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->schemaAnalyzer);
+			} else {
+				$beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column);
+			}
+		}
+
+		// Now, let's get the name of all properties and let's check there is no duplicate.
+		/** @var $names AbstractBeanPropertyDescriptor[] */
+		$names = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$name = $beanDescriptor->getUpperCamelCaseName();
+			if (isset($names[$name])) {
+				$names[$name]->useAlternativeName();
+				$beanDescriptor->useAlternativeName();
+			} else {
+				$names[$name] = $beanDescriptor;
+			}
+		}
+
+		// Final check (throw exceptions if problem arises)
+		$names = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$name = $beanDescriptor->getUpperCamelCaseName();
+			if (isset($names[$name])) {
+				throw new TDBMException("Unsolvable name conflict while generating method name");
+			} else {
+				$names[$name] = $beanDescriptor;
+			}
+		}
+
+		// Last step, let's rebuild the list with a map:
+		$beanPropertyDescriptorsMap = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$beanPropertyDescriptorsMap[$beanDescriptor->getLowerCamelCaseName()] = $beanDescriptor;
+		}
+
+		return $beanPropertyDescriptorsMap;
+	}
+
+	public function generateBeanConstructor() {
+		$constructorProperties = $this->getConstructorProperties();
+
+		$constructorCode = "    /**
      * The constructor takes all compulsory arguments.
      *
 %s
@@ -250,64 +250,64 @@ 
     }
     ";
 
-        $paramAnnotations = [];
-        $arguments = [];
-        $assigns = [];
-        $parentConstructorArguments = [];
-
-        foreach ($constructorProperties as $property) {
-            $className = $property->getClassName();
-            if ($className) {
-                $arguments[] = $className.' '.$property->getVariableName();
-            } else {
-                $arguments[] = $property->getVariableName();
-            }
-            $paramAnnotations[] = $property->getParamAnnotation();
-            if ($property->getTable()->getName() === $this->table->getName()) {
-                $assigns[] = $property->getConstructorAssignCode();
-            } else {
-                $parentConstructorArguments[] = $property->getVariableName();
-            }
-        }
-
-        $parentConstrutorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
-
-        return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(", ", $arguments), $parentConstrutorCode, implode("\n", $assigns));
-    }
+		$paramAnnotations = [];
+		$arguments = [];
+		$assigns = [];
+		$parentConstructorArguments = [];
+
+		foreach ($constructorProperties as $property) {
+			$className = $property->getClassName();
+			if ($className) {
+				$arguments[] = $className.' '.$property->getVariableName();
+			} else {
+				$arguments[] = $property->getVariableName();
+			}
+			$paramAnnotations[] = $property->getParamAnnotation();
+			if ($property->getTable()->getName() === $this->table->getName()) {
+				$assigns[] = $property->getConstructorAssignCode();
+			} else {
+				$parentConstructorArguments[] = $property->getVariableName();
+			}
+		}
 
-    public function generateDirectForeignKeysCode() {
-        $fks = $this->getIncomingForeignKeys();
+		$parentConstrutorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
 
-        $fksByTable = [];
+		return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(", ", $arguments), $parentConstrutorCode, implode("\n", $assigns));
+	}
 
-        foreach ($fks as $fk) {
-            $fksByTable[$fk->getLocalTableName()][] = $fk;
-        }
+	public function generateDirectForeignKeysCode() {
+		$fks = $this->getIncomingForeignKeys();
 
-        /* @var $fksByMethodName ForeignKeyConstraint[] */
-        $fksByMethodName = [];
+		$fksByTable = [];
 
-        foreach ($fksByTable as $tableName => $fksForTable) {
-            if (count($fksForTable) > 1) {
-                foreach ($fksForTable as $fk) {
-                    $methodName = 'get'.TDBMDaoGenerator::toCamelCase($fk->getLocalTableName()).'By';
+		foreach ($fks as $fk) {
+			$fksByTable[$fk->getLocalTableName()][] = $fk;
+		}
 
-                    $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $fk->getLocalColumns());
+		/* @var $fksByMethodName ForeignKeyConstraint[] */
+		$fksByMethodName = [];
 
-                    $methodName .= implode('And', $camelizedColumns);
+		foreach ($fksByTable as $tableName => $fksForTable) {
+			if (count($fksForTable) > 1) {
+				foreach ($fksForTable as $fk) {
+					$methodName = 'get'.TDBMDaoGenerator::toCamelCase($fk->getLocalTableName()).'By';
 
-                    $fksByMethodName[$methodName] = $fk;
-                }
-            } else {
-                $methodName = 'get'.TDBMDaoGenerator::toCamelCase($fksForTable[0]->getLocalTableName());
-                $fksByMethodName[$methodName] = $fk;
-            }
-        }
+					$camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $fk->getLocalColumns());
 
-        $code = '';
+					$methodName .= implode('And', $camelizedColumns);
 
-        foreach ($fksByMethodName as $methodName => $fk) {
-            $getterCode = '    /**
+					$fksByMethodName[$methodName] = $fk;
+				}
+			} else {
+				$methodName = 'get'.TDBMDaoGenerator::toCamelCase($fksForTable[0]->getLocalTableName());
+				$fksByMethodName[$methodName] = $fk;
+			}
+		}
+
+		$code = '';
+
+		foreach ($fksByMethodName as $methodName => $fk) {
+			$getterCode = '    /**
      * Returns the list of %s pointing to this bean via the %s column.
      *
      * @return %s[]|Resultiterator
@@ -319,103 +319,103 @@ 
 
 ';
 
-            list($sql, $parametersCode) = $this->getFilters($fk);
-
-            $beanClass = TDBMDaoGenerator::getBeanNameFromTableName($fk->getLocalTableName());
-            $code .= sprintf($getterCode,
-                $beanClass,
-                implode(', ', $fk->getColumns()),
-                $beanClass,
-                $methodName,
-                var_export($fk->getLocalTableName(), true),
-                $sql,
-                $parametersCode
-            );
-        }
-
-        return $code;
-    }
-
-    private function getFilters(ForeignKeyConstraint $fk) {
-        $sqlParts = [];
-        $counter = 0;
-        $parameters = [];
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-
-        foreach ($fk->getLocalColumns() as $columnName) {
-            $paramName = "tdbmparam".$counter;
-            $sqlParts[] = $fk->getLocalTableName().'.'.$columnName." = :".$paramName;
-
-            $pkColumn = $pkColumns[$counter];
-            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($paramName, true), var_export($pkColumn, true), var_export($this->table->getName(), true));
-            $counter++;
-        }
-        $sql = "'".implode(' AND ', $sqlParts)."'";
-        $parametersCode = '[ '.implode(', ', $parameters).' ]';
-
-        return [$sql, $parametersCode];
-    }
-
-    /**
-     * Generate code section about pivot tables
-     *
-     * @return string;
-     */
-    public function generatePivotTableCode() {
-        $descs = [];
-        foreach ($this->schemaAnalyzer->detectJunctionTables() as $table) {
-            // There are exactly 2 FKs since this is a pivot table.
-            $fks = array_values($table->getForeignKeys());
-
-            if ($fks[0]->getForeignTableName() === $this->table->getName()) {
-                $localFK = $fks[0];
-                $remoteFK = $fks[1];
-            } elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
-                $localFK = $fks[1];
-                $remoteFK = $fks[0];
-            } else {
-                continue;
-            }
-
-            $descs[$remoteFK->getForeignTableName()][] = [
-                'table' => $table,
-                'localFK' => $localFK,
-                'remoteFK' => $remoteFK
-            ];
-
-        }
-
-        $finalDescs = [];
-        foreach ($descs as $descArray) {
-            if (count($descArray) > 1) {
-                foreach ($descArray as $desc) {
-                    $desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName())."By".TDBMDaoGenerator::toCamelCase($desc['table']->getName());
-                    $finalDescs[] = $desc;
-                }
-            } else {
-                $desc = $descArray[0];
-                $desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName());
-                $finalDescs[] = $desc;
-            }
-        }
-
-
-        $code = '';
-
-        foreach ($finalDescs as $desc) {
-            $code .= $this->getPivotTableCode($desc['name'], $desc['table'], $desc['localFK'], $desc['remoteFK']);
-        }
-
-        return $code;
-    }
-
-    public function getPivotTableCode($name, Table $table, ForeignKeyConstraint $localFK, ForeignKeyConstraint $remoteFK) {
-        $singularName = TDBMDaoGenerator::toSingular($name);
-        $remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($remoteFK->getForeignTableName());
-        $variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
-
-        $str = '    /**
+			list($sql, $parametersCode) = $this->getFilters($fk);
+
+			$beanClass = TDBMDaoGenerator::getBeanNameFromTableName($fk->getLocalTableName());
+			$code .= sprintf($getterCode,
+				$beanClass,
+				implode(', ', $fk->getColumns()),
+				$beanClass,
+				$methodName,
+				var_export($fk->getLocalTableName(), true),
+				$sql,
+				$parametersCode
+			);
+		}
+
+		return $code;
+	}
+
+	private function getFilters(ForeignKeyConstraint $fk) {
+		$sqlParts = [];
+		$counter = 0;
+		$parameters = [];
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+
+		foreach ($fk->getLocalColumns() as $columnName) {
+			$paramName = "tdbmparam".$counter;
+			$sqlParts[] = $fk->getLocalTableName().'.'.$columnName." = :".$paramName;
+
+			$pkColumn = $pkColumns[$counter];
+			$parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($paramName, true), var_export($pkColumn, true), var_export($this->table->getName(), true));
+			$counter++;
+		}
+		$sql = "'".implode(' AND ', $sqlParts)."'";
+		$parametersCode = '[ '.implode(', ', $parameters).' ]';
+
+		return [$sql, $parametersCode];
+	}
+
+	/**
+	 * Generate code section about pivot tables
+	 *
+	 * @return string;
+	 */
+	public function generatePivotTableCode() {
+		$descs = [];
+		foreach ($this->schemaAnalyzer->detectJunctionTables() as $table) {
+			// There are exactly 2 FKs since this is a pivot table.
+			$fks = array_values($table->getForeignKeys());
+
+			if ($fks[0]->getForeignTableName() === $this->table->getName()) {
+				$localFK = $fks[0];
+				$remoteFK = $fks[1];
+			} elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
+				$localFK = $fks[1];
+				$remoteFK = $fks[0];
+			} else {
+				continue;
+			}
+
+			$descs[$remoteFK->getForeignTableName()][] = [
+				'table' => $table,
+				'localFK' => $localFK,
+				'remoteFK' => $remoteFK
+			];
+
+		}
+
+		$finalDescs = [];
+		foreach ($descs as $descArray) {
+			if (count($descArray) > 1) {
+				foreach ($descArray as $desc) {
+					$desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName())."By".TDBMDaoGenerator::toCamelCase($desc['table']->getName());
+					$finalDescs[] = $desc;
+				}
+			} else {
+				$desc = $descArray[0];
+				$desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName());
+				$finalDescs[] = $desc;
+			}
+		}
+
+
+		$code = '';
+
+		foreach ($finalDescs as $desc) {
+			$code .= $this->getPivotTableCode($desc['name'], $desc['table'], $desc['localFK'], $desc['remoteFK']);
+		}
+
+		return $code;
+	}
+
+	public function getPivotTableCode($name, Table $table, ForeignKeyConstraint $localFK, ForeignKeyConstraint $remoteFK) {
+		$singularName = TDBMDaoGenerator::toSingular($name);
+		$remoteBeanName = TDBMDaoGenerator::getBeanNameFromTableName($remoteFK->getForeignTableName());
+		$variableName = '$'.TDBMDaoGenerator::toVariableName($remoteBeanName);
+
+		$str = '    /**
      * Returns the list of %s associated to this bean via the %s pivot table.
      *
      * @return %s[]
@@ -425,9 +425,9 @@ 
     }
 ';
 
-        $getterCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $name, var_export($remoteFK->getLocalTableName(), true));
+		$getterCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $name, var_export($remoteFK->getLocalTableName(), true));
 
-        $str = '    /**
+		$str = '    /**
      * Adds a relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -437,9 +437,9 @@ 
     }
 ';
 
-        $adderCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
+		$adderCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Deletes the relationship with %s associated to this bean via the %s pivot table.
      *
      * @param %s %s
@@ -449,9 +449,9 @@ 
     }
 ';
 
-        $removerCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
+		$removerCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
 
-        $str = '    /**
+		$str = '    /**
      * Returns whether this bean is associated with %s via the %s pivot table.
      *
      * @param %s %s
@@ -462,34 +462,34 @@ 
     }
 ';
 
-        $hasCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
+		$hasCode = sprintf($str, $remoteBeanName, $table->getName(), $remoteBeanName, $variableName, $singularName, $remoteBeanName, $variableName, var_export($remoteFK->getLocalTableName(), true), $variableName);
 
 
-        $code = $getterCode.$adderCode.$removerCode.$hasCode;
+		$code = $getterCode.$adderCode.$removerCode.$hasCode;
 
-        return $code;
-    }
+		return $code;
+	}
 
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param string $beannamespace The namespace of the bean
-     */
-    public function generatePhpCode($beannamespace) {
-        $baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($this->table->getName());
-        $className = TDBMDaoGenerator::getBeanNameFromTableName($this->table->getName());
-        $tableName = $this->table->getName();
-
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-        if ($parentFk !== null) {
-            $extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
-            $use = "";
-        } else {
-            $extends = "AbstractTDBMObject";
-            $use = "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n\n";
-        }
-
-        $str = "<?php
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param string $beannamespace The namespace of the bean
+	 */
+	public function generatePhpCode($beannamespace) {
+		$baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($this->table->getName());
+		$className = TDBMDaoGenerator::getBeanNameFromTableName($this->table->getName());
+		$tableName = $this->table->getName();
+
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+		if ($parentFk !== null) {
+			$extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
+			$use = "";
+		} else {
+			$extends = "AbstractTDBMObject";
+			$use = "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n\n";
+		}
+
+		$str = "<?php
 namespace {$beannamespace};
 
 use Mouf\\Database\\TDBM\\ResultIterator;
@@ -507,19 +507,19 @@ 
 {
 ";
 
-        $str .= $this->generateBeanConstructor();
+		$str .= $this->generateBeanConstructor();
 
 
 
-        foreach ($this->getExposedProperties() as $property) {
-            $str .= $property->getGetterSetterCode();
-        }
+		foreach ($this->getExposedProperties() as $property) {
+			$str .= $property->getGetterSetterCode();
+		}
 
-        $str .= $this->generateDirectForeignKeysCode();
-        $str .= $this->generatePivotTableCode();
+		$str .= $this->generateDirectForeignKeysCode();
+		$str .= $this->generatePivotTableCode();
 
-        $str .= "}
+		$str .= "}
 ";
-        return $str;
-    }
+		return $str;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -288,7 +288,7 @@ 
         $fksByMethodName = [];
 
         foreach ($fksByTable as $tableName => $fksForTable) {
-            if (count($fksForTable) > 1) {
+            if (count($fksForTable)>1) {
                 foreach ($fksForTable as $fk) {
                     $methodName = 'get'.TDBMDaoGenerator::toCamelCase($fk->getLocalTableName()).'By';
 
@@ -388,7 +388,7 @@ 
 
         $finalDescs = [];
         foreach ($descs as $descArray) {
-            if (count($descArray) > 1) {
+            if (count($descArray)>1) {
                 foreach ($descArray as $desc) {
                     $desc['name'] = TDBMDaoGenerator::toCamelCase($desc['remoteFK']->getForeignTableName())."By".TDBMDaoGenerator::toCamelCase($desc['table']->getName());
                     $finalDescs[] = $desc;

src/Mouf/Database/TDBM/Utils/AbstractBeanPropertyDescriptor.php

Indentation +93 added lines, -93 removed lines

@@ -13,97 +13,97 @@
 abstract class AbstractBeanPropertyDescriptor
 {
 
-    /**
-     * @var Table
-     */
-    protected $table;
-
-    /**
-     * Whether to use the more complex name in case of conflict.
-     * @var bool
-     */
-    protected $alternativeName = false;
-
-    /**
-     * @param Table $table
-     */
-    public function __construct(Table $table)
-    {
-        $this->table = $table;
-    }
-
-
-    /**
-     * Use the more complex name in case of conflict.
-     */
-    public function useAlternativeName()
-    {
-        $this->alternativeName = true;
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key
-     * @return null|string
-     */
-    abstract public function getClassName();
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    abstract public function getParamAnnotation();
-
-    public function getVariableName() {
-        return '$'.$this->getLowerCamelCaseName();
-    }
-
-    public function getLowerCamelCaseName() {
-        return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
-    }
-
-    abstract public function getUpperCamelCaseName();
-
-    public function getSetterName() {
-        return 'set'.$this->getUpperCamelCaseName();
-    }
-
-    public function getGetterName() {
-        return 'get'.$this->getUpperCamelCaseName();
-    }
-
-    /**
-     * Returns the PHP code used in the ben constructor for this property.
-     * @return string
-     */
-    public function getConstructorAssignCode() {
-        $str = '        $this->%s(%s);';
-        return sprintf($str, $this->getSetterName(), $this->getVariableName());
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     * @return bool
-     */
-    abstract public function isCompulsory();
-
-    /**
-     * Returns true if the property is the primary key
-     * @return bool
-     */
-    abstract public function isPrimaryKey();
-
-    /**
-     * @return Table
-     */
-    public function getTable()
-    {
-        return $this->table;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters
-     * @return string
-     */
-    abstract public function getGetterSetterCode();
+	/**
+	 * @var Table
+	 */
+	protected $table;
+
+	/**
+	 * Whether to use the more complex name in case of conflict.
+	 * @var bool
+	 */
+	protected $alternativeName = false;
+
+	/**
+	 * @param Table $table
+	 */
+	public function __construct(Table $table)
+	{
+		$this->table = $table;
+	}
+
+
+	/**
+	 * Use the more complex name in case of conflict.
+	 */
+	public function useAlternativeName()
+	{
+		$this->alternativeName = true;
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key
+	 * @return null|string
+	 */
+	abstract public function getClassName();
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	abstract public function getParamAnnotation();
+
+	public function getVariableName() {
+		return '$'.$this->getLowerCamelCaseName();
+	}
+
+	public function getLowerCamelCaseName() {
+		return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
+	}
+
+	abstract public function getUpperCamelCaseName();
+
+	public function getSetterName() {
+		return 'set'.$this->getUpperCamelCaseName();
+	}
+
+	public function getGetterName() {
+		return 'get'.$this->getUpperCamelCaseName();
+	}
+
+	/**
+	 * Returns the PHP code used in the ben constructor for this property.
+	 * @return string
+	 */
+	public function getConstructorAssignCode() {
+		$str = '        $this->%s(%s);';
+		return sprintf($str, $this->getSetterName(), $this->getVariableName());
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 * @return bool
+	 */
+	abstract public function isCompulsory();
+
+	/**
+	 * Returns true if the property is the primary key
+	 * @return bool
+	 */
+	abstract public function isPrimaryKey();
+
+	/**
+	 * @return Table
+	 */
+	public function getTable()
+	{
+		return $this->table;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters
+	 * @return string
+	 */
+	abstract public function getGetterSetterCode();
 }
\ No newline at end of file

src/Mouf/Database/TDBM/Controllers/TdbmController.php

Indentation +3 added lines, -3 removed lines

@@ -59,10 +59,10 @@ 
 		}
 				
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
 			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
+			if ($autoloadNamespaces) {
 				$this->autoloadDetected = true;
 				$rootNamespace = $autoloadNamespaces[0];
 				$this->daoNamespace = $rootNamespace."Dao";
@@ -138,7 +138,7 @@ 
 		
 		$tdbmService = new InstanceProxy($name);
 		/* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc);
 
 
 		$moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 	 * @Action
 	 * //@Admin
 	 */
-	public function defaultAction($name, $selfedit="false") {
+	public function defaultAction($name, $selfedit = "false") {
 		$this->initController($name, $selfedit);
 		
 		// Fill variables
@@ -87,7 +87,7 @@ 
 	 * @param string $name
 	 * @param bool $selfedit
 	 */
-	public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit="false") {
+	public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = "false") {
 		$this->initController($name, $selfedit);
 
 		self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc);
@@ -108,7 +108,7 @@ 
 	 * @param bool $storeInUtc
 	 * @throws \Mouf\MoufException
 	 */
-	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit="false", $storeInUtc = null) {
+	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = "false", $storeInUtc = null) {
 		$moufManager->setVariable("tdbmDefaultDaoNamespace_".$name, $daonamespace);
 		$moufManager->setVariable("tdbmDefaultBeanNamespace_".$name, $beannamespace);
 		$moufManager->setVariable("tdbmDefaultDaoFactoryName_".$name, $daofactoryclassname);
@@ -155,7 +155,7 @@ 
 			$moufManager->bindComponentViaSetter($instanceName, "setTdbmService", $name);
 			$moufManager->bindComponentViaSetter($daofactoryinstancename, "set".$daoName, $instanceName);
 
-			$tableToBeanMap[$table] = $beannamespace . "\\" . TDBMDaoGenerator::getBeanNameFromTableName($table);
+			$tableToBeanMap[$table] = $beannamespace."\\".TDBMDaoGenerator::getBeanNameFromTableName($table);
 		}
 		$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor($name);
 		$tdbmServiceDescriptor->getSetterProperty("setTableToBeanMap")->setValue($tableToBeanMap);

src/Mouf/Database/TDBM/AmbiguityException.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	}
 
 	private function getAllPossiblePaths() {
-        return AmbiguityException::getAllPossiblePathsRec($this->paths);
+		return AmbiguityException::getAllPossiblePathsRec($this->paths);
 	}
 
 	private static function getAllPossiblePathsRec($sub_table_paths)

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 	public function explainAmbiguity() {
 		$all_paths = $this->getAllPossiblePaths();
 
-		$i=0;
+		$i = 0;
 		$width_px = 0;
 		$height_px = 0;
 		$global_height_px = 0;
@@ -50,11 +50,11 @@ 
 
 	private static function getAllPossiblePathsRec($sub_table_paths)
 	{
-		if (count($sub_table_paths)==0)
+		if (count($sub_table_paths) == 0)
 		return array();
 
 		$table_path = array_shift($sub_table_paths);
-		$possible_sub_paths =  AmbiguityException::getAllPossiblePathsRec($sub_table_paths);
+		$possible_sub_paths = AmbiguityException::getAllPossiblePathsRec($sub_table_paths);
 		$return_table_paths = array();
 		foreach ($table_path['paths'] as $path) {
 			if (count($possible_sub_paths)>0)

Braces +5 added lines, -4 removed lines

@@ -50,8 +50,9 @@ 
 
 	private static function getAllPossiblePathsRec($sub_table_paths)
 	{
-		if (count($sub_table_paths)==0)
-		return array();
+		if (count($sub_table_paths)==0) {
+				return array();
+		}
 
 		$table_path = array_shift($sub_table_paths);
 		$possible_sub_paths =  AmbiguityException::getAllPossiblePathsRec($sub_table_paths);
@@ -63,9 +64,9 @@ 
 				{
 					$return_table_paths[] = array_merge(array(array('paths'=>array($path))), $possible_sub_path);
 				}
+			} else {
+						$return_table_paths[] = array(array('paths'=>array($path)));
 			}
-			else
-			$return_table_paths[] = array(array('paths'=>array($path)));
 		}
 		return $return_table_paths;
 	}

src/Mouf/Database/TDBM/TDBMObjectStateEnum.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
  * @author David Negrier
  */
 final class TDBMObjectStateEnum extends AbstractTDBMObject {
-    const STATE_DETACHED = "detached";
-    const STATE_NEW = "new";
-    const STATE_NOT_LOADED = "not loaded";
-    const STATE_LOADED = "loaded";
-    const STATE_DIRTY = "dirty";
-    const STATE_DELETED = "deleted";
+	const STATE_DETACHED = "detached";
+	const STATE_NEW = "new";
+	const STATE_NOT_LOADED = "not loaded";
+	const STATE_LOADED = "loaded";
+	const STATE_DIRTY = "dirty";
+	const STATE_DELETED = "deleted";
 }

src/Mouf/Database/TDBM/InnerResultArray.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
 
 	private function toIndex($offset) {
-		if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
+		if ($offset<0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
 			throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
 		}
 		if ($this->statement === null) {

src/Mouf/Database/TDBM/TDBMObjectArray.php

Indentation +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 	 * @param string $func_name
 	 * @param $values
 	 * @return array|void
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    public function __call($func_name, $values) {
+	public function __call($func_name, $values) {
 
 		if (strpos($func_name,"getarray_") === 0) {
 			$column = substr($func_name, 9);

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
 class TDBMObjectArray extends \ArrayObject implements \JsonSerializable {
 	public function __get($var) {
 		$cnt = count($this);
-		if ($cnt==1)
+		if ($cnt == 1)
 		{
 			return $this[0]->__get($var);
 		}
@@ -44,7 +44,7 @@ 
 
 	public function __set($var, $value) {
 		$cnt = count($this);
-		if ($cnt==1)
+		if ($cnt == 1)
 		{
 			return $this[0]->__set($var, $value);
 		}
@@ -69,13 +69,13 @@ 
 	 */
     public function __call($func_name, $values) {
 
-		if (strpos($func_name,"getarray_") === 0) {
+		if (strpos($func_name, "getarray_") === 0) {
 			$column = substr($func_name, 9);
 			return $this->getarray($column);
-		} elseif (strpos($func_name,"setarray_") === 0) {
+		} elseif (strpos($func_name, "setarray_") === 0) {
 			$column = substr($func_name, 9);
 			return $this->setarray($column, $values[0]);
-		} elseif (count($this)==1) {
+		} elseif (count($this) == 1) {
 			$this[0]->__call($func_name, $values);
 		}
 		else
@@ -99,7 +99,7 @@ 
 		}
 	}
 	
-	public function jsonSerialize(){
+	public function jsonSerialize() {
 		return (array) $this;
 	}
 }

Braces +5 added lines, -10 removed lines

@@ -31,12 +31,10 @@ 
 		if ($cnt==1)
 		{
 			return $this[0]->__get($var);
-		}
-		elseif ($cnt>1)
+		} elseif ($cnt>1)
 		{
 			throw new TDBMException('Array contains many objects! Use getarray_'.$var.' to retrieve an array of '.$var);
-		}
-		else
+		} else
 		{
 			throw new TDBMException('Array contains no objects');
 		}
@@ -47,12 +45,10 @@ 
 		if ($cnt==1)
 		{
 			return $this[0]->__set($var, $value);
-		}
-		elseif ($cnt>1)
+		} elseif ($cnt>1)
 		{
 			throw new TDBMException('Array contains many objects! Use setarray_'.$var.' to set the array of '.$var);
-		}
-		else
+		} else
 		{
 			throw new TDBMException('Array contains no objects');
 		}
@@ -77,8 +73,7 @@ 
 			return $this->setarray($column, $values[0]);
 		} elseif (count($this)==1) {
 			$this[0]->__call($func_name, $values);
-		}
-		else
+		} else
 		{
 			throw new TDBMException("Method ".$func_name." not found");
 		}

src/Mouf/Database/TDBM/InnerResultIterator.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-use Doctrine\DBAL\Driver\Connection;
 
 
 /**