thecodingmachine / database.tdbm

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

Indentation +168 added lines, -168 removed lines

@@ -11,128 +11,128 @@ 
  */
 class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Column
-     */
-    private $column;
-
-    public function __construct(Table $table, Column $column)
-    {
-        parent::__construct($table);
-        $this->table = $table;
-        $this->column = $column;
-    }
-
-    /**
-     * Returns the foreign-key the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation()
-    {
-        $className = $this->getClassName();
-        $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
-
-        $str = '     * @param %s %s';
-
-        return sprintf($str, $paramType, $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName()
-    {
-        return TDBMDaoGenerator::toCamelCase($this->column->getName());
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    public function getClassName()
-    {
-        return;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    public function isCompulsory()
-    {
-        return $this->column->getNotnull() && !$this->column->getAutoincrement() && $this->column->getDefault() === null;
-    }
-
-    /**
-     * Returns true if the property has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefault()
-    {
-        return $this->column->getDefault() !== null;
-    }
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     */
-    public function assignToDefaultCode()
-    {
-        $str = '        $this->%s(%s);';
-
-        $default = $this->column->getDefault();
-
-        if (strtoupper($default) === 'CURRENT_TIMESTAMP') {
-            $defaultCode = 'new \DateTimeImmutable()';
-        } else {
-            $defaultCode = var_export($this->column->getDefault(), true);
-        }
-
-        return sprintf($str, $this->getSetterName(), $defaultCode);
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        $columnGetterName = $this->getGetterName();
-        $columnSetterName = $this->getSetterName();
-
-        if ($normalizedType == '\\DateTimeInterface') {
-            $castTo = '\\DateTimeInterface ';
-        } else {
-            $castTo = '';
-        }
-
-        $getterAndSetterCode = '    /**
+	/**
+	 * @var Column
+	 */
+	private $column;
+
+	public function __construct(Table $table, Column $column)
+	{
+		parent::__construct($table);
+		$this->table = $table;
+		$this->column = $column;
+	}
+
+	/**
+	 * Returns the foreign-key the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation()
+	{
+		$className = $this->getClassName();
+		$paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
+
+		$str = '     * @param %s %s';
+
+		return sprintf($str, $paramType, $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName()
+	{
+		return TDBMDaoGenerator::toCamelCase($this->column->getName());
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	public function getClassName()
+	{
+		return;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	public function isCompulsory()
+	{
+		return $this->column->getNotnull() && !$this->column->getAutoincrement() && $this->column->getDefault() === null;
+	}
+
+	/**
+	 * Returns true if the property has a default value.
+	 *
+	 * @return bool
+	 */
+	public function hasDefault()
+	{
+		return $this->column->getDefault() !== null;
+	}
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 */
+	public function assignToDefaultCode()
+	{
+		$str = '        $this->%s(%s);';
+
+		$default = $this->column->getDefault();
+
+		if (strtoupper($default) === 'CURRENT_TIMESTAMP') {
+			$defaultCode = 'new \DateTimeImmutable()';
+		} else {
+			$defaultCode = var_export($this->column->getDefault(), true);
+		}
+
+		return sprintf($str, $this->getSetterName(), $defaultCode);
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		$columnGetterName = $this->getGetterName();
+		$columnSetterName = $this->getSetterName();
+
+		if ($normalizedType == '\\DateTimeInterface') {
+			$castTo = '\\DateTimeInterface ';
+		} else {
+			$castTo = '';
+		}
+
+		$getterAndSetterCode = '    /**
      * The getter for the "%s" column.
      *
      * @return %s
@@ -152,50 +152,50 @@ 
 
 ';
 
-        return sprintf($getterAndSetterCode,
-            // Getter
-            $this->column->getName(),
-            $normalizedType,
-            $columnGetterName,
-            var_export($this->column->getName(), true),
-            var_export($this->table->getName(), true),
-            // Setter
-            $this->column->getName(),
-            $normalizedType,
-            $this->column->getName(),
-            $columnSetterName,
-            $castTo,
-            $this->column->getName(),
-            var_export($this->column->getName(), true),
-            $this->column->getName(),
-            var_export($this->table->getName(), true)
-        );
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        if ($normalizedType == '\\DateTimeInterface') {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = ($this->'.$this->getGetterName().'() === null)?null:$this->'.$this->getGetterName()."()->format('c');\n";
-        } else {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
-        }
-    }
-
-    /**
-     * Returns the column name.
-     *
-     * @return string
-     */
-    public function getColumnName()
-    {
-        return $this->column->getName();
-    }
+		return sprintf($getterAndSetterCode,
+			// Getter
+			$this->column->getName(),
+			$normalizedType,
+			$columnGetterName,
+			var_export($this->column->getName(), true),
+			var_export($this->table->getName(), true),
+			// Setter
+			$this->column->getName(),
+			$normalizedType,
+			$this->column->getName(),
+			$columnSetterName,
+			$castTo,
+			$this->column->getName(),
+			var_export($this->column->getName(), true),
+			$this->column->getName(),
+			var_export($this->table->getName(), true)
+		);
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		if ($normalizedType == '\\DateTimeInterface') {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = ($this->'.$this->getGetterName().'() === null)?null:$this->'.$this->getGetterName()."()->format('c');\n";
+		} else {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
+		}
+	}
+
+	/**
+	 * Returns the column name.
+	 *
+	 * @return string
+	 */
+	public function getColumnName()
+	{
+		return $this->column->getName();
+	}
 }

