From 26dad2337909f1309f1e28679f55e819c19ae2f0 Mon Sep 17 00:00:00 2001
From: Gregory Toccanier <115637044+GregoryBT@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:28:33 +0100
Subject: [PATCH 1/3] Update workstation_agenda.php
---
htdocs/workstation/workstation_agenda.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index fc926f3d73c..93ad07818bb 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -150,7 +150,7 @@ if ($object->id > 0) {
// Object card
// ------------------------------------------------------------
- $linkback = ''.$langs->trans("BackToList").'';
+ $linkback = ''.$langs->trans("BackToList").'';
$morehtmlref = '
';
/*
@@ -241,7 +241,7 @@ if ($object->id > 0) {
print '
';
if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
- $param = '&id='.$object->id.'&socid='.$socid;
+ $param = '&id='.$object->id;
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
From 55b5298d5b93fd99986b0aa5326b33be993510f9 Mon Sep 17 00:00:00 2001
From: "Ilhan K." <68482895+ilhan69@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:35:41 +0100
Subject: [PATCH 2/3] Fix: don stats: SQL query was not formatted correctly due
to double quotes
---
htdocs/don/class/donstats.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index e56ebedaf94..4addb12c637 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -111,7 +111,7 @@ class DonationStats extends Stats
}
if ($typentid) {
- $this->join .= " LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = d.fk_soc";
+ $this->join .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = d.fk_soc";
$this->where .= " AND s.fk_typent = ".((int) $typentid);
}
}
From 60e718eba6ea4d998e90c3e48409e0122549c1cc Mon Sep 17 00:00:00 2001
From: Dolibot
Date: Thu, 13 Feb 2025 12:06:47 +0000
Subject: [PATCH 3/3] PHPStan > Update baseline
---
dev/build/phpstan/phpstan-baseline.neon | 128 +-----------------------
1 file changed, 1 insertion(+), 127 deletions(-)
diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index c092f13c4fd..9767b0f118a 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -5562,12 +5562,6 @@ parameters:
count: 2
path: ../../../htdocs/compta/facture/class/facture.class.php
- -
- message: '#^Parameter \#4 \$txtva of method Facture\:\:addline\(\) expects float, string given\.$#'
- identifier: argument.type
- count: 1
- path: ../../../htdocs/compta/facture/class/facture.class.php
-
-
message: '#^Property CommonInvoice\:\:\$close_code \(string\) in isset\(\) is not nullable\.$#'
identifier: isset.property
@@ -23856,18 +23850,6 @@ parameters:
count: 1
path: ../../../htdocs/projet/note.php
- -
- message: '#^Variable \$px2 might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/projet/stats/index.php
-
- -
- message: '#^Variable \$px3 might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/projet/stats/index.php
-
-
message: '#^Call to function method_exists\(\) with Project and ''fetchComments'' will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@@ -23904,12 +23886,6 @@ parameters:
count: 1
path: ../../../htdocs/projet/tasks.php
- -
- message: '#^Variable \$userWrite might not be defined\.$#'
- identifier: variable.undefined
- count: 2
- path: ../../../htdocs/projet/tasks.php
-
-
message: '#^Call to function method_exists\(\) with Project and ''fetchComments'' will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@@ -24198,12 +24174,6 @@ parameters:
count: 1
path: ../../../htdocs/projet/tasks/time.php
- -
- message: '#^Variable \$allprojectforuser might not be defined\.$#'
- identifier: variable.undefined
- count: 2
- path: ../../../htdocs/projet/tasks/time.php
-
-
message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
identifier: empty.variable
@@ -24216,12 +24186,6 @@ parameters:
count: 1
path: ../../../htdocs/projet/tasks/time.php
- -
- message: '#^Variable \$valtoshow might not be defined\.$#'
- identifier: variable.undefined
- count: 2
- path: ../../../htdocs/projet/tasks/time.php
-
-
message: '#^Unable to resolve the template type T in call to function dol_sort_array$#'
identifier: argument.templateType
@@ -24459,7 +24423,7 @@ parameters:
-
message: '#^Left side of && is always true\.$#'
identifier: booleanAnd.leftAlwaysTrue
- count: 2
+ count: 1
path: ../../../htdocs/public/onlinesign/newonlinesign.php
-
@@ -24492,12 +24456,6 @@ parameters:
count: 2
path: ../../../htdocs/public/onlinesign/newonlinesign.php
- -
- message: '#^Variable \$source in empty\(\) always exists and is not falsy\.$#'
- identifier: empty.variable
- count: 2
- path: ../../../htdocs/public/onlinesign/newonlinesign.php
-
-
message: '#^Left side of && is always true\.$#'
identifier: booleanAnd.leftAlwaysTrue
@@ -24510,12 +24468,6 @@ parameters:
count: 1
path: ../../../htdocs/public/opensurvey/index.php
- -
- message: '#^Variable \$modifier might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/opensurvey/studs.php
-
-
message: '#^Call to function is_numeric\(\) with int will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@@ -24540,12 +24492,6 @@ parameters:
count: 1
path: ../../../htdocs/public/payment/newpayment.php
- -
- message: '#^Parameter \#1 \$paymentAmount of function print_paypal_redirect expects float, string given\.$#'
- identifier: argument.type
- count: 1
- path: ../../../htdocs/public/payment/newpayment.php
-
-
message: '#^Variable \$attendee might not be defined\.$#'
identifier: variable.undefined
@@ -24606,12 +24552,6 @@ parameters:
count: 1
path: ../../../htdocs/public/payment/paymentko.php
- -
- message: '#^Variable \$FinalPaymentAmt might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/payment/paymentko.php
-
-
message: '#^Variable \$user might not be defined\.$#'
identifier: variable.undefined
@@ -24642,24 +24582,6 @@ parameters:
count: 1
path: ../../../htdocs/public/payment/paymentok.php
- -
- message: '#^Variable \$autocreatethirdparty might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/payment/paymentok.php
-
- -
- message: '#^Variable \$crowid might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/payment/paymentok.php
-
- -
- message: '#^Variable \$paymentTypeId might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/payment/paymentok.php
-
-
message: '#^Variable \$service might not be defined\.$#'
identifier: variable.undefined
@@ -24858,12 +24780,6 @@ parameters:
count: 1
path: ../../../htdocs/public/project/viewandvote.php
- -
- message: '#^Variable \$votestatus might not be defined\.$#'
- identifier: variable.undefined
- count: 3
- path: ../../../htdocs/public/project/viewandvote.php
-
-
message: '#^Left side of && is always true\.$#'
identifier: booleanAnd.leftAlwaysTrue
@@ -24954,12 +24870,6 @@ parameters:
count: 2
path: ../../../htdocs/public/stripe/ipn.php
- -
- message: '#^Variable \$directdebitorcreditransfer_id might not be defined\.$#'
- identifier: variable.undefined
- count: 2
- path: ../../../htdocs/public/stripe/ipn.php
-
-
message: '#^Variable \$error in empty\(\) always exists and is always falsy\.$#'
identifier: empty.variable
@@ -24972,12 +24882,6 @@ parameters:
count: 1
path: ../../../htdocs/public/stripe/ipn.php
- -
- message: '#^Variable \$pdid might not be defined\.$#'
- identifier: variable.undefined
- count: 2
- path: ../../../htdocs/public/stripe/ipn.php
-
-
message: '#^Ternary operator condition is always true\.$#'
identifier: ternary.alwaysTrue
@@ -25074,24 +24978,6 @@ parameters:
count: 2
path: ../../../htdocs/public/ticket/create_ticket.php
- -
- message: '#^Parameter \#1 \$filenb of function dol_remove_file_process expects int, array\\|string given\.$#'
- identifier: argument.type
- count: 1
- path: ../../../htdocs/public/ticket/create_ticket.php
-
- -
- message: '#^Variable \$cid might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/ticket/create_ticket.php
-
- -
- message: '#^Variable \$old_MAIN_MAIL_AUTOCOPY_TO might not be defined\.$#'
- identifier: variable.undefined
- count: 2
- path: ../../../htdocs/public/ticket/create_ticket.php
-
-
message: '#^Variable \$user might not be defined\.$#'
identifier: variable.undefined
@@ -25140,12 +25026,6 @@ parameters:
count: 2
path: ../../../htdocs/public/ticket/view.php
- -
- message: '#^Variable \$display_ticket might not be defined\.$#'
- identifier: variable.undefined
- count: 1
- path: ../../../htdocs/public/ticket/view.php
-
-
message: '#^Variable \$user might not be defined\.$#'
identifier: variable.undefined
@@ -26676,12 +26556,6 @@ parameters:
count: 1
path: ../../../htdocs/societe/ajax/company.php
- -
- message: '#^Variable \$db might not be defined\.$#'
- identifier: variable.undefined
- count: 3
- path: ../../../htdocs/societe/canvas/company/tpl/card_view.tpl.php
-
-
message: '#^Variable \$formfile might not be defined\.$#'
identifier: variable.undefined