10000 [HttpFoundation] MongoDB driver support for sessions by funyx · Pull Request #18788 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[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.

Sign up for GitHub

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
wants to merge 4 commits into from
Closed

[HttpFoundation] MongoDB driver support for sessions #18788

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aab79a2
[HTTP][Session][Mongo] MongoDB driver support
funyx May 15, 2016
96c5eff
[HTTP][Session][Mongo] MongoDB driver support
funyx May 15, 2016
211a60e
[HTTP][Session][Mongo] MongoDB driver support
funyx May 15, 2016
aa4257d
patch : php-cs-fixer --level=symfony
funyx May 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 40 additions & 17 deletions src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,11 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
*/
public function __construct($mongo, array $options)
{
if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
throw new \InvalidArgumentException('MongoClient or Mongo instance required');
if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo || $mongo instanceof \MongoDB\Client)) {
throw new \InvalidArgumentException('MongoClient, Mongo or MongoDB instance required');
}
if ($mongo instanceof \MongoDB\Client && !class_exists('\MongoDB\Collection')) {
throw new \InvalidArgumentException('\MongoDB\Collection instance not loaded');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this really happen? it's possible that a \MongoDB\Client is instanciated, but \MongoDB\Collection isn't loadable?

}

if (!isset($options['database']) || !isset($options['collection'])) {
Expand All @@ -80,10 +83,10 @@ public function __construct($mongo, array $options)
$this->mongo = $mongo;

$this->options = array_merge(array(
'id_field' => '_id',
'data_field' => 'data',
'time_field' => 'time',
'expiry_field' => 'expires_at',
'id_field' => '_id',
Copy link
Member
@GromNaN GromNaN May 18, 2016 •
edited
Loading

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

'data_field' => 'data',
'time_field' => 'time',
'expiry_field' => 'expires_at',
), $options);
}

Expand All @@ -108,9 +111,15 @@ public function close()
*/
public function destroy($sessionId)
{
$this->getCollection()->remove(array(
$this->options['id_field'] => $sessionId,
));
if ($this->getCollection() instanceof \MongoDB\Collection) {
$this->getCollection()->deleteOne(array(
$this->options['id_field'] => $sessionId,
));
} else {
$this->getCollection()->remove(array(
$this->options['id_field'] => $sessionId,
));
}

Copy link
Member
@nicolas-grekas nicolas-grekas May 19, 2016 •
edited
Loading

Choose a reason for hiding this comment

The 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;
}
Expand All @@ -120,9 +129,15 @@ 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['expiry_field'] => array('$lt' => new \MongoDate()),
));
} else {
$this->getCollection()->remove(array(
$this->options['expiry_field'] => array('$lt' => new \MongoDate()),
));
}

return true;
}
Expand All @@ -140,11 +155,19 @@ 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;
}
Expand Down
0