@@ -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 |
@@ -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 |
@@ -128,7 +128,7 @@ |
||
| 128 | 128 | * @param string $tableName |
| 129 | 129 | * @param array $data |
| 130 | 130 | * @throws Exception |
| 131 | - * @return bool|void |
|
| 131 | + * @return false|null |
|
| 132 | 132 | */ |
| 133 | 133 | protected function insertPropertiesData($tableName, $data) { |
| 134 | 134 | |
@@ -57,6 +57,9 @@ |
||
| 57 | 57 | */ |
| 58 | 58 | protected $propertiesData = []; |
| 59 | 59 | |
| 60 | + /** |
|
| 61 | + * @param string $externalId |
|
| 62 | + */ |
|
| 60 | 63 | public function getBrandIdByExId($externalId = NULL) { |
| 61 | 64 | |
| 62 | 65 | if ($externalId == NULL) { |
@@ -290,7 +290,7 @@ |
||
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | /** |
| 293 | - * @return bool |
|
| 293 | + * @return false|null |
|
| 294 | 294 | */ |
| 295 | 295 | public function Querys() { |
| 296 | 296 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * @param $pageId |
| 23 | - * @return array |
|
| 23 | + * @return PageLink |
|
| 24 | 24 | */ |
| 25 | 25 | public function getLinkByPage($pageId) { |
| 26 | 26 | $pageLink = PageLinkQuery::create()->findOneActiveByPageId($pageId); |
@@ -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. |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | * |
| 268 | 268 | * @param string $msg |
| 269 | 269 | * @param int $priority One of the Propel::LOG_* logging levels |
| 270 | - * @return boolean |
|
| 270 | + * @return boolean|null |
|
| 271 | 271 | */ |
| 272 | 272 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 273 | 273 | { |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME |
| 695 | 695 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 696 | 696 | * Defaults to TableMap::TYPE_PHPNAME. |
| 697 | - * @return mixed Value of field. |
|
| 697 | + * @return integer|null Value of field. |
|
| 698 | 698 | */ |
| 699 | 699 | public function getByName($name, $type = TableMap::TYPE_PHPNAME) |
| 700 | 700 | { |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | * Zero-based. |
| 710 | 710 | * |
| 711 | 711 | * @param int $pos position in xml schema |
| 712 | - * @return mixed Value of field at $pos |
|
| 712 | + * @return integer|null Value of field at $pos |
|
| 713 | 713 | */ |
| 714 | 714 | public function getByPosition($pos) |
| 715 | 715 | { |
@@ -860,7 +860,7 @@ discard block |
||
| 860 | 860 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 861 | 861 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 862 | 862 | * |
| 863 | - * @param mixed $parser A AbstractParser instance, |
|
| 863 | + * @param string $parser A AbstractParser instance, |
|
| 864 | 864 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 865 | 865 | * @param string $data The source data to import from |
| 866 | 866 | * @param string $keyType The type of keys the array uses. |
@@ -949,7 +949,7 @@ discard block |
||
| 949 | 949 | /** |
| 950 | 950 | * Returns the composite primary key for this object. |
| 951 | 951 | * The array elements will be in same order as specified in XML. |
| 952 | - * @return array |
|
| 952 | + * @return integer[] |
|
| 953 | 953 | */ |
| 954 | 954 | public function getPrimaryKey() |
| 955 | 955 | { |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use Propel\Runtime\ActiveQuery\Criteria; |
| 9 | 9 | use Propel\Runtime\ActiveQuery\ModelCriteria; |
| 10 | 10 | use Propel\Runtime\ActiveRecord\ActiveRecordInterface; |
| 11 | -use Propel\Runtime\Collection\Collection; |
|
| 12 | 11 | use Propel\Runtime\Connection\ConnectionInterface; |
| 13 | 12 | use Propel\Runtime\Exception\BadMethodCallException; |
| 14 | 13 | use Propel\Runtime\Exception\LogicException; |