mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-03 05:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正几处因为函数重载时参数与父类参数不同而出现的warn

Browse Source
This commit is contained in:
huangdijia
2015-12-22 13:29:37 +08:00
parent 743bffb381
commit bbf8c03b51
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/db/driver/mongo.php
View File

@@ -61,7 +61,7 @@ class Mongo extends Driver
* @return
* @throws Exception
*/
public function connect($config = '', $linkNum = 0)
public function connect($config = '', $linkNum = 0, $autoConnection = false)
{
if (!isset($this->linkID[$linkNum])) {
if (empty($config)) {
@@ -249,7 +249,7 @@ class Mongo extends Driver
* @return bool
* @throws Exception
*/
public function insertAll($dataList, $options = [])
public function insertAll($dataList, $options = [], $replace = false)
{
if (isset($options['table'])) {
$this->switchCollection($options['table']);

8
library/think/model/mongo.php
View File

@@ -101,7 +101,7 @@ class Mongo extends \Think\Model
}
// 插入数据前的回调方法
protected function _before_insert(&$data, $options)
protected function _before_insert(&$data, $options = [])
{
// 写入数据到数据库
if ($this->_autoInc && self::TYPE_INT == $this->_idType) {
@@ -119,7 +119,7 @@ class Mongo extends \Think\Model
}
// 查询成功后的回调方法
protected function _after_select(&$resultSet, $options)
protected function _after_select(&$resultSet, $options = [])
{
array_walk($resultSet, [$this, 'checkMongoId']);
}
@@ -185,7 +185,7 @@ class Mongo extends \Think\Model
* @param integer $step 增长值
* @return boolean
*/
public function setInc($field, $step = 1)
public function setInc($field, $step = 1, $lazyTime = 0)
{
return $this->setField($field, ['inc', $step]);
}
@@ -197,7 +197,7 @@ class Mongo extends \Think\Model
* @param integer $step 减少值
* @return boolean
*/
public function setDec($field, $step = 1)
public function setDec($field, $step = 1, $lazyTime = 0)
{
return $this->setField($field, ['inc', '-' . $step]);
}