Merge branch '5.x-dev' into fix-url-params-extraction-regex

matomo-org · Jul 2, 2024 · 279cc04 · 279cc04
2 parents fac0dde + a391178
commit 279cc04
Show file tree

Hide file tree

Showing 35 changed files with 1,605 additions and 214 deletions.
diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml
@@ -70,6 +70,7 @@ jobs:
           redis-service: true
           artifacts-pass: ${{ secrets.ARTIFACTS_PASS }}
           upload-artifacts: ${{ matrix.php == '7.2' }}
+          testomatio: ${{ secrets.TESTOMATIO_INTEGRATION }}
   Javascript:
     runs-on: ubuntu-20.04
     timeout-minutes: 15

diff --git a/composer.lock b/composer.lock
diff --git a/core/API/Proxy.php b/core/API/Proxy.php
@@ -10,6 +10,7 @@
 namespace Piwik\API;
 
 use Exception;
+use Piwik\Http\BadRequestException;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
 use Piwik\Context;
@@ -615,7 +616,7 @@ private function loadMethodMetadata($class, $method)
     private function checkMethodExists($className, $methodName)
     {
         if (!$this->isMethodAvailable($className, $methodName)) {
-            throw new Exception(Piwik::translate('General_ExceptionMethodNotFound', array($methodName, $className)));
+            throw new BadRequestException(Piwik::translate('General_ExceptionMethodNotFound', [$methodName, $className]));
         }
     }