|
@@ -92,7 +92,7 @@ discard block |
|
|
block discarded – undo |
|
92
|
92
|
return false; |
|
93
|
93
|
} |
|
94
|
94
|
|
|
95
|
|
- return isset($result[ 'ok' ]) ? $result[ 'ok' ] == 1 : true; |
|
|
95
|
+ return isset($result['ok']) ? $result['ok'] == 1 : true; |
|
96
|
96
|
} else { |
|
97
|
97
|
throw new \InvalidArgumentException('Cross-Driver type confusion detected'); |
|
98
|
98
|
} |
|
@@ -108,9 +108,9 @@ discard block |
|
|
block discarded – undo |
|
108
|
108
|
|
|
109
|
109
|
if ($document) { |
|
110
|
110
|
return [ |
|
111
|
|
- self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[ self::DRIVER_DATA_WRAPPER_INDEX ]->bin), |
|
112
|
|
- self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec), |
|
113
|
|
- self::DRIVER_TAGS_WRAPPER_INDEX => $this->decode($document[ self::DRIVER_TAGS_WRAPPER_INDEX ]->bin), |
|
|
111
|
+ self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[self::DRIVER_DATA_WRAPPER_INDEX]->bin), |
|
|
112
|
+ self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[self::DRIVER_TIME_WRAPPER_INDEX]->sec), |
|
|
113
|
+ self::DRIVER_TAGS_WRAPPER_INDEX => $this->decode($document[self::DRIVER_TAGS_WRAPPER_INDEX]->bin), |
|
114
|
114
|
]; |
|
115
|
115
|
} else { |
|
116
|
116
|
return null; |
|
@@ -130,7 +130,7 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
if ($item instanceof Item) { |
|
131
|
131
|
$deletionResult = (array) $this->getCollection()->remove(['_id' => $item->getKey()], ["w" => 1]); |
|
132
|
132
|
|
|
133
|
|
- return (int) $deletionResult[ 'ok' ] === 1 && !$deletionResult[ 'err' ]; |
|
|
133
|
+ return (int) $deletionResult['ok'] === 1 && !$deletionResult['err']; |
|
134
|
134
|
} else { |
|
135
|
135
|
throw new \InvalidArgumentException('Cross-Driver type confusion detected'); |
|
136
|
136
|
} |
|
@@ -154,11 +154,11 @@ discard block |
|
|
block discarded – undo |
|
154
|
154
|
if ($this->instance instanceof MongodbClient) { |
|
155
|
155
|
throw new LogicException('Already connected to Mongodb server'); |
|
156
|
156
|
} else { |
|
157
|
|
- $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1'; |
|
158
|
|
- $port = isset($server[ 'port' ]) ? $server[ 'port' ] : '27017'; |
|
159
|
|
- $timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : 3; |
|
160
|
|
- $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : ''; |
|
161
|
|
- $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : ''; |
|
|
157
|
+ $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1'; |
|
|
158
|
+ $port = isset($server['port']) ? $server['port'] : '27017'; |
|
|
159
|
+ $timeout = isset($server['timeout']) ? $server['timeout'] : 3; |
|
|
160
|
+ $password = isset($this->config['password']) ? $this->config['password'] : ''; |
|
|
161
|
+ $username = isset($this->config['username']) ? $this->config['username'] : ''; |
|
162
|
162
|
|
|
163
|
163
|
|
|
164
|
164
|
/** |
|
@@ -206,8 +206,8 @@ discard block |
|
|
block discarded – undo |
|
206
|
206
|
]); |
|
207
|
207
|
|
|
208
|
208
|
$stats = (new driverStatistic()) |
|
209
|
|
- ->setInfo('MongoDB version ' . $serverStatus[ 'version' ] . ', Uptime (in days): ' . round($serverStatus[ 'uptime' ] / 86400, 1) . "\n For more information see RawData.") |
|
210
|
|
- ->setSize((int) @$collStats[ 'size' ]) |
|
|
209
|
+ ->setInfo('MongoDB version ' . $serverStatus['version'] . ', Uptime (in days): ' . round($serverStatus['uptime'] / 86400, 1) . "\n For more information see RawData.") |
|
|
210
|
+ ->setSize((int) @$collStats['size']) |
|
211
|
211
|
->setData(implode(', ', array_keys($this->itemInstances))) |
|
212
|
212
|
->setRawData([ |
|
213
|
213
|
'serverStatus' => $serverStatus, |