Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mongo-php-library
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sinan
mongo-php-library
Commits
1d4376cd
Commit
1d4376cd
authored
Jul 09, 2018
by
Jeremy Mikola
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #557
parents
9420a3b4
3778aef8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
18 deletions
+18
-18
ChangeStream.php
src/ChangeStream.php
+2
-2
Collection.php
src/Collection.php
+1
-1
UnsupportedException.php
src/Exception/UnsupportedException.php
+2
-2
BulkWrite.php
src/Operation/BulkWrite.php
+1
-1
CountDocuments.php
src/Operation/CountDocuments.php
+1
-1
Find.php
src/Operation/Find.php
+11
-11
No files found.
src/ChangeStream.php
View file @
1d4376cd
...
...
@@ -115,7 +115,7 @@ class ChangeStream implements Iterator
* free any reference to Watch. This will also free the only
* reference to an implicit session, since any such reference
* belongs to Watch. */
if
((
string
)
$this
->
getCursorId
()
===
'0'
)
{
if
((
string
)
$this
->
getCursorId
()
===
'0'
)
{
$this
->
resumeCallable
=
null
;
}
}
catch
(
RuntimeException
$e
)
{
...
...
@@ -138,7 +138,7 @@ class ChangeStream implements Iterator
$this
->
resumeToken
=
$this
->
extractResumeToken
(
$this
->
csIt
->
current
());
}
// As with next(), free the callable once we know it will never be used.
if
((
string
)
$this
->
getCursorId
()
===
'0'
)
{
if
((
string
)
$this
->
getCursorId
()
===
'0'
)
{
$this
->
resumeCallable
=
null
;
}
}
catch
(
RuntimeException
$e
)
{
...
...
src/Collection.php
View file @
1d4376cd
...
...
@@ -949,7 +949,7 @@ class Collection
$options
[
'typeMap'
]
=
$this
->
typeMap
;
}
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
\MongoDB\server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
\MongoDB\server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
$options
[
'writeConcern'
]
=
$this
->
writeConcern
;
}
...
...
src/Exception/UnsupportedException.php
View file @
1d4376cd
...
...
@@ -29,7 +29,7 @@ class UnsupportedException extends RuntimeException
return
new
static
(
'Array filters are not supported by the server executing this operation'
);
}
/**
/**
* Thrown when collations are not supported by a server.
*
* @return self
...
...
@@ -39,7 +39,7 @@ class UnsupportedException extends RuntimeException
return
new
static
(
'Collations are not supported by the server executing this operation'
);
}
/**
/**
* Thrown when explain is not supported by a server.
*
* @return self
...
...
src/Operation/BulkWrite.php
View file @
1d4376cd
...
...
@@ -94,7 +94,7 @@ class BulkWrite implements Executable
*
* This is not supported for server versions < 3.6 and will result in an
* exception at execution time if used.
*
*
* Supported options for the bulk write operation:
*
* * bypassDocumentValidation (boolean): If true, allows the write to
...
...
src/Operation/CountDocuments.php
View file @
1d4376cd
...
...
@@ -180,7 +180,7 @@ class CountDocuments implements Executable
$pipeline
[]
=
[
'$limit'
=>
$this
->
options
[
'limit'
]];
}
$pipeline
[]
=
[
'$group'
=>
[
'_id'
=>
null
,
'n'
=>
[
'$sum'
=>
1
]]];
$pipeline
[]
=
[
'$group'
=>
[
'_id'
=>
null
,
'n'
=>
[
'$sum'
=>
1
]]];
$cmd
=
[
'aggregate'
=>
$this
->
collectionName
,
...
...
src/Operation/Find.php
View file @
1d4376cd
...
...
@@ -327,17 +327,17 @@ class Find implements Executable, Explainable
unset
(
$options
[
'maxAwaitTimeMS'
]);
$modifierFallback
=
[
[
'allowPartialResults'
,
'partial'
],
[
'comment'
,
'$comment'
],
[
'hint'
,
'$hint'
],
[
'maxScan'
,
'$maxScan'
],
[
'max'
,
'$max'
],
[
'maxTimeMS'
,
'$maxTimeMS'
],
[
'min'
,
'$min'
],
[
'returnKey'
,
'$returnKey'
],
[
'showRecordId'
,
'$showDiskLoc'
],
[
'sort'
,
'$orderby'
],
[
'snapshot'
,
'$snapshot'
],
[
'allowPartialResults'
,
'partial'
],
[
'comment'
,
'$comment'
],
[
'hint'
,
'$hint'
],
[
'maxScan'
,
'$maxScan'
],
[
'max'
,
'$max'
],
[
'maxTimeMS'
,
'$maxTimeMS'
],
[
'min'
,
'$min'
],
[
'returnKey'
,
'$returnKey'
],
[
'showRecordId'
,
'$showDiskLoc'
],
[
'sort'
,
'$orderby'
],
[
'snapshot'
,
'$snapshot'
],
];
foreach
(
$modifierFallback
as
$modifier
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment