Skip to content

Commit 7f1e78b

Browse files
committed
Fix typos and interface
1 parent c2e3d3e commit 7f1e78b

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ protected function addColumnAttributes(&$script) {
260260
settype($val, $cptype);
261261
$defaultValue = var_export($val, true);
262262
$defVal = " = " . $defaultValue;
263-
}
263+
} else {
264+
$defVal = " = null";
265+
}
264266

265267
$script .= "
266268

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ protected function addDoCount(&$script)
533533
* @throws PropelException
534534
* @throws SQLException
535535
*/
536-
public static function doCount(Criteria \$criteria, bool bool \$distinct = false, Connection \$con = null)
536+
public static function doCount(Criteria \$criteria, bool \$distinct = false, Connection \$con = null)
537537
{
538538
// we're going to modify criteria, so copy it first
539539
\$criteria = clone \$criteria;

lib/vendor/propel/om/Persistent.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,19 @@ public function isDeleted();
100100
*/
101101
public function setDeleted($b);
102102

103-
/**
104-
* Deletes the object.
105-
* @param Connection $con
106-
* @return void
107-
* @throws Exception
108-
*/
109-
public function delete($con = null);
103+
/**
104+
* Deletes the object.
105+
* @param Connection|null $con
106+
* @return void
107+
* @throws Exception
108+
*/
109+
public function delete(Connection $con = null);
110110

111-
/**
112-
* Saves the object.
113-
* @param Connection $con
114-
* @return void
115-
* @throws Exception
116-
*/
117-
public function save($con = null);
111+
/**
112+
* Saves the object.
113+
* @param Connection|null $con
114+
* @return void
115+
* @throws Exception
116+
*/
117+
public function save(Connection $con = null);
118118
}

0 commit comments

Comments
 (0)