src/Mouf/Database/TDBM/DbRow.php

Indentation +380 added lines, -380 removed lines

@@ -27,170 +27,170 @@ 
  */
 class DbRow
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * The object containing this db row.
-     *
-     * @var AbstractTDBMObject
-     */
-    private $object;
-
-    /**
-     * The name of the table the object if issued from.
-     *
-     * @var string
-     */
-    private $dbTableName;
-
-    /**
-     * The array of columns returned from database.
-     *
-     * @var array
-     */
-    private $dbRow = array();
-
-    /**
-     * @var AbstractTDBMObject[]
-     */
-    private $references = array();
-
-    /**
-     * 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;
-
-    /**
-     * The values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @var array An array of column => value
-     */
-    private $primaryKeys;
-
-    /**
-     * You should never call the constructor directly. Instead, you should use the
-     * TDBMService class that will create TDBMObjects for you.
-     *
-     * Used with id!=false when we want to retrieve an existing object
-     * and id==false if we want a new object
-     *
-     * @param AbstractTDBMObject $object      The object containing this db row.
-     * @param string             $table_name
-     * @param array              $primaryKeys
-     * @param TDBMService        $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
-    {
-        $this->object = $object;
-        $this->dbTableName = $table_name;
-
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        if ($tdbmService === null) {
-            if (!empty($primaryKeys)) {
-                throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
-            }
-        } else {
-            $this->tdbmService = $tdbmService;
-
-            if (!empty($primaryKeys)) {
-                $this->_setPrimaryKeys($primaryKeys);
-                if (!empty($dbRow)) {
-                    $this->dbRow = $dbRow;
-                    $this->status = TDBMObjectStateEnum::STATE_LOADED;
-                } else {
-                    $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                }
-                $tdbmService->_addToCache($this);
-            } else {
-                $this->status = TDBMObjectStateEnum::STATE_NEW;
-                $this->tdbmService->_addToToSaveObjectList($this);
-            }
-        }
-    }
-
-    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;
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        $this->tdbmService->_addToToSaveObjectList($this);
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
-     * If the object is in state 'not loaded', this method performs a query in database to load the object.
-     *
-     * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
-     * cannot be found).
-     */
-    public function _dbLoadIfNotLoaded()
-    {
-        if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
-            $connection = $this->tdbmService->getConnection();
-
-            /// buildFilterFromFilterBag($filter_bag)
-            list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
-
-            $sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
-            $result = $connection->executeQuery($sql, $parameters);
-
-            if ($result->rowCount() === 0) {
-                throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
-            }
-
-            $row = $result->fetch(\PDO::FETCH_ASSOC);
-
-            $this->dbRow = [];
-            $types = $this->tdbmService->_getColumnTypesForTable($this->dbTableName);
-
-            foreach ($row as $key => $value) {
-                $this->dbRow[$key] = $types[$key]->convertToPHPValue($value, $connection->getDatabasePlatform());
-            }
-
-            $result->closeCursor();
-
-            $this->status = TDBMObjectStateEnum::STATE_LOADED;
-        }
-    }
-
-    public function get($var)
-    {
-        $this->_dbLoadIfNotLoaded();
-
-        // Let's first check if the key exist.
-        if (!isset($this->dbRow[$var])) {
-            /*
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * The object containing this db row.
+	 *
+	 * @var AbstractTDBMObject
+	 */
+	private $object;
+
+	/**
+	 * The name of the table the object if issued from.
+	 *
+	 * @var string
+	 */
+	private $dbTableName;
+
+	/**
+	 * The array of columns returned from database.
+	 *
+	 * @var array
+	 */
+	private $dbRow = array();
+
+	/**
+	 * @var AbstractTDBMObject[]
+	 */
+	private $references = array();
+
+	/**
+	 * 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;
+
+	/**
+	 * The values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @var array An array of column => value
+	 */
+	private $primaryKeys;
+
+	/**
+	 * You should never call the constructor directly. Instead, you should use the
+	 * TDBMService class that will create TDBMObjects for you.
+	 *
+	 * Used with id!=false when we want to retrieve an existing object
+	 * and id==false if we want a new object
+	 *
+	 * @param AbstractTDBMObject $object      The object containing this db row.
+	 * @param string             $table_name
+	 * @param array              $primaryKeys
+	 * @param TDBMService        $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
+	{
+		$this->object = $object;
+		$this->dbTableName = $table_name;
+
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		if ($tdbmService === null) {
+			if (!empty($primaryKeys)) {
+				throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
+			}
+		} else {
+			$this->tdbmService = $tdbmService;
+
+			if (!empty($primaryKeys)) {
+				$this->_setPrimaryKeys($primaryKeys);
+				if (!empty($dbRow)) {
+					$this->dbRow = $dbRow;
+					$this->status = TDBMObjectStateEnum::STATE_LOADED;
+				} else {
+					$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				}
+				$tdbmService->_addToCache($this);
+			} else {
+				$this->status = TDBMObjectStateEnum::STATE_NEW;
+				$this->tdbmService->_addToToSaveObjectList($this);
+			}
+		}
+	}
+
+	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;
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		$this->tdbmService->_addToToSaveObjectList($this);
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
+	 * If the object is in state 'not loaded', this method performs a query in database to load the object.
+	 *
+	 * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
+	 * cannot be found).
+	 */
+	public function _dbLoadIfNotLoaded()
+	{
+		if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
+			$connection = $this->tdbmService->getConnection();
+
+			/// buildFilterFromFilterBag($filter_bag)
+			list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
+
+			$sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
+			$result = $connection->executeQuery($sql, $parameters);
+
+			if ($result->rowCount() === 0) {
+				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
+			}
+
+			$row = $result->fetch(\PDO::FETCH_ASSOC);
+
+			$this->dbRow = [];
+			$types = $this->tdbmService->_getColumnTypesForTable($this->dbTableName);
+
+			foreach ($row as $key => $value) {
+				$this->dbRow[$key] = $types[$key]->convertToPHPValue($value, $connection->getDatabasePlatform());
+			}
+
+			$result->closeCursor();
+
+			$this->status = TDBMObjectStateEnum::STATE_LOADED;
+		}
+	}
+
+	public function get($var)
+	{
+		$this->_dbLoadIfNotLoaded();
+
+		// Let's first check if the key exist.
+		if (!isset($this->dbRow[$var])) {
+			/*
             // Unable to find column.... this is an error if the object has been retrieved from database.
             // If it's a new object, well, that may not be an error after all!
             // Let's check if the column does exist in the table
@@ -210,39 +210,39 @@ 
             $str = "Could not find column \"$var\" in table \"$this->dbTableName\". Maybe you meant one of those columns: '".implode("', '",$result_array)."'";
 
             throw new TDBMException($str);*/
-            return;
-        }
-
-        $value = $this->dbRow[$var];
-        if ($value instanceof \DateTime) {
-            if (method_exists('DateTimeImmutable', 'createFromMutable')) { // PHP 5.6+ only
-                return \DateTimeImmutable::createFromMutable($value);
-            } else {
-                return new \DateTimeImmutable($value->format('c'));
-            }
-        }
-
-        return $this->dbRow[$var];
-    }
-
-    /**
-     * Returns true if a column is set, false otherwise.
-     *
-     * @param string $var
-     *
-     * @return bool
-     */
-    /*public function has($var) {
+			return;
+		}
+
+		$value = $this->dbRow[$var];
+		if ($value instanceof \DateTime) {
+			if (method_exists('DateTimeImmutable', 'createFromMutable')) { // PHP 5.6+ only
+				return \DateTimeImmutable::createFromMutable($value);
+			} else {
+				return new \DateTimeImmutable($value->format('c'));
+			}
+		}
+
+		return $this->dbRow[$var];
+	}
+
+	/**
+	 * Returns true if a column is set, false otherwise.
+	 *
+	 * @param string $var
+	 *
+	 * @return bool
+	 */
+	/*public function has($var) {
         $this->_dbLoadIfNotLoaded();
 
         return isset($this->dbRow[$var]);
     }*/
 
-    public function set($var, $value)
-    {
-        $this->_dbLoadIfNotLoaded();
+	public function set($var, $value)
+	{
+		$this->_dbLoadIfNotLoaded();
 
-        /*
+		/*
         // Ok, let's start by checking the column type
         $type = $this->db_connection->getColumnType($this->dbTableName, $var);
 
@@ -252,194 +252,194 @@ 
         }
         */
 
-        /*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
+		/*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
             throw new TDBMException("Error! Changing primary key value is forbidden.");*/
-        $this->dbRow[$var] = $value;
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
-    {
-        $this->references[$foreignKeyName] = $bean;
-
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function getRef($foreignKeyName)
-    {
-        if (array_key_exists($foreignKeyName, $this->references)) {
-            return $this->references[$foreignKeyName];
-        } elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
-            // If the object is new and has no property, then it has to be empty.
-            return;
-        } else {
-            $this->_dbLoadIfNotLoaded();
-
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-
-            $values = [];
-            foreach ($fk->getLocalColumns() as $column) {
-                $val = $this->dbRow[$column];
-                if ($val === null) {
-                    return;
-                }
-                $values[] = $val;
-            }
-
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
-
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
-        }
-    }
-
-    /**
-     * Returns the name of the table this object comes from.
-     *
-     * @return string
-     */
-    public function _getDbTableName()
-    {
-        return $this->dbTableName;
-    }
-
-    /**
-     * 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 load the row (before we lose the ID!)
-        $this->_dbLoadIfNotLoaded();
-
-        //Let's set the status to detached
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        $this->primaryKeys = [];
-
-        //Now unset the PK from the row
-        if ($this->tdbmService) {
-            $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-            foreach ($pk_array as $pk) {
-                $this->dbRow[$pk] = null;
-            }
-        }
-    }
-
-    /**
-     * Returns raw database row.
-     *
-     * @return array
-     */
-    public function _getDbRow()
-    {
-        // Let's merge $dbRow and $references
-        $dbRow = $this->dbRow;
-
-        foreach ($this->references as $foreignKeyName => $reference) {
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-            $localColumns = $fk->getLocalColumns();
-
-            if ($reference !== null) {
-                $refDbRows = $reference->_getDbRows();
-                $firstRefDbRow = reset($refDbRows);
-                $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-                for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
-                    $dbRow[$localColumns[$i]] = $pkValues[$i];
-                }
-            } else {
-                for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
-                    $dbRow[$localColumns[$i]] = null;
-                }
-            }
-        }
-
-        return $dbRow;
-    }
-
-    /**
-     * Returns references array.
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getReferences()
-    {
-        return $this->references;
-    }
-
-    /**
-     * Returns the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @return array
-     */
-    public function _getPrimaryKeys()
-    {
-        return $this->primaryKeys;
-    }
-
-    /**
-     * Sets the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @param array $primaryKeys
-     */
-    public function _setPrimaryKeys(array $primaryKeys)
-    {
-        $this->primaryKeys = $primaryKeys;
-        foreach ($this->primaryKeys as $column => $value) {
-            $this->dbRow[$column] = $value;
-        }
-    }
-
-    /**
-     * Returns the TDBMObject this bean is associated to.
-     *
-     * @return AbstractTDBMObject
-     */
-    public function getTDBMObject()
-    {
-        return $this->object;
-    }
-
-    /**
-     * Sets the TDBMObject this bean is associated to.
-     * Only used when cloning.
-     *
-     * @param AbstractTDBMObject $object
-     */
-    public function setTDBMObject(AbstractTDBMObject $object)
-    {
-        $this->object = $object;
-    }
+		$this->dbRow[$var] = $value;
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
+	{
+		$this->references[$foreignKeyName] = $bean;
+
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function getRef($foreignKeyName)
+	{
+		if (array_key_exists($foreignKeyName, $this->references)) {
+			return $this->references[$foreignKeyName];
+		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
+			// If the object is new and has no property, then it has to be empty.
+			return;
+		} else {
+			$this->_dbLoadIfNotLoaded();
+
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+
+			$values = [];
+			foreach ($fk->getLocalColumns() as $column) {
+				$val = $this->dbRow[$column];
+				if ($val === null) {
+					return;
+				}
+				$values[] = $val;
+			}
+
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
+
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
+		}
+	}
+
+	/**
+	 * Returns the name of the table this object comes from.
+	 *
+	 * @return string
+	 */
+	public function _getDbTableName()
+	{
+		return $this->dbTableName;
+	}
+
+	/**
+	 * 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 load the row (before we lose the ID!)
+		$this->_dbLoadIfNotLoaded();
+
+		//Let's set the status to detached
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		$this->primaryKeys = [];
+
+		//Now unset the PK from the row
+		if ($this->tdbmService) {
+			$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+			foreach ($pk_array as $pk) {
+				$this->dbRow[$pk] = null;
+			}
+		}
+	}
+
+	/**
+	 * Returns raw database row.
+	 *
+	 * @return array
+	 */
+	public function _getDbRow()
+	{
+		// Let's merge $dbRow and $references
+		$dbRow = $this->dbRow;
+
+		foreach ($this->references as $foreignKeyName => $reference) {
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			$localColumns = $fk->getLocalColumns();
+
+			if ($reference !== null) {
+				$refDbRows = $reference->_getDbRows();
+				$firstRefDbRow = reset($refDbRows);
+				$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
+				for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+					$dbRow[$localColumns[$i]] = $pkValues[$i];
+				}
+			} else {
+				for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+					$dbRow[$localColumns[$i]] = null;
+				}
+			}
+		}
+
+		return $dbRow;
+	}
+
+	/**
+	 * Returns references array.
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getReferences()
+	{
+		return $this->references;
+	}
+
+	/**
+	 * Returns the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeys()
+	{
+		return $this->primaryKeys;
+	}
+
+	/**
+	 * Sets the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @param array $primaryKeys
+	 */
+	public function _setPrimaryKeys(array $primaryKeys)
+	{
+		$this->primaryKeys = $primaryKeys;
+		foreach ($this->primaryKeys as $column => $value) {
+			$this->dbRow[$column] = $value;
+		}
+	}
+
+	/**
+	 * Returns the TDBMObject this bean is associated to.
+	 *
+	 * @return AbstractTDBMObject
+	 */
+	public function getTDBMObject()
+	{
+		return $this->object;
+	}
+
+	/**
+	 * Sets the TDBMObject this bean is associated to.
+	 * Only used when cloning.
+	 *
+	 * @param AbstractTDBMObject $object
+	 */
+	public function setTDBMObject(AbstractTDBMObject $object)
+	{
+		$this->object = $object;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -374,11 +374,11 @@
                 $refDbRows = $reference->_getDbRows();
                 $firstRefDbRow = reset($refDbRows);
                 $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-                for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+                for ($i = 0, $count = count($localColumns); $i<$count; ++$i) {
                     $dbRow[$localColumns[$i]] = $pkValues[$i];
                 }
             } else {
-                for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+                for ($i = 0, $count = count($localColumns); $i<$count; ++$i) {
                     $dbRow[$localColumns[$i]] = null;
                 }
             }