Merge branch 'develop'

CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.0.1] - 2018-04-09
+### Fixed
+- GITHUB-239: Fix unsafe mode logic
+- GITHUB-240: Make sure unconfigured 'passbolt.plugins' doesn't break the extension
+- PASSBOLT-2511: Improve healthcheck tables list so that tables are listed per major version number
+
 ## [2.0.0] - 2018-04-09
 ### Added
 - PASSBOLT-2725: Implement start page when passbolt is not configured

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'passbolt' => [
-        'version' => '2.0.0',
+        'version' => '2.0.1',
         'name' => 'Insomnia'
     ]
 ];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "passbolt_api",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "The backend application for the open source password manager for teams",
   "repository": {
     "url": "https://github.com/passbolt/passbolt_api"

src/Utility/Healthchecks.php

@@ -533,30 +533,40 @@ private static function _checkRecursiveDirectoryWritable($path)
     }
 
     /**
-     * Get schema tables list. (as in v2).
-     * @return array
+     * Get schema tables list. (per version number).
+     * @param int $version passbolt major version number.
+     * @return array list of tables.
      */
-    public static function getSchemaTables()
+    public static function getSchemaTables($version = 2)
     {
-        return [
+        // List of tables for passbolt v1.
+        $tables = [
             'authentication_tokens',
-            'burzum_file_storage_phinxlog',
             'comments',
             'email_queue',
-            'email_queue_phinxlog',
             'favorites',
             'file_storage',
             'gpgkeys',
             'groups',
             'groups_users',
             'permissions',
-            'phinxlog',
             'profiles',
             'resources',
             'roles',
             'secrets',
             'user_agents',
             'users',
         ];
+
+        // Extra tables for passbolt v2.
+        if ($version == 2) {
+            $tables = array_merge($tables, [
+                'burzum_file_storage_phinxlog',
+                'email_queue_phinxlog',
+                'phinxlog',
+            ]);
+        }
+
+        return $tables;
     }
 }