Use LocatorAwareTrait in DatabaseSession.

cakephp · Sep 21, 2017 · a078e01 · a078e01
1 parent 3e74680
commit a078e01
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Network/Session/DatabaseSession.php b/src/Network/Session/DatabaseSession.php
@@ -18,14 +18,15 @@
 namespace Cake\Network\Session;
 
 use Cake\ORM\Entity;
-use Cake\ORM\Locator\TableLocator;
+use Cake\ORM\Locator\LocatorAwareTrait;
 use SessionHandlerInterface;
 
 /**
  * DatabaseSession provides methods to be used with Session.
  */
 class DatabaseSession implements SessionHandlerInterface
 {
+    use LocatorAwareTrait;
 
     /**
      * Reference to the table handling the session data
@@ -50,7 +51,10 @@ class DatabaseSession implements SessionHandlerInterface
      */
     public function __construct(array $config = [])
     {
-        $tableLocator = isset($config['tableLocator']) ? $config['tableLocator'] : TableLocator::getInstance();
+        if (isset($config['tableLocator'])) {
+            $this->setTableLocator($config['tableLocator']);
+        }
+        $tableLocator = $this->getTableLocator();
 
         if (empty($config['model'])) {
             $config = $tableLocator->exists('Sessions') ? [] : ['table' => 'sessions'];