Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[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
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
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
Next Next commit
[HTTP][Session][Mongo] MongoDB driver support
  • Loading branch information
funyx committed May 15, 2016
commit aab79a267a9e76effc7c19493ca4a8bfb587a68c
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Copy link
Member

@GromNaN GromNaN May 18, 2016

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);
}

/**
* {@inheritdoc}
Expand All @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The 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,
));
}
Copy link
Member

@nicolas-grekas nicolas-grekas May 19, 2016

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 +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;
}
Expand All @@ -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;
}
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.