thecodingmachine / database.tdbm

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

Indentation +625 added lines, -625 removed lines

@@ -16,241 +16,241 @@ 
  */
 class BeanDescriptor implements BeanDescriptorInterface
 {
-    /**
-     * @var Table
-     */
-    private $table;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @var AbstractBeanPropertyDescriptor[]
-     */
-    private $beanPropertyDescriptors = [];
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-
-    /**
-     * @param Table $table
-     * @param SchemaAnalyzer $schemaAnalyzer
-     * @param Schema $schema
-     * @param TDBMSchemaAnalyzer $tdbmSchemaAnalyzer
-     * @param NamingStrategyInterface $namingStrategy
-     */
-    public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer, NamingStrategyInterface $namingStrategy)
-    {
-        $this->table = $table;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->namingStrategy = $namingStrategy;
-        $this->initBeanPropertyDescriptors();
-    }
-
-    private function initBeanPropertyDescriptors()
-    {
-        $this->beanPropertyDescriptors = $this->getProperties($this->table);
-    }
-
-    /**
-     * Returns the foreign-key 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;
-    }
-
-    /**
-     * @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 columns that have default values for a given table.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getPropertiesWithDefault()
-    {
-        $properties = $this->getPropertiesForTable($this->table);
-        $defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->hasDefault();
-        });
-
-        return $defaultProperties;
-    }
-
-    /**
-     * Returns the list of properties exposed as getters and setters in this class.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getExposedProperties(): array
-    {
-        $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->getTable()->getName() == $this->table->getName();
-        });
-
-        return $exposedProperties;
-    }
-
-    /**
-     * 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;
-            }
-        } 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, $this->namingStrategy);
-            } else {
-                $beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column, $this->namingStrategy);
-            }
-        }
-
-        // 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;
-    }
-
-    private function generateBeanConstructor() : string
-    {
-        $constructorProperties = $this->getConstructorProperties();
-
-        $constructorCode = '    /**
+	/**
+	 * @var Table
+	 */
+	private $table;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @var AbstractBeanPropertyDescriptor[]
+	 */
+	private $beanPropertyDescriptors = [];
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+
+	/**
+	 * @param Table $table
+	 * @param SchemaAnalyzer $schemaAnalyzer
+	 * @param Schema $schema
+	 * @param TDBMSchemaAnalyzer $tdbmSchemaAnalyzer
+	 * @param NamingStrategyInterface $namingStrategy
+	 */
+	public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer, NamingStrategyInterface $namingStrategy)
+	{
+		$this->table = $table;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->namingStrategy = $namingStrategy;
+		$this->initBeanPropertyDescriptors();
+	}
+
+	private function initBeanPropertyDescriptors()
+	{
+		$this->beanPropertyDescriptors = $this->getProperties($this->table);
+	}
+
+	/**
+	 * Returns the foreign-key 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;
+	}
+
+	/**
+	 * @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 columns that have default values for a given table.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getPropertiesWithDefault()
+	{
+		$properties = $this->getPropertiesForTable($this->table);
+		$defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->hasDefault();
+		});
+
+		return $defaultProperties;
+	}
+
+	/**
+	 * Returns the list of properties exposed as getters and setters in this class.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getExposedProperties(): array
+	{
+		$exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->getTable()->getName() == $this->table->getName();
+		});
+
+		return $exposedProperties;
+	}
+
+	/**
+	 * 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;
+			}
+		} 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, $this->namingStrategy);
+			} else {
+				$beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column, $this->namingStrategy);
+			}
+		}
+
+		// 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;
+	}
+
+	private function generateBeanConstructor() : string
+	{
+		$constructorProperties = $this->getConstructorProperties();
+
+		$constructorCode = '    /**
      * The constructor takes all compulsory arguments.
      *
 %s
@@ -260,110 +260,110 @@ 
 %s%s    }
     ';
 
-        $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()."\n";
-            } else {
-                $parentConstructorArguments[] = $property->getVariableName();
-            }
-        }
-
-        $parentConstructorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
-
-        foreach ($this->getPropertiesWithDefault() as $property) {
-            $assigns[] = $property->assignToDefaultCode()."\n";
-        }
-
-        return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstructorCode, implode('', $assigns));
-    }
-
-    public function getDirectForeignKeysDescriptors(): array
-    {
-        $fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($this->table->getName());
-
-        $descriptors = [];
-
-        foreach ($fks as $fk) {
-            $descriptors[] = new DirectForeignKeyMethodDescriptor($fk, $this->table, $this->namingStrategy);
-        }
-
-        return $descriptors;
-    }
-
-    private function getPivotTableDescriptors(): array
-    {
-        $descs = [];
-        foreach ($this->schemaAnalyzer->detectJunctionTables(true) 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()) {
-                list($localFk, $remoteFk) = $fks;
-            } elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
-                list($remoteFk, $localFk) = $fks;
-            } else {
-                continue;
-            }
-
-            $descs[] = new PivotTableMethodsDescriptor($table, $localFk, $remoteFk, $this->namingStrategy);
-        }
-
-        return $descs;
-    }
-
-    /**
-     * Returns the list of method descriptors (and applies the alternative name if needed).
-     *
-     * @return MethodDescriptorInterface[]
-     */
-    private function getMethodDescriptors(): array
-    {
-        $directForeignKeyDescriptors = $this->getDirectForeignKeysDescriptors();
-        $pivotTableDescriptors = $this->getPivotTableDescriptors();
-
-        $descriptors = array_merge($directForeignKeyDescriptors, $pivotTableDescriptors);
-
-        // Descriptors by method names
-        $descriptorsByMethodName = [];
-
-        foreach ($descriptors as $descriptor) {
-            $descriptorsByMethodName[$descriptor->getName()][] = $descriptor;
-        }
-
-        foreach ($descriptorsByMethodName as $descriptorsForMethodName) {
-            if (count($descriptorsForMethodName) > 1) {
-                foreach ($descriptorsForMethodName as $descriptor) {
-                    $descriptor->useAlternativeName();
-                }
-            }
-        }
-
-        return $descriptors;
-    }
-
-    public function generateJsonSerialize(): string
-    {
-        $tableName = $this->table->getName();
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-        if ($parentFk !== null) {
-            $initializer = '$array = parent::jsonSerialize($stopRecursion);';
-        } else {
-            $initializer = '$array = [];';
-        }
-
-        $str = '
+		$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()."\n";
+			} else {
+				$parentConstructorArguments[] = $property->getVariableName();
+			}
+		}
+
+		$parentConstructorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
+
+		foreach ($this->getPropertiesWithDefault() as $property) {
+			$assigns[] = $property->assignToDefaultCode()."\n";
+		}
+
+		return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstructorCode, implode('', $assigns));
+	}
+
+	public function getDirectForeignKeysDescriptors(): array
+	{
+		$fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($this->table->getName());
+
+		$descriptors = [];
+
+		foreach ($fks as $fk) {
+			$descriptors[] = new DirectForeignKeyMethodDescriptor($fk, $this->table, $this->namingStrategy);
+		}
+
+		return $descriptors;
+	}
+
+	private function getPivotTableDescriptors(): array
+	{
+		$descs = [];
+		foreach ($this->schemaAnalyzer->detectJunctionTables(true) 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()) {
+				list($localFk, $remoteFk) = $fks;
+			} elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
+				list($remoteFk, $localFk) = $fks;
+			} else {
+				continue;
+			}
+
+			$descs[] = new PivotTableMethodsDescriptor($table, $localFk, $remoteFk, $this->namingStrategy);
+		}
+
+		return $descs;
+	}
+
+	/**
+	 * Returns the list of method descriptors (and applies the alternative name if needed).
+	 *
+	 * @return MethodDescriptorInterface[]
+	 */
+	private function getMethodDescriptors(): array
+	{
+		$directForeignKeyDescriptors = $this->getDirectForeignKeysDescriptors();
+		$pivotTableDescriptors = $this->getPivotTableDescriptors();
+
+		$descriptors = array_merge($directForeignKeyDescriptors, $pivotTableDescriptors);
+
+		// Descriptors by method names
+		$descriptorsByMethodName = [];
+
+		foreach ($descriptors as $descriptor) {
+			$descriptorsByMethodName[$descriptor->getName()][] = $descriptor;
+		}
+
+		foreach ($descriptorsByMethodName as $descriptorsForMethodName) {
+			if (count($descriptorsForMethodName) > 1) {
+				foreach ($descriptorsForMethodName as $descriptor) {
+					$descriptor->useAlternativeName();
+				}
+			}
+		}
+
+		return $descriptors;
+	}
+
+	public function generateJsonSerialize(): string
+	{
+		$tableName = $this->table->getName();
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+		if ($parentFk !== null) {
+			$initializer = '$array = parent::jsonSerialize($stopRecursion);';
+		} else {
+			$initializer = '$array = [];';
+		}
+
+		$str = '
     /**
      * Serializes the object for JSON encoding.
      *
@@ -379,77 +379,77 @@ 
     }
 ';
 
-        $propertiesCode = '';
-        foreach ($this->beanPropertyDescriptors as $beanPropertyDescriptor) {
-            $propertiesCode .= $beanPropertyDescriptor->getJsonSerializeCode();
-        }
-
-        // Many2many relationships
-        $methodsCode = '';
-        foreach ($this->getMethodDescriptors() as $methodDescriptor) {
-            $methodsCode .= $methodDescriptor->getJsonSerializeCode();
-        }
-
-        return sprintf($str, $initializer, $propertiesCode, $methodsCode);
-    }
-
-    /**
-     * Returns as an array the class we need to extend from and the list of use statements.
-     *
-     * @param ForeignKeyConstraint|null $parentFk
-     * @return array
-     */
-    private function generateExtendsAndUseStatements(ForeignKeyConstraint $parentFk = null): array
-    {
-        $classes = [];
-        if ($parentFk !== null) {
-            $extends = $this->namingStrategy->getBeanClassName($parentFk->getForeignTableName());
-            $classes[] = $extends;
-        }
-
-        foreach ($this->getBeanPropertyDescriptors() as $beanPropertyDescriptor) {
-            $className = $beanPropertyDescriptor->getClassName();
-            if (null !== $className) {
-                $classes[] = $beanPropertyDescriptor->getClassName();
-            }
-        }
-
-        foreach ($this->getMethodDescriptors() as $descriptor) {
-            $classes = array_merge($classes, $descriptor->getUsedClasses());
-        }
-
-        $classes = array_unique($classes);
-
-        return $classes;
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param string $beannamespace The namespace of the bean
-     * @return string
-     */
-    public function generatePhpCode($beannamespace): string
-    {
-        $tableName = $this->table->getName();
-        $baseClassName = $this->namingStrategy->getBaseBeanClassName($tableName);
-        $className = $this->namingStrategy->getBeanClassName($tableName);
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($this->table->getName());
-
-        $classes = $this->generateExtendsAndUseStatements($parentFk);
-
-        $uses = array_map(function ($className) use ($beannamespace) {
-            return 'use '.$beannamespace.'\\'.$className.";\n";
-        }, $classes);
-        $use = implode('', $uses);
-
-        $extends = $this->getExtendedBeanClassName();
-        if ($extends === null) {
-            $extends = 'AbstractTDBMObject';
-            $use .= "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n";
-        }
-
-        $str = "<?php
+		$propertiesCode = '';
+		foreach ($this->beanPropertyDescriptors as $beanPropertyDescriptor) {
+			$propertiesCode .= $beanPropertyDescriptor->getJsonSerializeCode();
+		}
+
+		// Many2many relationships
+		$methodsCode = '';
+		foreach ($this->getMethodDescriptors() as $methodDescriptor) {
+			$methodsCode .= $methodDescriptor->getJsonSerializeCode();
+		}
+
+		return sprintf($str, $initializer, $propertiesCode, $methodsCode);
+	}
+
+	/**
+	 * Returns as an array the class we need to extend from and the list of use statements.
+	 *
+	 * @param ForeignKeyConstraint|null $parentFk
+	 * @return array
+	 */
+	private function generateExtendsAndUseStatements(ForeignKeyConstraint $parentFk = null): array
+	{
+		$classes = [];
+		if ($parentFk !== null) {
+			$extends = $this->namingStrategy->getBeanClassName($parentFk->getForeignTableName());
+			$classes[] = $extends;
+		}
+
+		foreach ($this->getBeanPropertyDescriptors() as $beanPropertyDescriptor) {
+			$className = $beanPropertyDescriptor->getClassName();
+			if (null !== $className) {
+				$classes[] = $beanPropertyDescriptor->getClassName();
+			}
+		}
+
+		foreach ($this->getMethodDescriptors() as $descriptor) {
+			$classes = array_merge($classes, $descriptor->getUsedClasses());
+		}
+
+		$classes = array_unique($classes);
+
+		return $classes;
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param string $beannamespace The namespace of the bean
+	 * @return string
+	 */
+	public function generatePhpCode($beannamespace): string
+	{
+		$tableName = $this->table->getName();
+		$baseClassName = $this->namingStrategy->getBaseBeanClassName($tableName);
+		$className = $this->namingStrategy->getBeanClassName($tableName);
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($this->table->getName());
+
+		$classes = $this->generateExtendsAndUseStatements($parentFk);
+
+		$uses = array_map(function ($className) use ($beannamespace) {
+			return 'use '.$beannamespace.'\\'.$className.";\n";
+		}, $classes);
+		$use = implode('', $uses);
+
+		$extends = $this->getExtendedBeanClassName();
+		if ($extends === null) {
+			$extends = 'AbstractTDBMObject';
+			$use .= "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n";
+		}
+
+		$str = "<?php
 namespace {$beannamespace}\\Generated;
 
 use Mouf\\Database\\TDBM\\ResultIterator;
@@ -469,125 +469,125 @@ 
 {
 ";
 
-        $str .= $this->generateBeanConstructor();
+		$str .= $this->generateBeanConstructor();
 
-        foreach ($this->getExposedProperties() as $property) {
-            $str .= $property->getGetterSetterCode();
-        }
+		foreach ($this->getExposedProperties() as $property) {
+			$str .= $property->getGetterSetterCode();
+		}
 
-        foreach ($this->getMethodDescriptors() as $methodDescriptor) {
-            $str .= $methodDescriptor->getCode();
-        }
-        $str .= $this->generateJsonSerialize();
+		foreach ($this->getMethodDescriptors() as $methodDescriptor) {
+			$str .= $methodDescriptor->getCode();
+		}
+		$str .= $this->generateJsonSerialize();
 
-        $str .= $this->generateGetUsedTablesCode();
+		$str .= $this->generateGetUsedTablesCode();
 
-        $str .= $this->generateOnDeleteCode();
+		$str .= $this->generateOnDeleteCode();
 
-        $str .= '}
+		$str .= '}
 ';
 
-        return $str;
-    }
-
-    /**
-     * @param string $beanNamespace
-     * @param string $beanClassName
-     *
-     * @return array first element: list of used beans, second item: PHP code as a string
-     */
-    public function generateFindByDaoCode($beanNamespace, $beanClassName)
-    {
-        $code = '';
-        $usedBeans = [];
-        foreach ($this->table->getIndexes() as $index) {
-            if (!$index->isPrimary()) {
-                list($usedBeansForIndex, $codeForIndex) = $this->generateFindByDaoCodeForIndex($index, $beanNamespace, $beanClassName);
-                $code .= $codeForIndex;
-                $usedBeans = array_merge($usedBeans, $usedBeansForIndex);
-            }
-        }
-
-        return [$usedBeans, $code];
-    }
-
-    /**
-     * @param Index  $index
-     * @param string $beanNamespace
-     * @param string $beanClassName
-     *
-     * @return array first element: list of used beans, second item: PHP code as a string
-     */
-    private function generateFindByDaoCodeForIndex(Index $index, $beanNamespace, $beanClassName)
-    {
-        $columns = $index->getColumns();
-        $usedBeans = [];
-
-        /*
+		return $str;
+	}
+
+	/**
+	 * @param string $beanNamespace
+	 * @param string $beanClassName
+	 *
+	 * @return array first element: list of used beans, second item: PHP code as a string
+	 */
+	public function generateFindByDaoCode($beanNamespace, $beanClassName)
+	{
+		$code = '';
+		$usedBeans = [];
+		foreach ($this->table->getIndexes() as $index) {
+			if (!$index->isPrimary()) {
+				list($usedBeansForIndex, $codeForIndex) = $this->generateFindByDaoCodeForIndex($index, $beanNamespace, $beanClassName);
+				$code .= $codeForIndex;
+				$usedBeans = array_merge($usedBeans, $usedBeansForIndex);
+			}
+		}
+
+		return [$usedBeans, $code];
+	}
+
+	/**
+	 * @param Index  $index
+	 * @param string $beanNamespace
+	 * @param string $beanClassName
+	 *
+	 * @return array first element: list of used beans, second item: PHP code as a string
+	 */
+	private function generateFindByDaoCodeForIndex(Index $index, $beanNamespace, $beanClassName)
+	{
+		$columns = $index->getColumns();
+		$usedBeans = [];
+
+		/*
          * The list of elements building this index (expressed as columns or foreign keys)
          * @var AbstractBeanPropertyDescriptor[]
          */
-        $elements = [];
-
-        foreach ($columns as $column) {
-            $fk = $this->isPartOfForeignKey($this->table, $this->table->getColumn($column));
-            if ($fk !== null) {
-                if (!in_array($fk, $elements)) {
-                    $elements[] = new ObjectBeanPropertyDescriptor($this->table, $fk, $this->schemaAnalyzer, $this->namingStrategy);
-                }
-            } else {
-                $elements[] = new ScalarBeanPropertyDescriptor($this->table, $this->table->getColumn($column), $this->namingStrategy);
-            }
-        }
-
-        // If the index is actually only a foreign key, let's bypass it entirely.
-        if (count($elements) === 1 && $elements[0] instanceof ObjectBeanPropertyDescriptor) {
-            return [[], ''];
-        }
-
-        $methodNameComponent = [];
-        $functionParameters = [];
-        $first = true;
-        foreach ($elements as $element) {
-            $methodNameComponent[] = $element->getUpperCamelCaseName();
-            $functionParameter = $element->getClassName();
-            if ($functionParameter) {
-                $usedBeans[] = $beanNamespace.'\\'.$functionParameter;
-                $functionParameter .= ' ';
-            }
-            $functionParameter .= $element->getVariableName();
-            if ($first) {
-                $first = false;
-            } else {
-                $functionParameter .= ' = null';
-            }
-            $functionParameters[] = $functionParameter;
-        }
-
-        $functionParametersString = implode(', ', $functionParameters);
-
-        $count = 0;
-
-        $params = [];
-        $filterArrayCode = '';
-        $commentArguments = [];
-        foreach ($elements as $element) {
-            $params[] = $element->getParamAnnotation();
-            if ($element instanceof ScalarBeanPropertyDescriptor) {
-                $filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getVariableName().",\n";
-            } else {
-                ++$count;
-                $filterArrayCode .= '            '.$count.' => '.$element->getVariableName().",\n";
-            }
-            $commentArguments[] = substr($element->getVariableName(), 1);
-        }
-        $paramsString = implode("\n", $params);
-
-        if ($index->isUnique()) {
-            $methodName = 'findOneBy'.implode('And', $methodNameComponent);
-            $returnType = "{$beanClassName}";
-
-            $code = "
+		$elements = [];
+
+		foreach ($columns as $column) {
+			$fk = $this->isPartOfForeignKey($this->table, $this->table->getColumn($column));
+			if ($fk !== null) {
+				if (!in_array($fk, $elements)) {
+					$elements[] = new ObjectBeanPropertyDescriptor($this->table, $fk, $this->schemaAnalyzer, $this->namingStrategy);
+				}
+			} else {
+				$elements[] = new ScalarBeanPropertyDescriptor($this->table, $this->table->getColumn($column), $this->namingStrategy);
+			}
+		}
+
+		// If the index is actually only a foreign key, let's bypass it entirely.
+		if (count($elements) === 1 && $elements[0] instanceof ObjectBeanPropertyDescriptor) {
+			return [[], ''];
+		}
+
+		$methodNameComponent = [];
+		$functionParameters = [];
+		$first = true;
+		foreach ($elements as $element) {
+			$methodNameComponent[] = $element->getUpperCamelCaseName();
+			$functionParameter = $element->getClassName();
+			if ($functionParameter) {
+				$usedBeans[] = $beanNamespace.'\\'.$functionParameter;
+				$functionParameter .= ' ';
+			}
+			$functionParameter .= $element->getVariableName();
+			if ($first) {
+				$first = false;
+			} else {
+				$functionParameter .= ' = null';
+			}
+			$functionParameters[] = $functionParameter;
+		}
+
+		$functionParametersString = implode(', ', $functionParameters);
+
+		$count = 0;
+
+		$params = [];
+		$filterArrayCode = '';
+		$commentArguments = [];
+		foreach ($elements as $element) {
+			$params[] = $element->getParamAnnotation();
+			if ($element instanceof ScalarBeanPropertyDescriptor) {
+				$filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getVariableName().",\n";
+			} else {
+				++$count;
+				$filterArrayCode .= '            '.$count.' => '.$element->getVariableName().",\n";
+			}
+			$commentArguments[] = substr($element->getVariableName(), 1);
+		}
+		$paramsString = implode("\n", $params);
+
+		if ($index->isUnique()) {
+			$methodName = 'findOneBy'.implode('And', $methodNameComponent);
+			$returnType = "{$beanClassName}";
+
+			$code = "
     /**
      * Get a $beanClassName filtered by ".implode(', ', $commentArguments).".
      *
@@ -602,11 +602,11 @@ 
         return \$this->findOne(\$filter, [], \$additionalTablesFetch);
     }
 ";
-        } else {
-            $methodName = 'findBy'.implode('And', $methodNameComponent);
-            $returnType = "{$beanClassName}[]|ResultIterator|ResultArray";
+		} else {
+			$methodName = 'findBy'.implode('And', $methodNameComponent);
+			$returnType = "{$beanClassName}[]|ResultIterator|ResultArray";
 
-            $code = "
+			$code = "
     /**
      * Get a list of $beanClassName filtered by ".implode(', ', $commentArguments).".
      *
@@ -623,29 +623,29 @@ 
         return \$this->find(\$filter, [], \$orderBy, \$additionalTablesFetch, \$mode);
     }
 ";
-        }
-
-        return [$usedBeans, $code];
-    }
-
-    /**
-     * Generates the code for the getUsedTable protected method.
-     *
-     * @return string
-     */
-    private function generateGetUsedTablesCode()
-    {
-        $hasParentRelationship = $this->schemaAnalyzer->getParentRelationship($this->table->getName()) !== null;
-        if ($hasParentRelationship) {
-            $code = sprintf('        $tables = parent::getUsedTables();
+		}
+
+		return [$usedBeans, $code];
+	}
+
+	/**
+	 * Generates the code for the getUsedTable protected method.
+	 *
+	 * @return string
+	 */
+	private function generateGetUsedTablesCode()
+	{
+		$hasParentRelationship = $this->schemaAnalyzer->getParentRelationship($this->table->getName()) !== null;
+		if ($hasParentRelationship) {
+			$code = sprintf('        $tables = parent::getUsedTables();
         $tables[] = %s;
 
         return $tables;', var_export($this->table->getName(), true));
-        } else {
-            $code = sprintf('        return [ %s ];', var_export($this->table->getName(), true));
-        }
+		} else {
+			$code = sprintf('        return [ %s ];', var_export($this->table->getName(), true));
+		}
 
-        return sprintf('
+		return sprintf('
     /**
      * Returns an array of used tables by this bean (from parent to child relationship).
      *
@@ -656,20 +656,20 @@ 
 %s
     }
 ', $code);
-    }
-
-    private function generateOnDeleteCode()
-    {
-        $code = '';
-        $relationships = $this->getPropertiesForTable($this->table);
-        foreach ($relationships as $relationship) {
-            if ($relationship instanceof ObjectBeanPropertyDescriptor) {
-                $code .= sprintf('        $this->setRef('.var_export($relationship->getForeignKey()->getName(), true).', null, '.var_export($this->table->getName(), true).");\n");
-            }
-        }
-
-        if ($code) {
-            return sprintf('
+	}
+
+	private function generateOnDeleteCode()
+	{
+		$code = '';
+		$relationships = $this->getPropertiesForTable($this->table);
+		foreach ($relationships as $relationship) {
+			if ($relationship instanceof ObjectBeanPropertyDescriptor) {
+				$code .= sprintf('        $this->setRef('.var_export($relationship->getForeignKey()->getName(), true).', null, '.var_export($this->table->getName(), true).");\n");
+			}
+		}
+
+		if ($code) {
+			return sprintf('
     /**
      * Method called when the bean is removed from database.
      *
@@ -679,73 +679,73 @@ 
         parent::onDelete();
 %s    }
 ', $code);
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns the bean class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getBeanClassName() : string
-    {
-        return $this->namingStrategy->getBeanClassName($this->table->getName());
-    }
-
-    /**
-     * Returns the base bean class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getBaseBeanClassName() : string
-    {
-        return $this->namingStrategy->getBaseBeanClassName($this->table->getName());
-    }
-
-    /**
-     * Returns the DAO class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getDaoClassName() : string
-    {
-        return $this->namingStrategy->getDaoClassName($this->table->getName());
-    }
-
-    /**
-     * Returns the base DAO class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getBaseDaoClassName() : string
-    {
-        return $this->namingStrategy->getBaseDaoClassName($this->table->getName());
-    }
-
-    /**
-     * Returns the table used to build this bean.
-     *
-     * @return Table
-     */
-    public function getTable(): Table
-    {
-        return $this->table;
-    }
-
-    /**
-     * Returns the extended bean class name (without the namespace), or null if the bean is not extended.
-     *
-     * @return string
-     */
-    public function getExtendedBeanClassName(): ?string
-    {
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($this->table->getName());
-        if ($parentFk !== null) {
-            return $this->namingStrategy->getBeanClassName($parentFk->getForeignTableName());
-        } else {
-            return null;
-        }
-    }
+		}
+
+		return '';
+	}
+
+	/**
+	 * Returns the bean class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getBeanClassName() : string
+	{
+		return $this->namingStrategy->getBeanClassName($this->table->getName());
+	}
+
+	/**
+	 * Returns the base bean class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getBaseBeanClassName() : string
+	{
+		return $this->namingStrategy->getBaseBeanClassName($this->table->getName());
+	}
+
+	/**
+	 * Returns the DAO class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getDaoClassName() : string
+	{
+		return $this->namingStrategy->getDaoClassName($this->table->getName());
+	}
+
+	/**
+	 * Returns the base DAO class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getBaseDaoClassName() : string
+	{
+		return $this->namingStrategy->getBaseDaoClassName($this->table->getName());
+	}
+
+	/**
+	 * Returns the table used to build this bean.
+	 *
+	 * @return Table
+	 */
+	public function getTable(): Table
+	{
+		return $this->table;
+	}
+
+	/**
+	 * Returns the extended bean class name (without the namespace), or null if the bean is not extended.
+	 *
+	 * @return string
+	 */
+	public function getExtendedBeanClassName(): ?string
+	{
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($this->table->getName());
+		if ($parentFk !== null) {
+			return $this->namingStrategy->getBeanClassName($parentFk->getForeignTableName());
+		} else {
+			return null;
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -105,7 +105,7 @@ 
      */
     public function getConstructorProperties()
     {
-        $constructorProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+        $constructorProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
             return $property->isCompulsory();
         });
 
@@ -120,7 +120,7 @@ 
     public function getPropertiesWithDefault()
     {
         $properties = $this->getPropertiesForTable($this->table);
-        $defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
+        $defaultProperties = array_filter($properties, function(AbstractBeanPropertyDescriptor $property) {
             return $property->hasDefault();
         });
 
@@ -134,7 +134,7 @@ 
      */
     public function getExposedProperties(): array
     {
-        $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+        $exposedProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) {
             return $property->getTable()->getName() == $this->table->getName();
         });
 
@@ -343,7 +343,7 @@ 
         }
 
         foreach ($descriptorsByMethodName as $descriptorsForMethodName) {
-            if (count($descriptorsForMethodName) > 1) {
+            if (count($descriptorsForMethodName)>1) {
                 foreach ($descriptorsForMethodName as $descriptor) {
                     $descriptor->useAlternativeName();
                 }
@@ -438,7 +438,7 @@ 
 
         $classes = $this->generateExtendsAndUseStatements($parentFk);
 
-        $uses = array_map(function ($className) use ($beannamespace) {
+        $uses = array_map(function($className) use ($beannamespace) {
             return 'use '.$beannamespace.'\\'.$className.";\n";
         }, $classes);
         $use = implode('', $uses);
@@ -739,7 +739,7 @@ 
      *
      * @return string
      */
-    public function getExtendedBeanClassName(): ?string
+    public function getExtendedBeanClassName(): ? string
     {
         $parentFk = $this->schemaAnalyzer->getParentRelationship($this->table->getName());
         if ($parentFk !== null) {

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

Indentation +48 added lines, -48 removed lines

@@ -9,52 +9,52 @@
  */
 interface BeanDescriptorInterface
 {
-    /**
-     * Returns the table used to build this bean.
-     *
-     * @return Table
-     */
-    public function getTable() : Table;
-
-    /**
-     * Returns the bean class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getBeanClassName(): string;
-
-    /**
-     * Returns the base bean class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getBaseBeanClassName(): string;
-
-    /**
-     * Returns the extended bean class name (without the namespace), or null if the bean is not extended.
-     *
-     * @return null|string
-     */
-    public function getExtendedBeanClassName(): ?string;
-
-    /**
-     * Returns the DAO class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getDaoClassName(): string;
-
-    /**
-     * Returns the base DAO class name (without the namespace).
-     *
-     * @return string
-     */
-    public function getBaseDaoClassName(): string;
-
-    /**
-     * Returns the list of properties exposed as getters and setters in this class.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getExposedProperties(): array;
+	/**
+	 * Returns the table used to build this bean.
+	 *
+	 * @return Table
+	 */
+	public function getTable() : Table;
+
+	/**
+	 * Returns the bean class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getBeanClassName(): string;
+
+	/**
+	 * Returns the base bean class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getBaseBeanClassName(): string;
+
+	/**
+	 * Returns the extended bean class name (without the namespace), or null if the bean is not extended.
+	 *
+	 * @return null|string
+	 */
+	public function getExtendedBeanClassName(): ?string;
+
+	/**
+	 * Returns the DAO class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getDaoClassName(): string;
+
+	/**
+	 * Returns the base DAO class name (without the namespace).
+	 *
+	 * @return string
+	 */
+	public function getBaseDaoClassName(): string;
+
+	/**
+	 * Returns the list of properties exposed as getters and setters in this class.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getExposedProperties(): array;
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      *
      * @return null|string
      */
-    public function getExtendedBeanClassName(): ?string;
+    public function getExtendedBeanClassName(): ? string;
 
     /**
      * Returns the DAO class name (without the namespace).

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

Indentation +34 added lines, -34 removed lines

@@ -8,42 +8,42 @@
  */
 interface NamingStrategyInterface
 {
-    /**
-     * Returns the bean class name from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBeanClassName(string $tableName) : string;
+	/**
+	 * Returns the bean class name from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBeanClassName(string $tableName) : string;
 
-    /**
-     * Returns the base bean class name from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBaseBeanClassName(string $tableName) : string;
+	/**
+	 * Returns the base bean class name from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBaseBeanClassName(string $tableName) : string;
 
-    /**
-     * Returns the name of the DAO class from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getDaoClassName(string $tableName) : string;
+	/**
+	 * Returns the name of the DAO class from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getDaoClassName(string $tableName) : string;
 
-    /**
-     * Returns the name of the base DAO class from the table name (excluding the namespace).
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getBaseDaoClassName(string $tableName) : string;
+	/**
+	 * Returns the name of the base DAO class from the table name (excluding the namespace).
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	public function getBaseDaoClassName(string $tableName) : string;
 
-    /**
-     * Returns the class name for the DAO factory.
-     *
-     * @return string
-     */
-    public function getDaoFactoryClassName() : string;
+	/**
+	 * Returns the class name for the DAO factory.
+	 *
+	 * @return string
+	 */
+	public function getDaoFactoryClassName() : string;
 }

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

Indentation +5 added lines, -5 removed lines

@@ -10,9 +10,9 @@
  */
 interface GeneratorListenerInterface
 {
-    /**
-     * @param ConfigurationInterface $configuration
-     * @param BeanDescriptorInterface[] $beanDescriptors
-     */
-    public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors) : void;
+	/**
+	 * @param ConfigurationInterface $configuration
+	 * @param BeanDescriptorInterface[] $beanDescriptors
+	 */
+	public function onGenerate(ConfigurationInterface $configuration, array $beanDescriptors) : void;
 }

src/Mouf/Database/TDBM/MoufConfiguration.php

Indentation +15 added lines, -15 removed lines

@@ -17,21 +17,21 @@
  */
 class MoufConfiguration extends Configuration
 {
-    private $daoFactoryInstanceName = 'daoFactory';
+	private $daoFactoryInstanceName = 'daoFactory';
 
-    /**
-     * @return string
-     */
-    public function getDaoFactoryInstanceName() : string
-    {
-        return $this->daoFactoryInstanceName;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDaoFactoryInstanceName() : string
+	{
+		return $this->daoFactoryInstanceName;
+	}
 
-    /**
-     * @param string $daoFactoryInstanceName
-     */
-    public function setDaoFactoryInstanceName(string $daoFactoryInstanceName)
-    {
-        $this->daoFactoryInstanceName = $daoFactoryInstanceName;
-    }
+	/**
+	 * @param string $daoFactoryInstanceName
+	 */
+	public function setDaoFactoryInstanceName(string $daoFactoryInstanceName)
+	{
+		$this->daoFactoryInstanceName = $daoFactoryInstanceName;
+	}
 }

src/Mouf/Database/TDBM/TDBMObject.php

Indentation +34 added lines, -34 removed lines

@@ -33,42 +33,42 @@
  */
 class TDBMObject extends AbstractTDBMObject
 {
-    public function getProperty($var, $tableName = null)
-    {
-        return $this->get($var, $tableName);
-    }
+	public function getProperty($var, $tableName = null)
+	{
+		return $this->get($var, $tableName);
+	}
 
-    public function setProperty($var, $value, $tableName = null)
-    {
-        $this->set($var, $value, $tableName);
-    }
+	public function setProperty($var, $value, $tableName = null)
+	{
+		$this->set($var, $value, $tableName);
+	}
 
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        throw new TDBMException('Json serialization is only implemented for generated beans.');
-    }
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		throw new TDBMException('Json serialization is only implemented for generated beans.');
+	}
 
-    /**
-     * Returns an array of used tables by this bean (from parent to child relationship).
-     *
-     * @return string[]
-     */
-    protected function getUsedTables() : array
-    {
-        $tableNames = array_keys($this->dbRows);
-        $tableNames = $this->tdbmService->_getLinkBetweenInheritedTables($tableNames);
-        $tableNames = array_reverse($tableNames);
+	/**
+	 * Returns an array of used tables by this bean (from parent to child relationship).
+	 *
+	 * @return string[]
+	 */
+	protected function getUsedTables() : array
+	{
+		$tableNames = array_keys($this->dbRows);
+		$tableNames = $this->tdbmService->_getLinkBetweenInheritedTables($tableNames);
+		$tableNames = array_reverse($tableNames);
 
-        return $tableNames;
-    }
+		return $tableNames;
+	}
 }

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Indentation +606 added lines, -606 removed lines

@@ -31,615 +31,615 @@
  */
 abstract class AbstractTDBMObject implements JsonSerializable
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * An array of DbRow, indexed by table name.
-     *
-     * @var DbRow[]
-     */
-    protected $dbRows = [];
-
-    /**
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * Array storing beans related via many to many relationships (pivot tables).
-     *
-     * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
-     */
-    private $relationships = [];
-
-    /**
-     * @var bool[] Key: pivot table name, value: whether a query was performed to load the data
-     */
-    private $loadedRelationships = [];
-
-    /**
-     * Array storing beans related via many to one relationships (this bean is pointed by external beans).
-     *
-     * @var AlterableResultIterator[] Key: [external_table]___[external_column], value: SplObjectStorage
-     */
-    private $manyToOneRelationships = [];
-
-    /**
-     * Used with $primaryKeys when we want to retrieve an existing object
-     * and $primaryKeys=[] if we want a new object.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct($tableName = null, array $primaryKeys = [], TDBMService $tdbmService = null)
-    {
-        // FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
-        if (!empty($tableName)) {
-            $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-        }
-
-        if ($tdbmService === null) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
-        } else {
-            $this->_attach($tdbmService);
-            if (!empty($primaryKeys)) {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-            } else {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
-            }
-        }
-    }
-
-    /**
-     * Alternative constructor called when data is fetched from database via a SELECT.
-     *
-     * @param array       $beanData    array<table, array<column, value>>
-     * @param TDBMService $tdbmService
-     */
-    public function _constructFromData(array $beanData, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        foreach ($beanData as $table => $columns) {
-            $this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
-        }
-
-        $this->status = TDBMObjectStateEnum::STATE_LOADED;
-    }
-
-    /**
-     * Alternative constructor called when bean is lazily loaded.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     */
-    public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-
-        $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-    }
-
-    public function _attach(TDBMService $tdbmService)
-    {
-        if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
-        }
-        $this->tdbmService = $tdbmService;
-
-        // If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
-        $tableNames = $this->getUsedTables();
-
-        $newDbRows = [];
-
-        foreach ($tableNames as $table) {
-            if (!isset($this->dbRows[$table])) {
-                $this->registerTable($table);
-            }
-            $newDbRows[$table] = $this->dbRows[$table];
-        }
-        $this->dbRows = $newDbRows;
-
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_attach($tdbmService);
-        }
-    }
-
-    /**
-     * Sets the state of the TDBM Object
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @param string $state
-     */
-    public function _setStatus($state)
-    {
-        $this->status = $state;
-
-        // TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_setStatus($state);
-        }
-
-        if ($state === TDBMObjectStateEnum::STATE_DELETED) {
-            $this->onDelete();
-        }
-    }
-
-    /**
-     * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
-     * or throws an error.
-     *
-     * @param string $tableName
-     *
-     * @return string
-     */
-    private function checkTableName($tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            }
-        }
-
-        return $tableName;
-    }
-
-    protected function get($var, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        if (!isset($this->dbRows[$tableName])) {
-            return;
-        }
-
-        return $this->dbRows[$tableName]->get($var);
-    }
-
-    protected function set($var, $value, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $this->dbRows[$tableName]->set($var, $value);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    protected function setRef($foreignKeyName, AbstractTDBMObject $bean = null, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $oldLinkedBean = $this->dbRows[$tableName]->getRef($foreignKeyName);
-        if ($oldLinkedBean !== null) {
-            $oldLinkedBean->removeManyToOneRelationship($tableName, $foreignKeyName, $this);
-        }
-
-        $this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-
-        if ($bean !== null) {
-            $bean->setManyToOneRelationship($tableName, $foreignKeyName, $this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    protected function getRef($foreignKeyName, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        if (!isset($this->dbRows[$tableName])) {
-            return;
-        }
-
-        return $this->dbRows[$tableName]->getRef($foreignKeyName);
-    }
-
-    /**
-     * Adds a many to many relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $this->setRelationship($pivotTableName, $remoteBean, 'new');
-    }
-
-    /**
-     * Returns true if there is a relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     *
-     * @return bool
-     */
-    protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        if ($storage->contains($remoteBean)) {
-            if ($storage[$remoteBean]['status'] !== 'delete') {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Internal TDBM method. Removes a many to many relationship from this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
-            unset($this->relationships[$pivotTableName][$remoteBean]);
-            unset($remoteBean->relationships[$pivotTableName][$this]);
-        } else {
-            $this->setRelationship($pivotTableName, $remoteBean, 'delete');
-        }
-    }
-
-    /**
-     * Sets many to many relationships for this bean.
-     * Adds new relationships and removes unused ones.
-     *
-     * @param $pivotTableName
-     * @param array $remoteBeans
-     */
-    protected function setRelationships($pivotTableName, array $remoteBeans)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        foreach ($storage as $oldRemoteBean) {
-            if (!in_array($oldRemoteBean, $remoteBeans, true)) {
-                // $oldRemoteBean must be removed
-                $this->_removeRelationship($pivotTableName, $oldRemoteBean);
-            }
-        }
-
-        foreach ($remoteBeans as $remoteBean) {
-            if (!$storage->contains($remoteBean) || $storage[$remoteBean]['status'] === 'delete') {
-                // $remoteBean must be added
-                $this->addRelationship($pivotTableName, $remoteBean);
-            }
-        }
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function retrieveRelationshipsStorage($pivotTableName)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName])) {
-            return $storage;
-        }
-
-        $beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
-        $this->loadedRelationships[$pivotTableName] = true;
-
-        foreach ($beans as $bean) {
-            if (isset($storage[$bean])) {
-                $oldStatus = $storage[$bean]['status'];
-                if ($oldStatus === 'delete') {
-                    // Keep deleted things deleted
-                    continue;
-                }
-            }
-            $this->setRelationship($pivotTableName, $bean, 'loaded');
-        }
-
-        return $storage;
-    }
-
-    /**
-     * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelationships($pivotTableName)
-    {
-        return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
-    }
-
-    private function relationshipStorageToArray(\SplObjectStorage $storage)
-    {
-        $beans = [];
-        foreach ($storage as $bean) {
-            $statusArr = $storage[$bean];
-            if ($statusArr['status'] !== 'delete') {
-                $beans[] = $bean;
-            }
-        }
-
-        return $beans;
-    }
-
-    /**
-     * Declares a relationship between.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     * @param string             $status
-     */
-    private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        $storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
-        if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
-        }
-
-        $remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
-        $remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param string $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function getRelationshipStorage(string $pivotTableName) : \SplObjectStorage
-    {
-        return $this->relationships[$pivotTableName] ?? $this->relationships[$pivotTableName] = new \SplObjectStorage();
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param string $tableName
-     * @param string $foreignKeyName
-     *
-     * @return AlterableResultIterator
-     */
-    private function getManyToOneAlterableResultIterator(string $tableName, string $foreignKeyName) : AlterableResultIterator
-    {
-        $key = $tableName.'___'.$foreignKeyName;
-
-        return $this->manyToOneRelationships[$key] ?? $this->manyToOneRelationships[$key] = new AlterableResultIterator();
-    }
-
-    /**
-     * Declares a relationship between this bean and the bean pointing to it.
-     *
-     * @param string             $tableName
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    private function setManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
-    {
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        $alterableResultIterator->add($remoteBean);
-    }
-
-    /**
-     * Declares a relationship between this bean and the bean pointing to it.
-     *
-     * @param string             $tableName
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    private function removeManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
-    {
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        $alterableResultIterator->remove($remoteBean);
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via a given foreign key.
-     *
-     * @param string $tableName
-     * @param string $foreignKeyName
-     * @param string $searchTableName
-     * @param array  $searchFilter
-     * @param string $orderString     The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
-     *
-     * @return AlterableResultIterator
-     */
-    protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
-    {
-        $key = $tableName.'___'.$foreignKeyName;
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
-            return $alterableResultIterator;
-        }
-
-        $unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);
-
-        $alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());
-
-        return $alterableResultIterator;
-    }
-
-    /**
-     * Reverts any changes made to the object and resumes it to its DB state.
-     * This can only be called on objects that come from database and that have not been deleted.
-     * Otherwise, this will throw an exception.
-     *
-     * @throws TDBMException
-     */
-    public function discardChanges()
-    {
-        if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
-        }
-
-        if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
-        }
-
-        $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-    }
-
-    /**
-     * Method used internally by TDBM. You should not use it directly.
-     * This method returns the status of the TDBMObject.
-     * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @return string
-     */
-    public function _getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Override the native php clone function for TDBMObjects.
-     */
-    public function __clone()
-    {
-        // Let's clone the many to many relationships
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $pivotTableList = array_keys($this->relationships);
-        } else {
-            $pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
-        }
-
-        foreach ($pivotTableList as $pivotTable) {
-            $storage = $this->retrieveRelationshipsStorage($pivotTable);
-
-            // Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
-            /*foreach ($storage as $remoteBean) {
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * An array of DbRow, indexed by table name.
+	 *
+	 * @var DbRow[]
+	 */
+	protected $dbRows = [];
+
+	/**
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @var string
+	 */
+	private $status;
+
+	/**
+	 * Array storing beans related via many to many relationships (pivot tables).
+	 *
+	 * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
+	 */
+	private $relationships = [];
+
+	/**
+	 * @var bool[] Key: pivot table name, value: whether a query was performed to load the data
+	 */
+	private $loadedRelationships = [];
+
+	/**
+	 * Array storing beans related via many to one relationships (this bean is pointed by external beans).
+	 *
+	 * @var AlterableResultIterator[] Key: [external_table]___[external_column], value: SplObjectStorage
+	 */
+	private $manyToOneRelationships = [];
+
+	/**
+	 * Used with $primaryKeys when we want to retrieve an existing object
+	 * and $primaryKeys=[] if we want a new object.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct($tableName = null, array $primaryKeys = [], TDBMService $tdbmService = null)
+	{
+		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
+		if (!empty($tableName)) {
+			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+		}
+
+		if ($tdbmService === null) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
+		} else {
+			$this->_attach($tdbmService);
+			if (!empty($primaryKeys)) {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+			} else {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
+			}
+		}
+	}
+
+	/**
+	 * Alternative constructor called when data is fetched from database via a SELECT.
+	 *
+	 * @param array       $beanData    array<table, array<column, value>>
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructFromData(array $beanData, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		foreach ($beanData as $table => $columns) {
+			$this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
+		}
+
+		$this->status = TDBMObjectStateEnum::STATE_LOADED;
+	}
+
+	/**
+	 * Alternative constructor called when bean is lazily loaded.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+
+		$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+	}
+
+	public function _attach(TDBMService $tdbmService)
+	{
+		if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
+		}
+		$this->tdbmService = $tdbmService;
+
+		// If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
+		$tableNames = $this->getUsedTables();
+
+		$newDbRows = [];
+
+		foreach ($tableNames as $table) {
+			if (!isset($this->dbRows[$table])) {
+				$this->registerTable($table);
+			}
+			$newDbRows[$table] = $this->dbRows[$table];
+		}
+		$this->dbRows = $newDbRows;
+
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_attach($tdbmService);
+		}
+	}
+
+	/**
+	 * Sets the state of the TDBM Object
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @param string $state
+	 */
+	public function _setStatus($state)
+	{
+		$this->status = $state;
+
+		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_setStatus($state);
+		}
+
+		if ($state === TDBMObjectStateEnum::STATE_DELETED) {
+			$this->onDelete();
+		}
+	}
+
+	/**
+	 * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
+	 * or throws an error.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return string
+	 */
+	private function checkTableName($tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			}
+		}
+
+		return $tableName;
+	}
+
+	protected function get($var, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		if (!isset($this->dbRows[$tableName])) {
+			return;
+		}
+
+		return $this->dbRows[$tableName]->get($var);
+	}
+
+	protected function set($var, $value, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$this->dbRows[$tableName]->set($var, $value);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	protected function setRef($foreignKeyName, AbstractTDBMObject $bean = null, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$oldLinkedBean = $this->dbRows[$tableName]->getRef($foreignKeyName);
+		if ($oldLinkedBean !== null) {
+			$oldLinkedBean->removeManyToOneRelationship($tableName, $foreignKeyName, $this);
+		}
+
+		$this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+
+		if ($bean !== null) {
+			$bean->setManyToOneRelationship($tableName, $foreignKeyName, $this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	protected function getRef($foreignKeyName, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		if (!isset($this->dbRows[$tableName])) {
+			return;
+		}
+
+		return $this->dbRows[$tableName]->getRef($foreignKeyName);
+	}
+
+	/**
+	 * Adds a many to many relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$this->setRelationship($pivotTableName, $remoteBean, 'new');
+	}
+
+	/**
+	 * Returns true if there is a relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 *
+	 * @return bool
+	 */
+	protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		if ($storage->contains($remoteBean)) {
+			if ($storage[$remoteBean]['status'] !== 'delete') {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Internal TDBM method. Removes a many to many relationship from this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
+			unset($this->relationships[$pivotTableName][$remoteBean]);
+			unset($remoteBean->relationships[$pivotTableName][$this]);
+		} else {
+			$this->setRelationship($pivotTableName, $remoteBean, 'delete');
+		}
+	}
+
+	/**
+	 * Sets many to many relationships for this bean.
+	 * Adds new relationships and removes unused ones.
+	 *
+	 * @param $pivotTableName
+	 * @param array $remoteBeans
+	 */
+	protected function setRelationships($pivotTableName, array $remoteBeans)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		foreach ($storage as $oldRemoteBean) {
+			if (!in_array($oldRemoteBean, $remoteBeans, true)) {
+				// $oldRemoteBean must be removed
+				$this->_removeRelationship($pivotTableName, $oldRemoteBean);
+			}
+		}
+
+		foreach ($remoteBeans as $remoteBean) {
+			if (!$storage->contains($remoteBean) || $storage[$remoteBean]['status'] === 'delete') {
+				// $remoteBean must be added
+				$this->addRelationship($pivotTableName, $remoteBean);
+			}
+		}
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function retrieveRelationshipsStorage($pivotTableName)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName])) {
+			return $storage;
+		}
+
+		$beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
+		$this->loadedRelationships[$pivotTableName] = true;
+
+		foreach ($beans as $bean) {
+			if (isset($storage[$bean])) {
+				$oldStatus = $storage[$bean]['status'];
+				if ($oldStatus === 'delete') {
+					// Keep deleted things deleted
+					continue;
+				}
+			}
+			$this->setRelationship($pivotTableName, $bean, 'loaded');
+		}
+
+		return $storage;
+	}
+
+	/**
+	 * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelationships($pivotTableName)
+	{
+		return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
+	}
+
+	private function relationshipStorageToArray(\SplObjectStorage $storage)
+	{
+		$beans = [];
+		foreach ($storage as $bean) {
+			$statusArr = $storage[$bean];
+			if ($statusArr['status'] !== 'delete') {
+				$beans[] = $bean;
+			}
+		}
+
+		return $beans;
+	}
+
+	/**
+	 * Declares a relationship between.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 * @param string             $status
+	 */
+	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
+		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
+		}
+
+		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param string $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function getRelationshipStorage(string $pivotTableName) : \SplObjectStorage
+	{
+		return $this->relationships[$pivotTableName] ?? $this->relationships[$pivotTableName] = new \SplObjectStorage();
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param string $tableName
+	 * @param string $foreignKeyName
+	 *
+	 * @return AlterableResultIterator
+	 */
+	private function getManyToOneAlterableResultIterator(string $tableName, string $foreignKeyName) : AlterableResultIterator
+	{
+		$key = $tableName.'___'.$foreignKeyName;
+
+		return $this->manyToOneRelationships[$key] ?? $this->manyToOneRelationships[$key] = new AlterableResultIterator();
+	}
+
+	/**
+	 * Declares a relationship between this bean and the bean pointing to it.
+	 *
+	 * @param string             $tableName
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	private function setManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
+	{
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		$alterableResultIterator->add($remoteBean);
+	}
+
+	/**
+	 * Declares a relationship between this bean and the bean pointing to it.
+	 *
+	 * @param string             $tableName
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	private function removeManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
+	{
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		$alterableResultIterator->remove($remoteBean);
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via a given foreign key.
+	 *
+	 * @param string $tableName
+	 * @param string $foreignKeyName
+	 * @param string $searchTableName
+	 * @param array  $searchFilter
+	 * @param string $orderString     The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
+	 *
+	 * @return AlterableResultIterator
+	 */
+	protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
+	{
+		$key = $tableName.'___'.$foreignKeyName;
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
+			return $alterableResultIterator;
+		}
+
+		$unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);
+
+		$alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());
+
+		return $alterableResultIterator;
+	}
+
+	/**
+	 * Reverts any changes made to the object and resumes it to its DB state.
+	 * This can only be called on objects that come from database and that have not been deleted.
+	 * Otherwise, this will throw an exception.
+	 *
+	 * @throws TDBMException
+	 */
+	public function discardChanges()
+	{
+		if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
+		}
+
+		if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
+		}
+
+		$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+	}
+
+	/**
+	 * Method used internally by TDBM. You should not use it directly.
+	 * This method returns the status of the TDBMObject.
+	 * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @return string
+	 */
+	public function _getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * Override the native php clone function for TDBMObjects.
+	 */
+	public function __clone()
+	{
+		// Let's clone the many to many relationships
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$pivotTableList = array_keys($this->relationships);
+		} else {
+			$pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
+		}
+
+		foreach ($pivotTableList as $pivotTable) {
+			$storage = $this->retrieveRelationshipsStorage($pivotTable);
+
+			// Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
+			/*foreach ($storage as $remoteBean) {
                 $metadata = $storage[$remoteBean];
 
                 $remoteStorage = $remoteBean->getRelationshipStorage($pivotTable);
                 $remoteStorage->attach($this, ['status' => $metadata['status'], 'reverse' => !$metadata['reverse']]);
             }*/
-        }
-
-        // Let's clone each row
-        foreach ($this->dbRows as $key => &$dbRow) {
-            $dbRow = clone $dbRow;
-            $dbRow->setTDBMObject($this);
-        }
-
-        $this->manyToOneRelationships = [];
-
-        // Let's set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-    }
-
-    /**
-     * Returns raw database rows.
-     *
-     * @return DbRow[] Key: table name, Value: DbRow object
-     */
-    public function _getDbRows()
-    {
-        return $this->dbRows;
-    }
-
-    private function registerTable($tableName)
-    {
-        $dbRow = new DbRow($this, $tableName);
-
-        if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
-            // Let's get the primary key for the new table
-            $anotherDbRow = array_values($this->dbRows)[0];
-            /* @var $anotherDbRow DbRow */
-            $indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
-            $primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
-            $dbRow->_setPrimaryKeys($primaryKeys);
-        }
-
-        $dbRow->_setStatus($this->status);
-
-        $this->dbRows[$tableName] = $dbRow;
-        // TODO: look at status (if not new)=> get primary key from tdbmservice
-    }
-
-    /**
-     * Internal function: return the list of relationships.
-     *
-     * @return \SplObjectStorage[]
-     */
-    public function _getCachedRelationships()
-    {
-        return $this->relationships;
-    }
-
-    /**
-     * Returns an array of used tables by this bean (from parent to child relationship).
-     *
-     * @return string[]
-     */
-    abstract protected function getUsedTables() : array;
-
-    /**
-     * Method called when the bean is removed from database.
-     */
-    protected function onDelete() : void
-    {
-    }
+		}
+
+		// Let's clone each row
+		foreach ($this->dbRows as $key => &$dbRow) {
+			$dbRow = clone $dbRow;
+			$dbRow->setTDBMObject($this);
+		}
+
+		$this->manyToOneRelationships = [];
+
+		// Let's set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+	}
+
+	/**
+	 * Returns raw database rows.
+	 *
+	 * @return DbRow[] Key: table name, Value: DbRow object
+	 */
+	public function _getDbRows()
+	{
+		return $this->dbRows;
+	}
+
+	private function registerTable($tableName)
+	{
+		$dbRow = new DbRow($this, $tableName);
+
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
+			// Let's get the primary key for the new table
+			$anotherDbRow = array_values($this->dbRows)[0];
+			/* @var $anotherDbRow DbRow */
+			$indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
+			$primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
+			$dbRow->_setPrimaryKeys($primaryKeys);
+		}
+
+		$dbRow->_setStatus($this->status);
+
+		$this->dbRows[$tableName] = $dbRow;
+		// TODO: look at status (if not new)=> get primary key from tdbmservice
+	}
+
+	/**
+	 * Internal function: return the list of relationships.
+	 *
+	 * @return \SplObjectStorage[]
+	 */
+	public function _getCachedRelationships()
+	{
+		return $this->relationships;
+	}
+
+	/**
+	 * Returns an array of used tables by this bean (from parent to child relationship).
+	 *
+	 * @return string[]
+	 */
+	abstract protected function getUsedTables() : array;
+
+	/**
+	 * Method called when the bean is removed from database.
+	 */
+	protected function onDelete() : void
+	{
+	}
 }

