Add more types were possible, fix docblocks. (#1858)

* Add more types were possible, fix docblocks.

* Adjust templates method signatures. Fix up constants.

Author: dereuromark

src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehavior.php

@@ -330,7 +330,7 @@ protected function addObjectGetParentOrCreate(string &$script): void
 /**
  * Get or Create the parent " . $parentClass . " object of the current object
  *
- * @return    " . $parentClass . " The parent object
+ * @return " . $parentClass . " The parent object
  */
 public function getParentOrCreate(?ConnectionInterface \$con = null)
 {
@@ -372,7 +372,7 @@ protected function addObjectGetSyncParent(string &$script): void
  * Create or Update the parent " . $parentTable->getPhpName() . " object
  * And return its primary key
  *
- * @return    " . $cptype . " The primary key of the parent object
+ * @return " . $cptype . " The primary key of the parent object
  */
 public function getSyncParent(?ConnectionInterface \$con = null)
 {

src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehavior.php

@@ -84,7 +84,7 @@ protected function addHasChildObject(string &$script): void
 /**
  * Whether this object is the parent of a child object
  *
- * @return    bool
+ * @return bool
  */
 public function hasChildObject(): bool
 {

src/Propel/Generator/Behavior/Delegate/DelegateBehavior.php

@@ -338,21 +338,23 @@ public function queryMethods(QueryBuilder $builder): string
  *
  * @see Criteria::add()
  *
- * @param string \$column     A string representing thecolumn phpName, e.g. 'AuthorId'
- * @param mixed  \$value      A value for the condition
+ * @param string \$column     A string representing the column phpName, e.g. 'AuthorId'
+ * @param mixed \$value      A value for the condition
  * @param string \$comparison What to use for the column comparison, defaults to Criteria::EQUAL
  *
- * @return \$this|ModelCriteria The current object, for fluid interface
+ * @return \$this The current object, for fluid interface
  */
 public function filterBy(\$column, \$value, \$comparison = Criteria::EQUAL)
 {
     if (isset(\$this->delegatedFields[\$column])) {
         \$methodUse = \"use{\$this->delegatedFields[\$column]}Query\";
 
-        return \$this->{\$methodUse}()->filterBy(\$column, \$value, \$comparison)->endUse();
+        \$this->{\$methodUse}()->filterBy(\$column, \$value, \$comparison)->endUse();
     } else {
-        return \$this->add(\$this->getRealColumnName(\$column), \$value, \$comparison);
+        \$this->add(\$this->getRealColumnName(\$column), \$value, \$comparison);
     }
+
+    return \$this;
 }
 ";
         }

src/Propel/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifier.php

@@ -269,7 +269,7 @@ protected function addTranslatedColumnSetter(Column $column): string
             $objectBuilder->addMutatorOpenOpen($functionStatement, $column);
         }
         $comment = preg_replace('/^\t/m', '', $comment);
-        $comment = str_replace('@return     $this|' . $i18nTablePhpName, '@return     $this|' . $tablePhpName, $comment);
+        $comment = str_replace('@return $this|' . $i18nTablePhpName, '@return $this|' . $tablePhpName, $comment);
         $functionStatement = preg_replace('/^\t/m', '', $functionStatement);
         preg_match_all('/\$[a-z]+/i', $functionStatement, $params);