Fix/strict nullables (#2039)

* add strict nullable types to baseQueryExistsMethods template
* add strict nullable types to baseQueryInMethods template
* add strict nullable types to ObjectBuilder (+AggregateColumnRelationBehavior)
* remove mixed type to support php7

---------

Co-authored-by: Sam Hauglustaine <[email protected]>

Author: eelkevdbos

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,7 +1158,7 @@ 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';
         }
@@ -6823,7 +6823,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
     {";
     }
 

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

@@ -377,7 +377,7 @@ protected function addConstructorOpen(string &$script): void
     {
         $table = $this->getTable();
         $script .= "
-    public function __construct(\$dbName = '" . $table->getDatabase()->getName() . "', \$modelName = '" . addslashes($this->getNewStubObjectBuilder($table)->getFullyQualifiedClassName()) . "', \$modelAlias = null)
+    public function __construct(\$dbName = '" . $table->getDatabase()->getName() . "', \$modelName = '" . addslashes($this->getNewStubObjectBuilder($table)->getFullyQualifiedClassName()) . "', ?string \$modelAlias = null)
     {";
     }
 
@@ -1567,7 +1567,7 @@ protected function addUseRelatedQuery(string &$script, Table $fkTable, string $q
      *
      * @return $queryClass A secondary query class using the current class as primary query
      */
-    public function use" . $relationName . 'Query($relationAlias = null, $joinType = ' . $joinType . ")
+    public function use" . $relationName . 'Query(?string $relationAlias = null, string $joinType = ' . $joinType . ")
     {
         return \$this
             ->join" . $relationName . "(\$relationAlias, \$joinType)

templates/Builder/Om/baseQueryExistsMethods.php

@@ -1,4 +1,4 @@
-    
+
     /**
      * Use the <?= $relationDescription ?> for an EXISTS query.
      *
@@ -10,7 +10,7 @@
      *
      * @return <?= $queryClass ?> The inner query object of the EXISTS statement
      */
-    public function use<?= $relationName ?>ExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = '<?= $existsType ?>')
+    public function use<?= $relationName ?>ExistsQuery(?string $modelAlias = null, ?string $queryClass = null, string $typeOfExists = '<?= $existsType ?>')
     {
         /** @var $q <?= $queryClass ?> */
         $q = $this->useExistsQuery('<?= $relationName ?>', $modelAlias, $queryClass, $typeOfExists);
@@ -27,7 +27,7 @@ public function use<?= $relationName ?>ExistsQuery($modelAlias = null, $queryCla
      *
      * @return <?= $queryClass ?> The inner query object of the NOT EXISTS statement
      */
-    public function use<?= $relationName ?>NotExistsQuery($modelAlias = null, $queryClass = null)
+    public function use<?= $relationName ?>NotExistsQuery(?string $modelAlias = null, ?string $queryClass = null)
     {
         /** @var $q <?= $queryClass ?> */
         $q = $this->useExistsQuery('<?= $relationName ?>', $modelAlias, $queryClass, '<?= $notExistsType ?>');

templates/Builder/Om/baseQueryInMethods.php

@@ -10,7 +10,7 @@
      *
      * @return <?= $queryClass ?> The inner query object of the IN statement
      */
-    public function useIn<?= $relationName ?>Query($modelAlias = null, $queryClass = null, $typeOfIn = '<?= $inType ?>')
+    public function useIn<?= $relationName ?>Query(?string $modelAlias = null, ?string $queryClass = null, string $typeOfIn = '<?= $inType ?>')
     {
         /** @var $q <?= $queryClass ?> */
         $q = $this->useInQuery('<?= $relationName ?>', $modelAlias, $queryClass, $typeOfIn);
@@ -27,7 +27,7 @@ public function useIn<?= $relationName ?>Query($modelAlias = null, $queryClass =
      *
      * @return <?= $queryClass ?> The inner query object of the NOT IN statement
      */
-    public function useNotIn<?= $relationName ?>Query($modelAlias = null, $queryClass = null)
+    public function useNotIn<?= $relationName ?>Query(?string $modelAlias = null, ?string $queryClass = null)
     {
         /** @var $q <?= $queryClass ?> */
         $q = $this->useInQuery('<?= $relationName ?>', $modelAlias, $queryClass, '<?= $notInType ?>');