File: 0001-Remove-duplicate-class-name.patch

package info (click to toggle)
matomo 5.3.1%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 72,652 kB
  • sloc: php: 230,070; javascript: 103,748; python: 196; xml: 188; sh: 156; makefile: 13; sql: 10
file content (34 lines) | stat: -rw-r--r-- 1,102 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 14 May 2024 09:51:58 +0200
Subject: Remove duplicate class name

Unit 'piwik\api\nodefaultvalue' defined in:
 - /mnt/Dev/@debian/@pear-team/matomo/core/API/Proxy.php
 - /mnt/Dev/@debian/@pear-team/matomo/core/API/NoDefaultValue.php

Origin: vendor
Forwarded: not-needed
---
 core/API/Proxy.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/API/Proxy.php b/core/API/Proxy.php
index 26a4dee..b608280 100644
--- a/core/API/Proxy.php
+++ b/core/API/Proxy.php
@@ -20,15 +20,6 @@ use Piwik\Plugin\Manager;
 use ReflectionClass;
 use ReflectionMethod;
 
-// prevent upgrade error eg from Matomo 3.x to Matomo 4.x. Refs https://github.com/matomo-org/matomo/pull/16468
-// the `false` is important otherwise it would fail and try to load the proxy.php file again.
-if (!class_exists('Piwik\API\NoDefaultValue', false)) {
-
-    // phpcs:ignoreFile PSR1.Classes.ClassDeclaration.MultipleClasses
-    class NoDefaultValue
-    {
-    }
-}
 
 /**
  * Proxy is a singleton that has the knowledge of every method available, their parameters