-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[HttpFoundation] MongoDB driver support for sessions #18788
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
[HTTP][Session][Mongo] MongoDB driver support
- Loading branch information
commit aab79a267a9e76effc7c19493ca4a8bfb587a68c
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,25 +67,28 @@ class MongoDbSessionHandler implements \SessionHandlerInterface | |
* @throws \InvalidArgumentException When MongoClient or Mongo instance not provided | ||
* @throws \InvalidArgumentException When "database" or "collection" not provided | ||
*/ | ||
public function __construct($mongo, array $options) | ||
{ | ||
if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) { | ||
throw new \InvalidArgumentException('MongoClient or Mongo instance required'); | ||
} | ||
public function __construct($mongo, array $options) | ||
{ | ||
if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo || $mongo instanceof \MongoDB\Client)) { | ||
throw new \InvalidArgumentException('MongoClient, Mongo or MongoDB instance required'); | ||
}elseif($mongo instanceof \MongoDB\Client && !class_exists('\MongoDB\Collection')){ | ||
throw new \InvalidArgumentException('\MongoDB\Collection instance not loaded'); | ||
|
||
if (!isset($options['database']) || !isset($options['collection'])) { | ||
throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler'); | ||
} | ||
} | ||
|
||
$this->mongo = $mongo; | ||
if (!isset($options['database']) || !isset($options['collection'])) { | ||
throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler'); | ||
} | ||
|
||
$this->options = array_merge(array( | ||
'id_field' => '_id', | ||
'data_field' => 'data', | ||
'time_field' => 'time', | ||
'expiry_field' => 'expires_at', | ||
), $options); | ||
} | ||
$this->mongo = $mongo; | ||
|
||
$this->options = array_merge(array( | ||
'id_field' => '_id', | ||
'data_field' => 'data', | ||
'time_field' => 'time', | ||
'expiry_field' => 'expires_at', | ||
), $options); | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
|
@@ -108,9 +111,16 @@ public function close() | |
*/ | ||
public function destroy($sessionId) | ||
{ | ||
$this->getCollection()->remove(array( | ||
$this->options['id_field'] => $sessionId, | ||
)); | ||
if($this->getCollection() instanceof \MongoDB\Collection) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please, respect CS. You should take a look about PSR-2 and Symfony CS. |
||
{ | ||
$this->getCollection()->deleteOne(array( | ||
$this->options['id_field'] => $sessionId, | ||
)); | ||
}else{ | ||
$this->getCollection()->remove(array( | ||
$this->options['id_field'] => $sessionId, | ||
)); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what about doing this (same below and above)? $collection = $this->getCollection();
$method = $collection instanceof \MongoDB\Collection ? 'deleteMany' : 'remove';
$collection->$method(array( |
||
|
||
return true; | ||
} | ||
|
@@ -120,9 +130,16 @@ public function destroy($sessionId) | |
*/ | ||
public function gc($maxlifetime) | ||
{ | ||
$this->getCollection()->remove(array( | ||
$this->options['expiry_field'] => array('$lt' => new \MongoDate()), | ||
)); | ||
if($this->getCollection() instanceof \MongoDB\Collection) | ||
{ | ||
$this->getCollection()->deleteMany(array( | ||
$this->options['id_field'] => $sessionId, | ||
)); | ||
}else{ | ||
$this->getCollection()->remove(array( | ||
$this->options['expiry_field'] => array('$lt' => new \MongoDate()), | ||
)); | ||
} | ||
|
||
return true; | ||
} | ||
|
@@ -140,11 +157,20 @@ public function write($sessionId, $data) | |
$this->options['expiry_field'] => $expiry, | ||
); | ||
|
||
$this->getCollection()->update( | ||
array($this->options['id_field'] => $sessionId), | ||
array('$set' => $fields), | ||
array('upsert' => true, 'multiple' => false) | ||
); | ||
if($this->getCollection() instanceof \MongoDB\Collection) | ||
{ | ||
$this->getCollection()->updateOne( | ||
array($this->options['id_field'] => $sessionId), | ||
array('$set' => $fields), | ||
array('upsert' => true, 'multiple' => false) | ||
); | ||
}else{ | ||
$this->getCollection()->update( | ||
array($this->options['id_field'] => $sessionId), | ||
array('$set' => $fields), | ||
array('upsert' => true, 'multiple' => false) | ||
); | ||
} | ||
|
||
return true; | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation should remain at 4 spaces