src/Mouf/Database/TDBM/Configuration.php

Indentation +157 added lines, -157 removed lines

@@ -15,161 +15,161 @@
 class Configuration implements ConfigurationInterface
 {
 
-    /**
-     * @var string
-     */
-    private $beanNamespace;
-    /**
-     * @var string
-     */
-    private $daoNamespace;
-    /**
-     * @var Connection
-     */
-    private $connection;
-    /**
-     * @var Cache
-     */
-    private $cache;
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-    /**
-     * @var GeneratorListenerInterface
-     */
-    private $generatorEventDispatcher;
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-    /**
-     * @var string|null
-     */
-    private $customComposerFile;
-
-    /**
-     * @param string $beanNamespace The namespace hosting the beans
-     * @param string $daoNamespace The namespace hosting the DAOs
-     * @param Connection $connection The connection to the database
-     * @param Cache|null $cache The Doctrine cache to store database metadata
-     * @param SchemaAnalyzer|null $schemaAnalyzer The schema analyzer that will be used to find shortest paths... Will be automatically created if not passed
-     * @param LoggerInterface|null $logger The logger
-     * @param GeneratorListenerInterface[] $generatorListeners A list of listeners that will be triggered when beans/daos are generated
-     */
-    public function __construct(string $beanNamespace, string $daoNamespace, Connection $connection, NamingStrategyInterface $namingStrategy, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null, array $generatorListeners = [])
-    {
-        $this->beanNamespace = rtrim($beanNamespace, '\\');
-        $this->daoNamespace = rtrim($daoNamespace, '\\');
-        $this->connection = $connection;
-        $this->namingStrategy = $namingStrategy;
-        if ($cache !== null) {
-            $this->cache = $cache;
-        } else {
-            $this->cache = new VoidCache();
-        }
-        if ($schemaAnalyzer !== null) {
-            $this->schemaAnalyzer = $schemaAnalyzer;
-        } else {
-            $this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
-        }
-        $this->logger = $logger;
-        $this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
-    }
-
-    /**
-     * @return string
-     */
-    public function getBeanNamespace(): string
-    {
-        return $this->beanNamespace;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDaoNamespace(): string
-    {
-        return $this->daoNamespace;
-    }
-
-    /**
-     * @return Connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
-
-    /**
-     * @return NamingStrategyInterface
-     */
-    public function getNamingStrategy(): NamingStrategyInterface
-    {
-        return $this->namingStrategy;
-    }
-
-    /**
-     * @return Cache
-     */
-    public function getCache(): Cache
-    {
-        return $this->cache;
-    }
-
-    /**
-     * @return SchemaAnalyzer
-     */
-    public function getSchemaAnalyzer(): SchemaAnalyzer
-    {
-        return $this->schemaAnalyzer;
-    }
-
-    /**
-     * @return LoggerInterface
-     */
-    public function getLogger(): ?LoggerInterface
-    {
-        return $this->logger;
-    }
-
-    /**
-     * @return GeneratorListenerInterface
-     */
-    public function getGeneratorEventDispatcher(): GeneratorListenerInterface
-    {
-        return $this->generatorEventDispatcher;
-    }
-
-
-
-    /**
-     * Creates a unique cache key for the current connection.
-     *
-     * @return string
-     */
-    private function getConnectionUniqueId(): string
-    {
-        return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getCustomComposerFile() : ?string
-    {
-        return $this->customComposerFile;
-    }
-
-    /**
-     * @param null|string $customComposerFile
-     */
-    public function setCustomComposerFile($customComposerFile)
-    {
-        $this->customComposerFile = $customComposerFile;
-    }
+	/**
+	 * @var string
+	 */
+	private $beanNamespace;
+	/**
+	 * @var string
+	 */
+	private $daoNamespace;
+	/**
+	 * @var Connection
+	 */
+	private $connection;
+	/**
+	 * @var Cache
+	 */
+	private $cache;
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
+	/**
+	 * @var GeneratorListenerInterface
+	 */
+	private $generatorEventDispatcher;
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+	/**
+	 * @var string|null
+	 */
+	private $customComposerFile;
+
+	/**
+	 * @param string $beanNamespace The namespace hosting the beans
+	 * @param string $daoNamespace The namespace hosting the DAOs
+	 * @param Connection $connection The connection to the database
+	 * @param Cache|null $cache The Doctrine cache to store database metadata
+	 * @param SchemaAnalyzer|null $schemaAnalyzer The schema analyzer that will be used to find shortest paths... Will be automatically created if not passed
+	 * @param LoggerInterface|null $logger The logger
+	 * @param GeneratorListenerInterface[] $generatorListeners A list of listeners that will be triggered when beans/daos are generated
+	 */
+	public function __construct(string $beanNamespace, string $daoNamespace, Connection $connection, NamingStrategyInterface $namingStrategy, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null, array $generatorListeners = [])
+	{
+		$this->beanNamespace = rtrim($beanNamespace, '\\');
+		$this->daoNamespace = rtrim($daoNamespace, '\\');
+		$this->connection = $connection;
+		$this->namingStrategy = $namingStrategy;
+		if ($cache !== null) {
+			$this->cache = $cache;
+		} else {
+			$this->cache = new VoidCache();
+		}
+		if ($schemaAnalyzer !== null) {
+			$this->schemaAnalyzer = $schemaAnalyzer;
+		} else {
+			$this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
+		}
+		$this->logger = $logger;
+		$this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBeanNamespace(): string
+	{
+		return $this->beanNamespace;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDaoNamespace(): string
+	{
+		return $this->daoNamespace;
+	}
+
+	/**
+	 * @return Connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * @return NamingStrategyInterface
+	 */
+	public function getNamingStrategy(): NamingStrategyInterface
+	{
+		return $this->namingStrategy;
+	}
+
+	/**
+	 * @return Cache
+	 */
+	public function getCache(): Cache
+	{
+		return $this->cache;
+	}
+
+	/**
+	 * @return SchemaAnalyzer
+	 */
+	public function getSchemaAnalyzer(): SchemaAnalyzer
+	{
+		return $this->schemaAnalyzer;
+	}
+
+	/**
+	 * @return LoggerInterface
+	 */
+	public function getLogger(): ?LoggerInterface
+	{
+		return $this->logger;
+	}
+
+	/**
+	 * @return GeneratorListenerInterface
+	 */
+	public function getGeneratorEventDispatcher(): GeneratorListenerInterface
+	{
+		return $this->generatorEventDispatcher;
+	}
+
+
+
+	/**
+	 * Creates a unique cache key for the current connection.
+	 *
+	 * @return string
+	 */
+	private function getConnectionUniqueId(): string
+	{
+		return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
+	}
+
+	/**
+	 * @return null|string
+	 */
+	public function getCustomComposerFile() : ?string
+	{
+		return $this->customComposerFile;
+	}
+
+	/**
+	 * @param null|string $customComposerFile
+	 */
+	public function setCustomComposerFile($customComposerFile)
+	{
+		$this->customComposerFile = $customComposerFile;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
     /**
      * @return LoggerInterface
      */
-    public function getLogger(): ?LoggerInterface
+    public function getLogger(): ? LoggerInterface
     {
         return $this->logger;
     }
@@ -160,7 +160,7 @@ 
     /**
      * @return null|string
      */
-    public function getCustomComposerFile() : ?string
+    public function getCustomComposerFile() : ? string
     {
         return $this->customComposerFile;
     }

src/Mouf/Database/TDBM/ConfigurationInterface.php

Indentation +39 added lines, -39 removed lines

@@ -11,43 +11,43 @@
 
 interface ConfigurationInterface
 {
-    /**
-     * @return string
-     */
-    public function getBeanNamespace(): string;
-
-    /**
-     * @return string
-     */
-    public function getDaoNamespace(): string;
-
-    /**
-     * @return Connection
-     */
-    public function getConnection(): Connection;
-
-    /**
-     * @return Cache
-     */
-    public function getCache(): Cache;
-
-    /**
-     * @return NamingStrategyInterface
-     */
-    public function getNamingStrategy(): NamingStrategyInterface;
-
-    /**
-     * @return SchemaAnalyzer
-     */
-    public function getSchemaAnalyzer(): SchemaAnalyzer;
-
-    /**
-     * @return LoggerInterface
-     */
-    public function getLogger(): ?LoggerInterface;
-
-    /**
-     * @return GeneratorListenerInterface
-     */
-    public function getGeneratorEventDispatcher(): GeneratorListenerInterface;
+	/**
+	 * @return string
+	 */
+	public function getBeanNamespace(): string;
+
+	/**
+	 * @return string
+	 */
+	public function getDaoNamespace(): string;
+
+	/**
+	 * @return Connection
+	 */
+	public function getConnection(): Connection;
+
+	/**
+	 * @return Cache
+	 */
+	public function getCache(): Cache;
+
+	/**
+	 * @return NamingStrategyInterface
+	 */
+	public function getNamingStrategy(): NamingStrategyInterface;
+
+	/**
+	 * @return SchemaAnalyzer
+	 */
+	public function getSchemaAnalyzer(): SchemaAnalyzer;
+
+	/**
+	 * @return LoggerInterface
+	 */
+	public function getLogger(): ?LoggerInterface;
+
+	/**
+	 * @return GeneratorListenerInterface
+	 */
+	public function getGeneratorEventDispatcher(): GeneratorListenerInterface;
 }

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     /**
      * @return LoggerInterface
      */
-    public function getLogger(): ?LoggerInterface;
+    public function getLogger(): ? LoggerInterface;
 
     /**
      * @return GeneratorListenerInterface