Propel generation fixes

Author: gertvdb

lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5BasicObjectBuilder.php

@@ -247,9 +247,13 @@ protected function addColumnAttributes(&$script) {
 
 		$table = $this->getTable();
 
-		foreach ($table->getColumns() as $col) {
+        /** @var Column $col */
+        foreach ($table->getColumns() as $col) {
 
-			$cptype = $col->getPhpNative();
+            $extra = ($col->isNotNull() && !$col->isLazyLoad()) || $col->getPhpNative() === PropelTypes::BOOLEAN_NATIVE_TYPE  ? '' : '|null';
+            $optional = ($col->isNotNull() && !$col->isLazyLoad()) || $col->getPhpNative() === PropelTypes::BOOLEAN_NATIVE_TYPE ? '' : '?';
+
+            $cptype = $col->getPhpNative();
 			$clo=strtolower($col->getName());
 			$defVal = "";
 			if (($val = $col->getPhpDefaultValue()) !== null) {
@@ -262,9 +266,9 @@ protected function addColumnAttributes(&$script) {
 
 	/**
 	 * The value for the $clo field.
-	 * @var        $cptype
+	 * @var        $cptype$extra
 	 */
-	protected \$" . $clo . $defVal . ";
+	protected ". $optional.$cptype ." \$" . $clo . $defVal . ";
 ";
 
 			if ($col->isLazyLoad()) {
@@ -350,7 +354,7 @@ protected function addTemporalAccessor(&$script, $col)
 	 * @throws     PropelException - if unable to convert the date/time to timestamp.
 	 */
 	public function get$cfc(\$format = ".var_export($defaultfmt, true)."";
-		if ($col->isLazyLoad()) $script .= ", \$con = null";
+		if ($col->isLazyLoad()) $script .= ", Connection \$con = null";
 		$script .= ")
 	{
 ";
@@ -395,14 +399,19 @@ protected function addGenericAccessor(&$script, $col)
 		$cfc=$col->getPhpName();
 		$clo=strtolower($col->getName());
 
+        $extra = '';
+        if (!$col->isNotNull() && !in_array($col->getPhpNative(), [PropelTypes::BOOLEAN])) {
+            $extra = "|null";
+        }
+
 		$script .= "
 	/**
 	 * Get the [$clo] column value.
 	 * ".$col->getDescription()."
-	 * @return     ".$col->getPhpNative(). $col->isNotNull() ? "" : "|null
+	 * @return     ".$col->getPhpNative().$extra ."
 	 */
 	public function get$cfc(";
-		if ($col->isLazyLoad()) $script .= "\$con = null";
+		if ($col->isLazyLoad()) $script .= "Connection \$con = null";
 		$script .= ")
 	{
 ";
@@ -413,8 +422,27 @@ public function get$cfc(";
 		}
 ";
 		}
+
+        switch ($col->getPhpNative()) {
+            case PropelTypes::BOOLEAN_NATIVE_TYPE:
+                $typeCast = '(bool)';
+                break;
+            case PropelTypes::INTEGER_NATIVE_TYPE:
+                if ($col->isNotNull()) {
+                    $typeCast = '(int)';
+                }
+                break;
+            case PropelTypes::CHAR_NATIVE_TYPE:
+                if ($col->isNotNull()) {
+                    $typeCast = '(string)';
+                }
+                break;
+            default:
+                $typeCast = '';
+        }
+
 		$script .= "
-		return \$this->$clo;
+		return $typeCast \$this->$clo;
 	}
 ";
 	}
@@ -442,7 +470,7 @@ protected function addLazyLoader(&$script, $col)
 	 * @return     void
 	 * @throws     PropelException - any underlying error will be wrapped and re-thrown.
 	 */
-	protected function load$cfc(\$con = null)
+	protected function load$cfc(Connection \$con = null)
 	{
 		\$c = \$this->buildPkeyCriteria();
 		\$c->addSelectColumn(".$this->getColumnConstant($col).");
@@ -871,13 +899,13 @@ public function getByPosition(\$pos)
 $script .= "
 			case $i:
 				return \$this->get$cfc();
-				break;";
+				";
 		$i++;
 	} /* foreach */
 $script .= "
 			default:
 				return null;
-				break;
+
 		} // switch()
 	}
 ";
@@ -982,13 +1010,13 @@ protected function addDelete(&$script)
 	/**
 	 * Removes this object from datastore and sets delete attribute.
 	 *
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     void
 	 * @throws     PropelException
 	 * @see        BaseObject::setDeleted()
 	 * @see        BaseObject::isDeleted()
 	 */
-	public function delete(\$con = null)
+	public function delete(Connection \$con = null)
 	{
 		if (\$this->isDeleted()) {
 			throw new PropelException(\"This object has already been deleted.\");
@@ -1045,11 +1073,11 @@ protected function addSave(&$script)
 	 *
 	 * If the object is new, it inserts it; otherwise an update is performed.
 	 *
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     int The number of rows affected by this insert/update operation (for non-complex OM this will be at most 1).
 	 * @throws     PropelException
 	 */
-	public function save(\$con = null)
+	public function save(Connection \$con = null)
 	{
 		\$affectedRows = 0; // initialize var to track total num of affected rows
 

lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php

@@ -528,12 +528,12 @@ protected function addDoCount(&$script)
 	 *
 	 * @param      Criteria \$criteria
 	 * @param      boolean \$distinct Whether to select only distinct columns (You can also set DISTINCT modifier in Criteria).
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     int Number of matching rows.
 	 * @throws PropelException
      * @throws SQLException
 	 */
-	public static function doCount(Criteria \$criteria, \$distinct = false, \$con = null)
+	public static function doCount(Criteria \$criteria, bool bool \$distinct = false, Connection \$con = null)
 	{
 		// we're going to modify criteria, so copy it first
 		\$criteria = clone \$criteria;
@@ -573,12 +573,12 @@ protected function addDoSelectOne(&$script)
 	 * Method to select one object from the DB.
 	 *
 	 * @param      Criteria \$criteria object used to create the SELECT statement.
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     ".$this->getTable()->getPhpName()."|null
 	 * @throws PropelException
      * @throws SQLException
 	 */
-	public static function doSelectOne(Criteria \$criteria, \$con = null)
+	public static function doSelectOne(Criteria \$criteria, Connection \$con = null)
 	{
 		\$critcopy = clone \$criteria;
 		\$critcopy->setLimit(1);
@@ -602,12 +602,12 @@ protected function addDoSelect(&$script)
 	 * Method to do selects.
 	 *
 	 * @param      Criteria \$criteria The Criteria object used to build the SELECT statement.
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     {$className}[] Array of selected Objects
 	 * @throws PropelException
      * @throws SQLException
 	 */
-	public static function doSelect(Criteria \$criteria, \$con = null)
+	public static function doSelect(Criteria \$criteria, Connection \$con = null)
 	{
 		return ".$this->getPeerClassname()."::populateObjects(".$this->getPeerClassname()."::doSelectRS(\$criteria, \$con));
 	}";
@@ -629,13 +629,13 @@ protected function addDoSelectRS(&$script)
 	 * (instead of an array of objects).
 	 *
 	 * @param      Criteria \$criteria The Criteria object used to build the SELECT statement.
-	 * @param      Connection \$con the connection to use
+	 * @param      Connection|null \$con the connection to use
 	 * @throws     PropelException Any exceptions caught during processing will be
 	 *		 rethrown wrapped into a PropelException.
 	 * @return     ResultSet The resultset object with numerically-indexed fields.
 	 * @see        ".$this->basePeerClassname."::doSelect()
 	 */
-	public static function doSelectRS(Criteria \$criteria, \$con = null)
+	public static function doSelectRS(Criteria \$criteria, Connection \$con = null)
 	{
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
@@ -841,12 +841,12 @@ protected function addDoInsert(&$script)
 	 * Method perform an INSERT on the database, given a ".$table->getPhpName()." or Criteria object.
 	 *
 	 * @param      mixed \$values Criteria or ".$table->getPhpName()." object containing data that is used to create the INSERT statement.
-	 * @param      Connection \$con the connection to use
+	 * @param      Connection|null \$con the connection to use
 	 * @return     mixed The new primary key.
 	 * @throws     PropelException Any exceptions caught during processing will be
 	 *		 rethrown wrapped into a PropelException.
 	 */
-	public static function doInsert(\$values, \$con = null)
+	public static function doInsert(\$values, Connection \$con = null)
 	{
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
@@ -900,12 +900,12 @@ protected function addDoUpdate(&$script)
 	 * Method perform an UPDATE on the database, given a ".$table->getPhpName()." or Criteria object.
 	 *
 	 * @param      mixed \$values Criteria or ".$table->getPhpName()." object containing data that is used to create the UPDATE statement.
-	 * @param      Connection \$con The connection to use (specify Connection object to exert more control over transactions).
+	 * @param      Connection|null \$con The connection to use (specify Connection object to exert more control over transactions).
 	 * @return     int The number of affected rows (if supported by underlying database driver).
 	 * @throws     PropelException Any exceptions caught during processing will be
 	 *		 rethrown wrapped into a PropelException.
 	 */
-	public static function doUpdate(\$values, \$con = null)
+	public static function doUpdate(\$values, Connection \$con = null)
 	{
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
@@ -950,11 +950,11 @@ protected function addDoDeleteAll(&$script)
 	/**
 	 * Method to DELETE all rows from the ".$table->getName()." table.
 	 *
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     int The number of affected rows (if supported by underlying database driver).
 	 * @throws     PropelException
 	 */
-	public static function doDeleteAll(\$con = null)
+	public static function doDeleteAll(Connection \$con = null)
 	{
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
@@ -997,13 +997,13 @@ protected function addDoDelete(&$script)
 	 *
 	 * @param      mixed \$values Criteria or ".$table->getPhpName()." object or primary key or array of primary keys
 	 *              which is used to create the DELETE statement
-	 * @param      Connection \$con the connection to use
+	 * @param      Connection|null \$con the connection to use
 	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
 	 *				if supported by native driver or if emulated using Propel.
 	 * @throws     PropelException Any exceptions caught during processing will be
 	 *		 rethrown wrapped into a PropelException.
 	 */
-	 public static function doDelete(\$values, \$con = null)
+	 public static function doDelete(\$values, Connection \$con = null)
 	 {
 		if (\$con === null) {
 			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME);
@@ -1113,7 +1113,7 @@ protected function addDoOnDeleteCascade(&$script)
 	 * This method should be used within a transaction if possible.
 	 *
 	 * @param      Criteria \$criteria
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     int The number of affected rows (if supported by underlying database driver).
 	 */
 	protected static function doOnDeleteCascade(Criteria \$criteria, Connection \$con)
@@ -1196,7 +1196,7 @@ protected function addDoOnDeleteSetNull(&$script)
 	 * This method should be used within a transaction if possible.
 	 *
 	 * @param      Criteria \$criteria
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     void
 	 */
 	protected static function doOnDeleteSetNull(Criteria \$criteria, Connection \$con)
@@ -1331,12 +1331,12 @@ protected function addRetrieveByPK_SinglePK(&$script)
 	 * Retrieve a single object by pkey.
 	 *
 	 * @param      mixed \$pk the primary key.
-	 * @param      Connection \$con the connection to use
+	 * @param      Connection|null \$con the connection to use
 	 * @return     $className|null
 	 * @throws PropelException
      * @throws SQLException
 	 */
-	public static function ".$this->getRetrieveMethodName()."(\$pk, \$con = null)
+	public static function ".$this->getRetrieveMethodName()."(\$pk, Connection \$con = null)
 	{
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
@@ -1383,12 +1383,12 @@ protected function addRetrieveByPKs_SinglePK(&$script)
 	 * Retrieve multiple objects by pkey.
 	 *
 	 * @param      array \$pks List of primary keys
-	 * @param      Connection \$con the connection to use
+	 * @param      Connection|null \$con the connection to use
 	 * @return     {$className}[]
 	 * @throws PropelException
      * @throws SQLException
 	 */
-	public static function ".$this->getRetrieveMethodName()."s(\$pks, \$con = null)
+	public static function ".$this->getRetrieveMethodName()."s(\$pks, Connection \$con = null)
 	{
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
@@ -1449,7 +1449,7 @@ protected function addRetrieveByPK_MultiPK(&$script)
 	   ";
 	   }
 	   $script .= "
-	 * @param      Connection \$con
+	 * @param      Connection|null \$con
 	 * @return     ".$table->getPhpName()."
 	 */
 	public static function ".$this->getRetrieveMethodName()."(";
@@ -1458,7 +1458,7 @@ public static function ".$this->getRetrieveMethodName()."(";
 			$clo = strtolower($col->getName());
 			$script .= ($co++ ? "," : "") . " $".$clo;
 		} /* foreach */
-		$script .= ", \$con = null) {
+		$script .= ", Connection \$con = null) {
 		if (\$con === null) {
 			\$con = Propel::getConnection(self::DATABASE_NAME);
 		}