4.2.0

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 php:
+  - "7.3"
   - "7.2"
   - "7.1"
   - "7.0"

composer.json

@@ -16,7 +16,7 @@
   "prefer-stable": true,
   "require": {
     "php": ">=5.6.0",
-    "byjg/micro-orm": "4.0.*",
+    "byjg/micro-orm": "4.1.*",
     "byjg/cache-engine": "4.0.*",
     "byjg/jwt-wrapper": "2.0.*"
   },

src/UsersAnyDataset.php

@@ -21,29 +21,23 @@ class UsersAnyDataset extends UsersBase
      */
     protected $anyDataSet;
 
-    /**
-     * Internal Users file name
-     *
-     * @var string
-     */
-    protected $usersFile;
-
     /**
      * AnyDataset constructor
      *
-     * @param string $file
+     * @param AnyDataset $anyDataset
      * @param UserDefinition $userTable
      * @param UserPropertiesDefinition $propertiesTable
+     * @throws \ByJG\AnyDataset\Core\Exception\DatabaseException
      * @throws \ByJG\Serializer\Exception\InvalidArgumentException
      * @throws \ByJG\Util\Exception\XmlUtilException
      */
     public function __construct(
-        $file,
+        AnyDataset $anyDataset,
         UserDefinition $userTable = null,
         UserPropertiesDefinition $propertiesTable = null
     ) {
-        $this->usersFile = $file;
-        $this->anyDataSet = new AnyDataset($this->usersFile);
+        $this->anyDataSet = $anyDataset;
+        $this->anyDataSet->save();
         $this->userTable = $userTable;
         if (!$userTable->existsClosure('update', 'userid')) {
             $userTable->defineClosureForUpdate('userid', function ($value, $instance) {
@@ -90,7 +84,7 @@ public function save(UserModel $model)
             $this->anyDataSet->addField($value->getName(), $value->getValue());
         }
 
-        $this->anyDataSet->save($this->usersFile);
+        $this->anyDataSet->save();
     }
 
     /**
@@ -131,7 +125,7 @@ public function removeByLoginField($login)
         if ($iterator->hasNext()) {
             $oldRow = $iterator->moveNext();
             $this->anyDataSet->removeRow($oldRow);
-            $this->anyDataSet->save($this->usersFile);
+            $this->anyDataSet->save();
             return true;
         }
 

src/UsersDBDataset.php

@@ -3,6 +3,7 @@
 namespace ByJG\Authenticate;
 
 use ByJG\AnyDataset\Core\IteratorFilter;
+use ByJG\AnyDataset\Db\DbDriverInterface;
 use ByJG\AnyDataset\Db\Factory;
 use ByJG\AnyDataset\Db\IteratorFilterSqlFormatter;
 use ByJG\Authenticate\Definition\UserDefinition;
@@ -35,15 +36,16 @@ class UsersDBDataset extends UsersBase
     /**
      * UsersDBDataset constructor
      *
-     * @param string $connectionString
-     * @param UserDefinition $userTable
-     * @param UserPropertiesDefinition $propertiesTable
+     * @param \ByJG\AnyDataset\Db\DbDriverInterface $dbDriver
+     * @param \ByJG\Authenticate\Definition\UserDefinition $userTable
+     * @param \ByJG\Authenticate\Definition\UserPropertiesDefinition $propertiesTable
+     *
      * @throws \ByJG\MicroOrm\Exception\InvalidArgumentException
      * @throws \ByJG\MicroOrm\Exception\OrmModelInvalidException
      * @throws \ByJG\Serializer\Exception\InvalidArgumentException
      */
     public function __construct(
-        $connectionString,
+        DbDriverInterface $dbDriver,
         UserDefinition $userTable = null,
         UserPropertiesDefinition $propertiesTable = null
     ) {
@@ -55,7 +57,6 @@ public function __construct(
             $propertiesTable = new UserPropertiesDefinition();
         }
 
-        $provider = Factory::getDbRelationalInstance($connectionString);
         $userMapper = new Mapper(
             $userTable->model(),
             $userTable->table(),
@@ -72,7 +73,7 @@ public function __construct(
                 $userTable->getClosureForSelect($property)
             );
         }
-        $this->userRepository = new Repository($provider, $userMapper);
+        $this->userRepository = new Repository($dbDriver, $userMapper);
 
         $propertiesMapper = new Mapper(
             UserPropertiesModel::class,
@@ -83,7 +84,7 @@ public function __construct(
         $propertiesMapper->addFieldMap('name', $propertiesTable->getName());
         $propertiesMapper->addFieldMap('value', $propertiesTable->getValue());
         $propertiesMapper->addFieldMap('userid', $propertiesTable->getUserid());
-        $this->propertiesRepository = new Repository($provider, $propertiesMapper);
+        $this->propertiesRepository = new Repository($dbDriver, $propertiesMapper);
 
         $this->userTable = $userTable;
         $this->propertiesTable = $propertiesTable;
@@ -297,6 +298,29 @@ public function removeAllProperties($propertyName, $value = null)
         return true;
     }
 
+    public function getProperty($userId, $propertyName)
+    {
+        $query = Query::getInstance()
+            ->table($this->getUserPropertiesDefinition()->table())
+            ->where("{$this->getUserPropertiesDefinition()->getUserid()} = :id", ['id' =>$userId])
+            ->where("{$this->getUserPropertiesDefinition()->getName()} = :name", ['name' =>$propertyName]);
+
+        $result = [];
+        foreach ($this->propertiesRepository->getByQuery($query) as $model) {
+            $result[] = $model->getValue();
+        }
+
+        if (count($result) === 0) {
+            return null;
+        }
+
+        if (count($result) === 1) {
+            return $result[0];
+        }
+
+        return $result;
+    }
+
     /**
      * Return all property's fields from this user
      *

src/UsersMoodleDataset.php

@@ -7,6 +7,7 @@
  */
 define('AUTH_PASSWORD_NOT_CACHED', 'not cached'); // String used in password field when password is not stored.
 
+use ByJG\AnyDataset\Db\DbDriverInterface;
 use ByJG\Authenticate\Definition\UserDefinition;
 use ByJG\Authenticate\Definition\UserPropertiesDefinition;
 use ByJG\Authenticate\Exception\NotImplementedException;
@@ -25,15 +26,15 @@ class UsersMoodleDataset extends UsersDBDataset
     /**
      * DBDataset constructor
      *
-     * @param string $connectionString
+     * @param DbDriverInterface $dbDriver
      * @param string $siteSalt
      * @throws \ByJG\MicroOrm\Exception\InvalidArgumentException
      * @throws \ByJG\MicroOrm\Exception\OrmModelInvalidException
      * @throws \ByJG\Serializer\Exception\InvalidArgumentException
      */
-    public function __construct($connectionString, $siteSalt = "")
+    public function __construct(DbDriverInterface $dbDriver, $siteSalt = "")
     {
-        parent::__construct($connectionString);
+        parent::__construct($dbDriver);
 
         $this->siteSalt = $siteSalt;
     }

tests/UsersAnyDataset2ByUsernameTest.php

@@ -2,6 +2,7 @@
 
 namespace ByJG\Authenticate;
 
+use ByJG\AnyDataset\Core\AnyDataset;
 use ByJG\Authenticate\Definition\UserDefinition;
 use ByJG\Authenticate\Definition\UserPropertiesDefinition;
 use ByJG\Authenticate\Model\UserModel;
@@ -38,8 +39,9 @@ public function __setUp($loginField)
             'theiruserid'
         );
 
+        $anydataset = new AnyDataset('php://memory');
         $this->object = new UsersAnyDataset(
-            'php://memory',
+            $anydataset,
             $this->userDefinition,
             $this->propertyDefinition
         );

tests/UsersAnyDatasetByUsernameTest.php

@@ -2,6 +2,7 @@
 
 namespace ByJG\Authenticate;
 
+use ByJG\AnyDataset\Core\AnyDataset;
 use ByJG\Authenticate\Definition\UserDefinition;
 use ByJG\Authenticate\Definition\UserPropertiesDefinition;
 use ByJG\Authenticate\Model\UserModel;
@@ -36,8 +37,9 @@ public function __setUp($loginField)
         $this->userDefinition = new UserDefinition('users', UserModel::class, $loginField);
         $this->propertyDefinition = new UserPropertiesDefinition();
 
+        $anydataSet = new AnyDataset('php://memory');
         $this->object = new UsersAnyDataset(
-            'php://memory',
+            $anydataSet,
             $this->userDefinition,
             $this->propertyDefinition
         );
@@ -83,6 +85,10 @@ public function testAddUserError()
 
     public function testAddProperty()
     {
+        // Check state
+        $user = $this->object->getById($this->prefix . '2');
+        $this->assertEmpty($user->get('city'));
+
         // Add one property
         $this->object->addProperty($this->prefix . '2', 'city', 'Rio de Janeiro');
         $user = $this->object->getById($this->prefix . '2');

tests/UsersDBDataset2ByUserNameTest.php

@@ -11,12 +11,14 @@
 
 class UsersDBDataset2ByUserNameTest extends UsersDBDatasetByUsernameTest
 {
+    protected $db;
+
     public function __setUp($loginField)
     {
         $this->prefix = "";
 
-        $db = Factory::getDbRelationalInstance(self::CONNECTION_STRING);
-        $db->execute('create table mytable (
+        $this->db = Factory::getDbRelationalInstance(self::CONNECTION_STRING);
+        $this->db->execute('create table mytable (
             myuserid integer primary key  autoincrement, 
             myname varchar(45), 
             myemail varchar(200), 
@@ -26,7 +28,7 @@ public function __setUp($loginField)
             myadmin char(1));'
         );
 
-        $db->execute('create table theirproperty (
+        $this->db->execute('create table theirproperty (
             theirid integer primary key  autoincrement, 
             theiruserid integer, 
             theirname varchar(45), 
@@ -51,7 +53,7 @@ public function __setUp($loginField)
         $this->propertyDefinition = new UserPropertiesDefinition('theirproperty', 'theirid', 'theirname', 'theirvalue', 'theiruserid');
 
         $this->object = new UsersDBDataset(
-            self::CONNECTION_STRING,
+            $this->db,
             $this->userDefinition,
             $this->propertyDefinition
         );

tests/UsersDBDatasetByUsernameTest.php

@@ -15,12 +15,14 @@ class UsersDBDatasetByUsernameTest extends UsersAnyDatasetByUsernameTest
 
     const CONNECTION_STRING='sqlite:///tmp/teste.db';
 
+    protected $db;
+
     public function __setUp($loginField)
     {
         $this->prefix = "";
 
-        $db = Factory::getDbRelationalInstance(self::CONNECTION_STRING);
-        $db->execute('create table users (
+        $this->db = Factory::getDbRelationalInstance(self::CONNECTION_STRING);
+        $this->db->execute('create table users (
             userid integer primary key  autoincrement, 
             name varchar(45), 
             email varchar(200), 
@@ -30,7 +32,7 @@ public function __setUp($loginField)
             admin char(1));'
         );
 
-        $db->execute('create table users_property (
+        $this->db->execute('create table users_property (
             id integer primary key  autoincrement, 
             userid integer, 
             name varchar(45), 
@@ -40,7 +42,7 @@ public function __setUp($loginField)
         $this->userDefinition = new UserDefinition('users', UserModel::class, $loginField);
         $this->propertyDefinition = new UserPropertiesDefinition();
         $this->object = new UsersDBDataset(
-            self::CONNECTION_STRING,
+            $this->db,
             $this->userDefinition,
             $this->propertyDefinition
         );
@@ -126,7 +128,7 @@ public function testWithUpdateValue()
 
         // Test it!
         $newObject = new UsersDBDataset(
-            self::CONNECTION_STRING,
+            $this->db,
             $this->userDefinition,
             $this->propertyDefinition
         );

tests/UsersDBDatasetDefinitionTest.php

@@ -32,6 +32,8 @@ public function setOtherfield($otherfield)
 
 class UsersDBDatasetDefinitionTest extends UsersDBDatasetByUsernameTest
 {
+    protected $db;
+
     /**
      * @param $loginField
      * @throws \ByJG\AnyDataset\Exception\NotFoundException
@@ -43,8 +45,8 @@ public function __setUp($loginField)
     {
         $this->prefix = "";
 
-        $db = Factory::getDbRelationalInstance(self::CONNECTION_STRING);
-        $db->execute('create table mytable (
+        $this->db = Factory::getDbRelationalInstance(self::CONNECTION_STRING);
+        $this->db->execute('create table mytable (
             myuserid integer primary key  autoincrement, 
             myname varchar(45), 
             myemail varchar(200), 
@@ -55,7 +57,7 @@ public function __setUp($loginField)
             myadmin char(1));'
         );
 
-        $db->execute('create table theirproperty (
+        $this->db->execute('create table theirproperty (
             theirid integer primary key  autoincrement, 
             theiruserid integer, 
             theirname varchar(45), 
@@ -81,7 +83,7 @@ public function __setUp($loginField)
         $this->propertyDefinition = new UserPropertiesDefinition('theirproperty', 'theirid', 'theirname', 'theirvalue', 'theiruserid');
 
         $this->object = new UsersDBDataset(
-            self::CONNECTION_STRING,
+            $this->db,
             $this->userDefinition,
             $this->propertyDefinition
         );
@@ -180,7 +182,7 @@ public function testWithUpdateValue()
 
         // Test it!
         $newObject = new UsersDBDataset(
-            self::CONNECTION_STRING,
+            $this->db,
             $this->userDefinition,
             $this->propertyDefinition
         );