From 2e22f9e75afcd264162275c24411513232eea087 Mon Sep 17 00:00:00 2001
From: Eric - CAP-REL <1468823+rycks@users.noreply.github.com>
Date: Sat, 27 Dec 2025 23:04:40 +0100
Subject: [PATCH 1/2] fix concat for a undef entry of array (#36754)
---
htdocs/core/class/timespent.class.php | 2 +-
htdocs/modulebuilder/template/class/myobject.class.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 256077fa40f..711aa8e25e9 100755
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -725,7 +725,7 @@ class TimeSpent extends CommonObject
if (isset($this->status)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);
}
- $datas['ref'] .= '
'.$langs->trans('Ref').': '.$this->ref;
+ $datas['ref'] = '
'.$langs->trans('Ref').': '.$this->ref;
return $datas;
}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index b4f41e00b2f..52587f1b7d9 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -774,7 +774,7 @@ class MyObject extends CommonObject
if (isset($this->status)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);
}
- $datas['ref'] .= '
'.$langs->trans('Ref').': '.$this->ref;
+ $datas['ref'] = '
'.$langs->trans('Ref').': '.$this->ref;
return $datas;
}
From 05c11e71e2471e6ac16a4455e4cf1e5ddfba7c8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Wed, 7 Jan 2026 18:33:22 +0100
Subject: [PATCH 2/2] Fix CI
---
.pre-commit-config.yaml | 2 +-
.scrutinizer.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 82eb45c1d0b..74510a21197 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -82,7 +82,7 @@ repos:
pass_filenames: false # Run on all files
- id: php-lint
exclude:
- (?x)^(htdocs/includes/symfony/var-dumper/Tests/.*)$
+ (?x)^(htdocs/includes/symfony/var-dumper/Tests/.*)$
- id: php-stan
stages: [manual]
files: \.(php)$
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 058a0ba8b48..6a04407eadb 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -128,7 +128,7 @@ tools:
enabled: true
# Disabled unused code. In most cases, we want to keep it.
unused_code:
- enabled: false
+ enabled: false
deprecation_checks:
enabled: true
useless_function_calls: