add strict nullable types to ObjectBuilder (+AggregateColumnRelationBehavior)

Author: eelkevdbos

src/Propel/Generator/Behavior/AggregateColumn/AggregateColumnRelationBehavior.php

@@ -111,7 +111,7 @@ public function objectFilter(string &$script, AbstractOMBuilder $builder): void
         $relationName = $this->getRelationName($builder);
         $aggregateName = $this->getParameter('aggregate_name');
         $relatedClass = $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($this->getForeignTable()));
-        $search = "    public function set{$relationName}({$relatedClass} \$v = null)
+        $search = "    public function set{$relationName}(?{$relatedClass} \$v = null)
     {";
         $replace = $search . "
         // aggregate_column_relation behavior

src/Propel/Generator/Builder/Om/ObjectBuilder.php

@@ -982,9 +982,9 @@ public function addTemporalAccessorOpen(string &$script, Column $column): void
         }
 
         $script .= "
-    " . $visibility . " function get$cfc(\$format = " . $format;
+    " . $visibility . " function get$cfc(?string \$format = " . $format;
         if ($column->isLazyLoad()) {
-            $script .= ', $con = null';
+            $script .= ', ?ConnectionInterface $con = null';
         }
         $script .= ")
     {";
@@ -1158,9 +1158,9 @@ public function addJsonAccessorOpen(string &$script, Column $column): void
         $visibility = $column->getAccessorVisibility();
 
         $script .= "
-    " . $visibility . " function get$cfc(\$asArray = true";
+    " . $visibility . " function get$cfc(bool \$asArray = true";
         if ($column->isLazyLoad()) {
-            $script .= ', ConnectionInterface $con = null';
+            $script .= ', ?ConnectionInterface $con = null';
         }
 
         $script .= ")
@@ -1278,7 +1278,7 @@ public function addBooleanAccessorOpen(string &$script, Column $column): void
         $script .= "
     " . $visibility . " function $name(";
         if ($column->isLazyLoad()) {
-            $script .= 'ConnectionInterface $con = null';
+            $script .= '?ConnectionInterface $con = null';
         }
 
         $script .= ")
@@ -1483,7 +1483,7 @@ protected function addHasArrayElement(string &$script, Column $column): void
      */
     $visibility function has$singularPhpName(\$value";
         if ($column->isLazyLoad()) {
-            $script .= ', ConnectionInterface $con = null';
+            $script .= ', ?ConnectionInterface $con = null';
         }
 
         $script .= "): bool
@@ -1557,7 +1557,7 @@ public function addDefaultAccessorOpen(string &$script, Column $column): void
         $script .= "
     " . $visibility . " function get$cfc(";
         if ($column->isLazyLoad()) {
-            $script .= 'ConnectionInterface $con = null';
+            $script .= '?ConnectionInterface $con = null';
         }
 
         $script .= ")
@@ -2206,7 +2206,7 @@ protected function addAddArrayElement(string &$script, Column $col): void
      */
     $visibility function add$singularPhpName(\$value";
         if ($col->isLazyLoad()) {
-            $script .= ', ConnectionInterface $con = null';
+            $script .= ', ?ConnectionInterface $con = null';
         }
 
         $script .= ")
@@ -2254,7 +2254,7 @@ protected function addRemoveArrayElement(string &$script, Column $col): void
      */
     $visibility function remove$singularPhpName(\$value";
         if ($col->isLazyLoad()) {
-            $script .= ', ConnectionInterface $con = null';
+            $script .= ', ?ConnectionInterface $con = null';
         }
         // we want to reindex the array, so array_ functions are not the best choice
         $script .= ")
@@ -4141,7 +4141,7 @@ protected function addFKMutator(string &$script, ForeignKey $fk): void
      * @return \$this The current object (for fluent API support)
      * @throws \Propel\Runtime\Exception\PropelException
      */
-    public function set" . $this->getFKPhpNameAffix($fk, false) . "($className \$v = null)
+    public function set" . $this->getFKPhpNameAffix($fk, false) . "(?$className \$v = null)
     {";
 
         foreach ($fk->getMapping() as $map) {
@@ -4269,7 +4269,7 @@ protected function addFKAccessor(string &$script, ForeignKey $fk): void
      * @return {$className}{$orNull} $returnDesc
      * @throws \Propel\Runtime\Exception\PropelException
      */
-    public function get" . $this->getFKPhpNameAffix($fk, false) . "(?ConnectionInterface \$con = null)
+    public function get" . $this->getFKPhpNameAffix($fk, false) . "(?ConnectionInterface \$con = null): $className$orNull
     {";
         $script .= "
         if (\$this->$varName === null && ($conditional)) {";
@@ -4962,7 +4962,7 @@ protected function addPKRefFKSet(string &$script, ForeignKey $refFK): void
      * @return \$this The current object (for fluent API support)
      * @throws \Propel\Runtime\Exception\PropelException
      */
-    public function set" . $this->getRefFKPhpNameAffix($refFK, false) . "($className \$v = null)
+    public function set" . $this->getRefFKPhpNameAffix($refFK, false) . "(?$className \$v = null)
     {
         \$this->$varName = \$v;
 
@@ -6822,7 +6822,7 @@ protected function addSaveOpen(string &$script): void
         $reloadOnUpdate = $table->isReloadOnUpdate();
         $reloadOnInsert = $table->isReloadOnInsert();
         $script .= "
-    public function save(?ConnectionInterface \$con = null" . ($reloadOnUpdate || $reloadOnInsert ? ', $skipReload = false' : '') . "): int
+    public function save(?ConnectionInterface \$con = null" . ($reloadOnUpdate || $reloadOnInsert ? ', bool $skipReload = false' : '') . "): int
     {";
     }