[HttpFoundation] MongoDB driver support for sessions #18788
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 |
|---|---|---|
|
|
@@ -69,21 +69,24 @@ class MongoDbSessionHandler implements \SessionHandlerInterface | |
| */ | ||
| 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')){ | ||
|
There was a problem hiding this comment. Please, put this check in a separated |
||
| 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; | ||
|
|
||
| $this->options = array_merge(array( | ||
| 'id_field' => '_id', | ||
|
There was a problem hiding this comment. Indentation should remain at 4 spaces |
||
| 'data_field' => 'data', | ||
| 'time_field' => 'time', | ||
| 'expiry_field' => 'expires_at', | ||
| ), $options); | ||
| } | ||
|
|
||
|
|
@@ -108,9 +111,16 @@ public function close() | |
| */ | ||
| public function destroy($sessionId) | ||
| { | ||
| if($this->getCollection() instanceof \MongoDB\Collection) | ||
|
There was a problem hiding this comment. 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. 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) | ||
| { | ||
| if($this->getCollection() instanceof \MongoDB\Collection) | ||
| { | ||
| $this->getCollection()->deleteMany(array( | ||
| $this->options['expiry_field'] => array('$lt' => new \MongoDate()), | ||
| )); | ||
| }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, | ||
| ); | ||
|
|
||
| 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.
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.
elseifseems weird after throw an exception which is uncaught.