Remove model base class

app/Model/Action.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Action Model
  *

app/Model/ActionParameter.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Action Parameter Model
  *

app/Model/AvatarFile.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use Exception;
+use Kanboard\Core\Base;
 
 /**
  * Avatar File

app/Model/Base.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Kanboard\Model;
-
-use PicoDb\Database;
-
-/**
- * Base model class
- *
- * @package  model
- * @author   Frederic Guillot
- */
-abstract class Base extends \Kanboard\Core\Base
-{
-    /**
-     * Save a record in the database
-     *
-     * @access public
-     * @param  string            $table      Table name
-     * @param  array             $values     Form values
-     * @return boolean|integer
-     */
-    public function persist($table, array $values)
-    {
-        return $this->db->transaction(function (Database $db) use ($table, $values) {
-
-            if (! $db->table($table)->save($values)) {
-                return false;
-            }
-
-            return (int) $db->getLastId();
-        });
-    }
-}

app/Model/Board.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Board model
  *

app/Model/Category.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Category model
  *
@@ -148,7 +150,7 @@ class Category extends Base
      */
     public function create(array $values)
     {
-        return $this->persist(self::TABLE, $values);
+        return $this->db->table(self::TABLE)->persist($values);
     }
 
     /**

app/Model/Color.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Color model
  *

app/Model/Column.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Column Model
  *
@@ -140,7 +142,7 @@ class Column extends Base
             'description' => $description,
         );
 
-        return $this->persist(self::TABLE, $values);
+        return $this->db->table(self::TABLE)->persist($values);
     }
 
     /**

app/Model/Comment.php

@@ -4,6 +4,8 @@ namespace Kanboard\Model;
 
 use Kanboard\Event\CommentEvent;
 
+use Kanboard\Core\Base;
+
 /**
  * Comment model
  *
@@ -110,7 +112,7 @@ class Comment extends Base
     public function create(array $values)
     {
         $values['date_creation'] = time();
-        $comment_id = $this->persist(self::TABLE, $values);
+        $comment_id = $this->db->table(self::TABLE)->persist($values);
 
         if ($comment_id) {
             $event = new CommentEvent(array('id' => $comment_id) + $values);

app/Model/Currency.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Currency
  *

app/Model/CustomFilter.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Custom Filter model
  *
@@ -71,7 +73,7 @@ class CustomFilter extends Base
      */
     public function create(array $values)
     {
-        return $this->persist(self::TABLE, $values);
+        return $this->db->table(self::TABLE)->persist($values);
     }
 
     /**

app/Model/File.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use Exception;
+use Kanboard\Core\Base;
 use Kanboard\Core\Thumbnail;
 use Kanboard\Event\FileEvent;
 use Kanboard\Core\ObjectStorage\ObjectStorageException;

app/Model/Group.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Group Model
  *
@@ -97,7 +99,7 @@ class Group extends Base
      */
     public function create($name, $external_id = '')
     {
-        return $this->persist(self::TABLE, array(
+        return $this->db->table(self::TABLE)->persist(array(
             'name' => $name,
             'external_id' => $external_id,
         ));

app/Model/GroupMember.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Group Member Model
  *

app/Model/Language.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Translator;
 
 /**

app/Model/LastLogin.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * LastLogin model
  *

app/Model/Link.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use PDO;
+use Kanboard\Core\Base;
 
 /**
  * Link model

app/Model/Metadata.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Metadata
  *

app/Model/Notification.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Notification
  *

app/Model/NotificationType.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use Pimple\Container;
+use Kanboard\Core\Base;
 
 /**
  * Notification Type

app/Model/PasswordReset.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Password Reset Model
  *

app/Model/Project.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Token;
 use Kanboard\Core\Security\Role;
 

app/Model/ProjectActivity.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use PicoDb\Table;
 
 /**

app/Model/ProjectDailyColumnStats.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Project Daily Column Stats
  *

app/Model/ProjectDailyStats.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Project Daily Stats
  *

app/Model/ProjectDuplication.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Role;
 
 /**

app/Model/ProjectFile.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Project File Model
  *

app/Model/ProjectGroupRole.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Role;
 
 /**

app/Model/ProjectMetadata.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Project Metadata
  *

app/Model/ProjectNotification.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Project Notification
  *

app/Model/ProjectNotificationType.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Project Notification Type
  *

app/Model/ProjectPermission.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Role;
 use Kanboard\Filter\ProjectGroupRoleProjectFilter;
 use Kanboard\Filter\ProjectGroupRoleUsernameFilter;

app/Model/ProjectUserRole.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Role;
 
 /**

app/Model/RememberMeSession.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Token;
 
 /**

app/Model/Setting.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Application Settings
  *

app/Model/Subtask.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use PicoDb\Database;
+use Kanboard\Core\Base;
 use Kanboard\Event\SubtaskEvent;
 
 /**
@@ -215,7 +216,7 @@ class Subtask extends Base
     public function create(array $values)
     {
         $this->prepareCreation($values);
-        $subtask_id = $this->persist(self::TABLE, $values);
+        $subtask_id = $this->db->table(self::TABLE)->persist($values);
 
         if ($subtask_id) {
             $this->container['dispatcher']->dispatch(

app/Model/SubtaskTimeTracking.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use DateTime;
+use Kanboard\Core\Base;
 
 /**
  * Subtask timesheet

app/Model/Swimlane.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Swimlanes
  *
@@ -225,8 +227,9 @@ class Swimlane extends Base
         if (! $this->project->exists($values['project_id'])) {
             return 0;
         }
+
         $values['position'] = $this->getLastPosition($values['project_id']);
-        return $this->persist(self::TABLE, $values);
+        return $this->db->table(self::TABLE)->persist($values);
     }
 
     /**

app/Model/Task.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Task model
  *

app/Model/TaskAnalytic.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Task Analytic
  *

app/Model/TaskCreation.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Event\TaskEvent;
 
 /**
@@ -28,7 +29,7 @@ class TaskCreation extends Base
         $position = empty($values['position']) ? 0 : $values['position'];
 
         $this->prepare($values);
-        $task_id = $this->persist(Task::TABLE, $values);
+        $task_id = $this->db->table(Task::TABLE)->persist($values);
 
         if ($task_id !== false) {
             if ($position > 0 && $values['position'] > 1) {

app/Model/TaskDuplication.php

@@ -4,6 +4,7 @@ namespace Kanboard\Model;
 
 use DateTime;
 use DateInterval;
+use Kanboard\Core\Base;
 use Kanboard\Event\TaskEvent;
 
 /**

app/Model/TaskExternalLink.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Task External Link Model
  *
@@ -69,7 +71,7 @@ class TaskExternalLink extends Base
         $values['date_creation'] = time();
         $values['date_modification'] = $values['date_creation'];
 
-        return $this->persist(self::TABLE, $values);
+        return $this->db->table(self::TABLE)->persist($values);
     }
 
     /**

app/Model/TaskFinder.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use PDO;
+use Kanboard\Core\Base;
 
 /**
  * Task Finder model

app/Model/TaskLink.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Event\TaskLinkEvent;
 
 /**

app/Model/TaskModification.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Event\TaskEvent;
 
 /**

app/Model/TaskPosition.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Event\TaskEvent;
 
 /**

app/Model/TaskStatus.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Event\TaskEvent;
 
 /**

app/Model/Timezone.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Class Timezone
  *

app/Model/Transition.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * Transition
  *

app/Model/User.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Model;
 
 use PicoDb\Database;
+use Kanboard\Core\Base;
 use Kanboard\Core\Security\Token;
 use Kanboard\Core\Security\Role;
 
@@ -269,7 +270,7 @@ class User extends Base
     public function create(array $values)
     {
         $this->prepare($values);
-        return $this->persist(self::TABLE, $values);
+        return $this->db->table(self::TABLE)->persist($values);
     }
 
     /**

app/Model/UserLocking.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * User Locking Model
  *

app/Model/UserMention.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Event\GenericEvent;
 
 /**

app/Model/UserMetadata.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * User Metadata
  *

app/Model/UserNotification.php

@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\Translator;
 
 /**

app/Model/UserNotificationFilter.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * User Notification Filter
  *

app/Model/UserNotificationType.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * User Notification Type
  *

app/Model/UserUnreadNotification.php

@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Base;
+
 /**
  * User Unread Notification
  *

composer.json

@@ -27,7 +27,7 @@
         "eluceo/ical": "0.8.0",
         "erusev/parsedown" : "1.6.0",
         "fguillot/json-rpc" : "1.1.0",
-        "fguillot/picodb" : "1.0.11",
+        "fguillot/picodb" : "1.0.12",
         "fguillot/simpleLogger" : "1.0.1",
         "fguillot/simple-validator" : "1.0.0",
         "fguillot/simple-queue" : "dev-master",

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d9622d90bef6f3316b84a374fc73f1d0",
+    "hash": "1dff423870fc9d85edd75f83ee0b5b97",
-    "content-hash": "593b137facd6a5d8fc4b8f4838b99ddb",
+    "content-hash": "5a7a28b3dcb87b0be20ff634d989d5b4",
     "packages": [
         {
             "name": "christian-riesen/base32",
@@ -239,21 +239,24 @@
         },
         {
             "name": "fguillot/picodb",
-            "version": "v1.0.11",
+            "version": "v1.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fguillot/picoDb.git",
-                "reference": "5f6485c1a930ff22f14bcbf6db8b95d55efe6c52"
+                "reference": "dd088cb75e9035d083f511cdc77b268bc8e110b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fguillot/picoDb/zipball/5f6485c1a930ff22f14bcbf6db8b95d55efe6c52",
+                "url": "https://api.github.com/repos/fguillot/picoDb/zipball/dd088cb75e9035d083f511cdc77b268bc8e110b6",
-                "reference": "5f6485c1a930ff22f14bcbf6db8b95d55efe6c52",
+                "reference": "dd088cb75e9035d083f511cdc77b268bc8e110b6",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": "4.8.*"
+            },
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -267,12 +270,12 @@
             "authors": [
                 {
                     "name": "Frédéric Guillot",
-                    "homepage": "http://fredericguillot.com"
+                    "homepage": "https://github.com/fguillot/"
                 }
             ],
             "description": "Minimalist database query builder",
             "homepage": "https://github.com/fguillot/picoDb",
-            "time": "2016-05-15 01:02:48"
+            "time": "2016-05-28 22:00:54"
         },
         {
             "name": "fguillot/simple-queue",