@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | * |
| 288 | 288 | * @param string $msg |
| 289 | 289 | * @param int $priority One of the Propel::LOG_* logging levels |
| 290 | - * @return boolean |
|
| 290 | + * @return boolean|null |
|
| 291 | 291 | */ |
| 292 | 292 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 293 | 293 | { |
@@ -933,7 +933,7 @@ discard block |
||
| 933 | 933 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 934 | 934 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 935 | 935 | * |
| 936 | - * @param mixed $parser A AbstractParser instance, |
|
| 936 | + * @param string $parser A AbstractParser instance, |
|
| 937 | 937 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 938 | 938 | * @param string $data The source data to import from |
| 939 | 939 | * @param string $keyType The type of keys the array uses. |
@@ -118,7 +118,6 @@ |
||
| 118 | 118 | * $obj = $c->findPk(array(12, 34), $con); |
| 119 | 119 | * </code> |
| 120 | 120 | * |
| 121 | - * @param array[$id, $locale] $key Primary key to use for the query |
|
| 122 | 121 | * @param ConnectionInterface $con an optional connection object |
| 123 | 122 | * |
| 124 | 123 | * @return ChildBannersI18n|array|mixed the result, formatted by the current formatter |