Format parameter can be null (#1462)

timoschwarzer · marcj · commit c64c0d61a365 · 2018-02-12T23:49:26.000+01:00
diff --git a/src/Propel/Generator/Builder/Om/ObjectBuilder.php b/src/Propel/Generator/Builder/Om/ObjectBuilder.php
@@ -808,7 +808,7 @@ public function addTemporalAccessorComment(&$script, Column $column)
      * Get the [optionally formatted] temporal [$clo] column value.
      * {$column->getDescription()}
      *
-     * @param      string \$format The date/time format string (either date()-style or strftime()-style).
+     * @param      string|null \$format The date/time format string (either date()-style or strftime()-style).
      *                            If format is NULL, then the raw $dateTimeClass object will be returned.
      *
      * @return string|$dateTimeClass Formatted date/time value as string or $dateTimeClass object (if format is NULL), NULL if column is NULL" .($handleMysqlDate ? ', and 0 if column value is ' . $mysqlInvalidDateString : '')."

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ public function addTemporalAccessorComment(&$script, Column $column)`
`808`	`808`	`* Get the [optionally formatted] temporal [$clo] column value.`
`809`	`809`	`* {$column->getDescription()}`
`810`	`810`	`*`
`811`		`- * @param string \$format The date/time format string (either date()-style or strftime()-style).`
	`811`	`+ * @param string\|null \$format The date/time format string (either date()-style or strftime()-style).`
`812`	`812`	`* If format is NULL, then the raw $dateTimeClass object will be returned.`
`813`	`813`	`*`
`814`	`814`	`* @return string\|$dateTimeClass Formatted date/time value as string or $dateTimeClass object (if format is NULL), NULL if column is NULL" .($handleMysqlDate ? ', and 0 if column value is ' . $mysqlInvalidDateString : '')."`