Merge branch 'develop' into main

app/composer.json

@@ -6,10 +6,10 @@
     "license": "MIT",
     "require": {
         "php": ">=7.3",
-        "cakephp/cakephp": "^4.3",
+        "cakephp/cakephp": "^4.4",
         "cakephp/migrations": "^3.2",
         "cakephp/plugin-installer": "^1.3",
-        "components/jquery": "~3.6.0",
+        "components/jquery": "~3.7",
         "doctrine/dbal": "^3.3",
         "mobiledetect/mobiledetectlib": "^2.8",
         "twbs/bootstrap": "^5.1"
@@ -76,6 +76,10 @@
     },
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "cakephp/plugin-installer": true
+        }
     }
 }

app/config/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

app/config/app.php

@@ -207,7 +207,7 @@
      */
     'Error' => [
         'errorLevel' => E_ALL,
-        'exceptionRenderer' => ExceptionRenderer::class,
+        //'exceptionRenderer' => ExceptionRenderer::class,
         'skipLog' => [],
         'log' => true,
         'trace' => true,

app/config/bootstrap.php

@@ -37,8 +37,8 @@
 use Cake\Database\TypeFactory;
 use Cake\Database\Type\StringType;
 use Cake\Datasource\ConnectionManager;
-use Cake\Error\ConsoleErrorHandler;
-use Cake\Error\ErrorHandler;
+use Cake\Error\ErrorTrap;
+use Cake\Error\ExceptionTrap;
 use Cake\Http\ServerRequest;
 use Cake\Log\Log;
 use Cake\Mailer\Mailer;
@@ -128,11 +128,8 @@
  * Register application error and exception handlers.
  */
 $isCli = PHP_SAPI === 'cli';
-if ($isCli) {
-    (new ConsoleErrorHandler(Configure::read('Error')))->register();
-} else {
-    (new ErrorHandler(Configure::read('Error')))->register();
-}
+(new ErrorTrap(Configure::read('Error')))->register();
+(new ExceptionTrap(Configure::read('Error')))->register();
 
 /*
  * Include the CLI bootstrap overrides.

app/config/schema/schema.json

@@ -162,7 +162,6 @@
         "index_display": { "type": "boolean" },
         "alphanumeric": { "type": "boolean" },
         "case_sensitive": { "type": "boolean" },
-        "invalidates": { "type": "boolean" },
         "null_equivalents": { "type": "boolean" },
         "search_distance": { "type": "integer" },
         "search_exact": { "type": "boolean" },
@@ -230,6 +229,7 @@
         "id": {},
         "matchgrid_id": {},
         "label": { "type": "string", "size": 64 },
+        "trust_mode": { "type": "string", "size": 2 },
         "resolution_mode": { "type": "string", "size": 2 },
         "notification_email": { "type": "string", "size": 80 }
       },

app/resources/locales/en_US/default.po

@@ -53,6 +53,9 @@ msgid "match.banner.api_users.platform"
 msgstr "This page is for configuring Platform API Users, which have full read/write access to the entire platform. To create API Users restricted to a given Matchgrid, go to the management page for the desired Matchgrid and select <i>API Users</i> from there.<hr />The Match API is available at {0}"
 
 ### Command Line text
+msgid "match.cmd.arg.version"
+msgstr "Version to upgrade to (default: current RELEASE)"
+
 msgid "match.cmd.bl.index.off"
 msgstr "Dropping matchgrid indexes..."
 
@@ -83,12 +86,21 @@ msgstr "Username of initial platform administrator"
 msgid "match.cmd.opt.force"
 msgstr "Force a rerun of setup (only if you know what you are doing)"
 
+msgid "match.cmd.opt.forcecurrent"
+msgstr "Force the specified current version -- ADVANCED USERS ONLY"
+
 msgid "match.cmd.opt.not"
 msgstr "Calculate changes but do not apply"
 
 msgid "match.cmd.opt.skip-match"
 msgstr "Do not run Match Rules while processing records"
 
+msgid "match.cmd.opt.skipdatabase"
+msgstr "Skip database schema update -- ADVANCED USERS ONLY"
+
+msgid "match.cmd.opt.skipvalidation"
+msgstr "Skip version validation -- ADVANCED USERS ONLY"
+
 msgid "match.cmd.se.admin"
 msgstr "- Creating initial administrator permission"
 
@@ -101,6 +113,24 @@ msgstr "Setup appears to have already run"
 msgid "match.cmd.se.salt"
 msgstr "- Generating salt file"
 
+msgid "match.cmd.ug.current"
+msgstr "Current version: {0}"
+
+msgid "match.cmd.ug.ok"
+msgstr "Upgrade completed successfully"
+
+msgid "match.cmd.ug.post"
+msgstr "Executing post-database step ({0})"
+
+msgid "match.cmd.ug.pre"
+msgstr "Executing pre-database step ({0})"
+
+msgid "match.cmd.ug.target"
+msgstr "Target version: {0}"
+
+msgid "match.cmd.ug.120.trust_mode"
+msgstr "- Populating default values for trust_mode"
+
 ### Controllers (Models)
 msgid "match.ct.ApiUsers"
 msgstr "{0,plural,=1{API User} other{API Users}}"
@@ -230,6 +260,9 @@ msgstr "Exact"
 msgid "match.en.SearchTypeEnum.M"
 msgstr "Mapping"
 
+msgid "match.en.SearchTypeEnum.IN"
+msgstr "Invalidate"
+
 msgid "match.en.SearchTypeEnum.X"
 msgstr "Skip"
 
@@ -245,6 +278,15 @@ msgstr "Suspended"
 msgid "match.en.StatusEnum.S.badge"
 msgstr "Danger"
 
+msgid "match.en.TrustModeEnum.P"
+msgstr "Potential"
+
+msgid "match.en.TrustModeEnum.S"
+msgstr "Standard"
+
+msgid "match.en.TrustModeEnum.T"
+msgstr "Trust"
+
 ### Error Messages
 msgid "match.er.args"
 msgstr "Incorrect arguments provided to {0}"
@@ -258,6 +300,21 @@ msgstr "Error at line {0}: {1}"
 msgid "match.er.build"
 msgstr "Error applying matchgrid schema: {0}"
 
+msgid "match.er.cmd.ug.blocked"
+msgstr "Cannot automatically upgrade past version {0}. Please upgrade to that version first."
+
+msgid "match.er.cmd.ug.fail"
+msgstr "ERROR: Upgrade failed"
+
+msgid "match.er.cmd.ug.order"
+msgstr "Target version is before current version (cannot downgrade)"
+
+msgid "match.er.cmd.ug.same"
+msgstr "Current and target versions are the same"
+
+msgid "match.er.cmd.ug.version"
+msgstr "Unknown version \"{0}\""
+
 msgid "match.er.db.connect"
 msgstr "Failed to connect to database: {0}"
 
@@ -438,9 +495,6 @@ msgstr "ID"
 msgid "match.fd.index_display"
 msgstr "Display Field in Matchgrid Index"
 
-msgid "match.fd.invalidates"
-msgstr "Invalidates"
-
 msgid "match.fd.label"
 msgstr "Label"
 
@@ -561,6 +615,9 @@ msgstr "Table Name"
 msgid "match.fd.table_name.desc"
 msgstr "Unique name for matchgrid, must be a valid SQL identifier (will be prefixed mg_ for actual table name)"
 
+msgid "match.fd.trust_mode"
+msgstr "Trust Mode"
+
 msgid "match.fd.url"
 msgstr "URL"
 
@@ -813,3 +870,6 @@ msgstr "Matchgrid: {0}"
 
 msgid "match.ti.properties"
 msgstr "Properties"
+
+msgid "match.ti.user"
+msgstr "User"