From ebc9fa684a8002cb955635ad9f7dcf918235dbf5 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 28 Jan 2022 12:14:24 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B03129=20PHP=208.0=20compat:=20Fix=20"Priv?=
 =?UTF-8?q?ate=20methods=20cannot=20be=20final=20as=20they=20are=20never?=
 =?UTF-8?q?=20overridden=20by=20other=20classes"=20Was=20breaking=20setup?=
 =?UTF-8?q?=20ajax=20compilation=20Fixed=20in:=20*=20\SetupUtils::Log=20*?=
 =?UTF-8?q?=20\MetaModel::SetUniquenessRuleRootClass?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/metamodel.class.php       | 4 ++--
 setup/setuputils.class.inc.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 6ae300748..a1b7ed3cb 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -589,10 +589,10 @@ abstract class MetaModel
 	 * @param string $sRuleId
 	 *
 	 * @throws \CoreException
-	 * @since 2.6.1 N°1918 (sous les pavés, la plage) initialize in 'root_class' property the class that has the first
+	 * @since 2.6.1 N°1968 (sous les pavés, la plage) initialize in 'root_class' property the class that has the first
 	 *         definition of the rule in the hierarchy
 	 */
-	final private static function SetUniquenessRuleRootClass($sRootClass, $sRuleId)
+	private static function SetUniquenessRuleRootClass($sRootClass, $sRuleId)
 	{
 		foreach (self::EnumChildClasses($sRootClass, ENUM_CHILD_CLASSES_ALL) as $sClass)
 		{
diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index f02a16239..7d82ecb05 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -2067,7 +2067,7 @@ JS
 		unset($_SESSION['setup_token']);
 	}
 
-	private final static function Log($sText)
+	private static function Log($sText)
 	{
 		if (class_exists('SetupPage'))
 		{