Merge branch '5.x-dev' into fixintersectingcheck

CHANGELOG.md

@@ -12,7 +12,8 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
 
 ## Deprecations
 
-The methods `Db::isOptimizeInnoDBSupported` and `Db::optimizeTables` have been deprecated. Use `Db\Schema::getInstance()->isOptimizeInnoDBSupported` and `Db\Schema::getInstance()->optimizeTables` instead
+* The methods `Db::isOptimizeInnoDBSupported`, `Db::optimizeTables` have been deprecated. Use `Db\Schema::getInstance()->isOptimizeInnoDBSupported` and `Db\Schema::getInstance()->optimizeTables` instead
+* The method `TransactionLevel::setUncommitted` has been deprecated. Use `TransactionLevel::setTransactionLevelForNonLockingReads` instead
 
 ## Matomo 5.1.0
 

composer.json

@@ -65,6 +65,7 @@
         "symfony/monolog-bridge": "~5.4.0",
         "symfony/polyfill-iconv": "^1.20",
         "symfony/polyfill-mbstring": "^1.20",
+        "symfony/process": "~5.4.0",
         "szymach/c-pchart": "~3.0.13",
         "tecnickcom/tcpdf": "~6.0",
         "tedivm/jshrink": "~v1.4.0",

config/environment/ui-test.php

@@ -19,13 +19,13 @@
     'tests.ui.url_normalizer_blacklist.controller' => [],
 
     // disable check for plugin updates during UI tests, allow for override
-    'dev.disable_plugin_update_checks' => Piwik\DI::decorate(function ($previous, Container $c) {
-        return !$c->get('test.vars.forceEnablePluginUpdateChecks');
+    'dev.forced_plugin_update_result' => Piwik\DI::decorate(function ($previous, Container $c) {
+        return $c->get('test.vars.forceEnablePluginUpdateChecks') ? null : [];
     }),
 
     'twig.cache' => function (\Piwik\Container\Container $container) {
         $templatesPath = $container->get('path.tmp.templates');
-        return new class($templatesPath) extends \Twig\Cache\FilesystemCache {
+        return new class ($templatesPath) extends \Twig\Cache\FilesystemCache {
             public function write(string $key, string $content): void
             {
                 $retryCount = 3;

config/global.php

@@ -110,7 +110,7 @@
 
     'observers.global' => [],
 
-    'dev.disable_plugin_update_checks' => false,
+    'dev.forced_plugin_update_result' => null,
 
     /**
      * By setting this option to false, the check that the DB schema version matches the version of the source code will