diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 43e29dfb535..b4b5ee09fc6 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -196,28 +196,18 @@ print '
'.$langs->trans("Parameter").' | ';
print ''.$langs->trans("Value").' | ';
print "\n";
+
print '| ';
print $langs->trans("NotificationEMailFrom").' | ';
print '';
print img_picto('', 'email', 'class="pictofixedwidth"');
print '';
-if (getDolGlobalString('NOTIFICATION_EMAIL_FROM') && !isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) {
+if (getDolGlobalString('NOTIFICATION_EMAIL_FROM') && !isValidEmail(getDolGlobalString('NOTIFICATION_EMAIL_FROM'))) {
print ' '.img_warning($langs->trans("ErrorBadEMail"));
}
print ' | ';
print '
';
-print '| ';
-print $langs->trans("NotificationDisableConfirmMessageContact").' | ';
-print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT'));
-}
-print ' | ';
-print '
';
print '| ';
print $langs->trans("NotificationDisableConfirmMessageUser").' | ';
@@ -231,6 +221,20 @@ if ($conf->use_javascript_ajax) {
print '';
print '
';
+
+print '| ';
+print $langs->trans("NotificationDisableConfirmMessageContact").' | ';
+print '';
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT');
+} else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT'));
+}
+print ' | ';
+print '
';
+
+
print '| ';
print $langs->trans("NotificationDisableConfirmMessageFix").' | ';
print '';
@@ -242,6 +246,8 @@ if ($conf->use_javascript_ajax) {
}
print ' | ';
print '
';
+
+
print '';
print '';
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 0e7fe595caf..1436eabd4b6 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2016 Laurent Destailleur
* Copyright (C) 2020 Frédéric France
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -134,16 +135,41 @@ class DolibarrApi
*/
protected function _filterObjectProperties($object, $properties)
{
+ // phpcs:enable
// If properties is empty, we return all properties
if (empty($properties)) {
return $object;
}
- // Else we filter properties
+
+ // Copy of exploded array for efficiency
+ $arr_properties = explode(',', $properties);
+ $magic_properties = array();
+ $real_properties = get_object_vars($object);
+
+ // Unsetting real properties may unset magic properties.
+ // We keep a copy of the requested magic properties
+ foreach ($arr_properties as $key) {
+ if (!array_key_exists($key, $real_properties)) {
+ // Not a real property,
+ // check if $key is a magic property (we want to keep '$obj->$key')
+ if (property_exists($object, $key) && isset($object->$key)) {
+ $magic_properties[$key] = $object->$key;
+ }
+ }
+ }
+
+ // Filter real properties (may indirectly unset magic properties)
foreach (get_object_vars($object) as $key => $value) {
- if (!in_array($key, explode(',', $properties))) {
+ if (!in_array($key, $arr_properties)) {
unset($object->$key);
}
}
+
+ // Restore the magic properties
+ foreach ($magic_properties as $key => $value) {
+ $object->$key = $value;
+ }
+
return $object;
}
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 2c1a0d2ab99..5ef2652268c 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -144,7 +144,7 @@ if (empty($reshook)) {
$form = new Form($db);
-$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = $langs->trans("ContactEvents");
if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
$title = $object->lastname;
}
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 16087378bf2..1e0e14dbbc4 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -574,7 +574,6 @@ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', get
$title = $object->lastname;
}
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("NewContact") : $langs->trans("NewContactAddress"));
llxHeader('', $title, $help_url);
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 66067b00e6e..158229e620a 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -111,7 +111,7 @@ $formother = new FormOther($db);
$productstatic = new Product($db);
$objsoc = new Societe($db);
-$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = $langs->trans("ContactRelatedItems");
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index c4b216d2679..efc55ac0e5b 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -110,7 +110,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = $langs->trans("ContactLinkedFiles");
if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
$title = $object->lastname;
}
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 1f7a328e614..1f956e94821 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -78,7 +78,7 @@ if (empty($reshook)) {
$now = dol_now();
-$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = $langs->trans("ContactNotes");
$form = new Form($db);
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index c5ab1faf862..0661a80b685 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -120,7 +120,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('societe', 'con
$now = dol_now();
-$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = $langs->trans("ContactPersonalData");
if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
$title = $object->lastname;
}
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index e498e287323..c4b0a371726 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -646,7 +646,7 @@ class Notify
if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$application = getDolGlobalString('MAIN_APPLICATION_TITLE');
}
- $replyto = $conf->notification->email_from;
+ $from = getDolGlobalString('NOTIFICATION_EMAIL_FROM');
$object_type = '';
$link = '';
$num = 0;
@@ -945,7 +945,7 @@ class Notify
$sendto = preg_replace('/[\s,]+$/', '', $sendto); // Clean end of string
}
- $parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'replyto' => $replyto, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'outputlangs' => $outputlangs, 'labeltouse' => $labeltouse);
+ $parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'from' => $from, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'outputlangs' => $outputlangs, 'labeltouse' => $labeltouse);
if (!isset($action)) {
$action = '';
}
@@ -968,7 +968,7 @@ class Notify
$mailfile = new CMailFile(
$subject,
$sendto,
- $replyto,
+ $from,
$message,
$filename_list,
$mimetype_list,
@@ -1211,7 +1211,7 @@ class Notify
}
if ($sendto) {
- $parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'replyto' => $replyto, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'subject' => &$subject, 'message' => &$message);
+ $parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'from' => $from, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'subject' => &$subject, 'message' => &$message);
$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook)) {
if (!empty($hookmanager->resArray['files'])) {
@@ -1229,7 +1229,7 @@ class Notify
$mailfile = new CMailFile(
$subject,
$sendto,
- $replyto,
+ $from,
$message,
$filename_list,
$mimetype_list,
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3d38aef2dfd..1c5a6bde9b2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1367,6 +1367,41 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
return $res;
}
+/**
+ * Get properties for an object - including magic properties when requested
+ *
+ * Only returns properties that exist
+ *
+ * @param object $obj Object to get properties from
+ * @param string[] $properties Optional list of properties to get.
+ * When empty, only gets public properties.
+ * @return array Hash for retrieved values (key=name)
+ */
+function dol_get_object_properties($obj, $properties = [])
+{
+ // Get real properties using get_object_vars() if $properties is empty
+ if (empty($properties)) {
+ return get_object_vars($obj);
+ }
+
+ $existingProperties = [];
+ $realProperties = get_object_vars($obj);
+
+ // Get the real or magic property values
+ foreach ($properties as $property) {
+ if (array_key_exists($property, $realProperties)) {
+ // Real property, add the value
+ $existingProperties[$property] = $obj->{$property};
+ } elseif (property_exists($obj, $property)) {
+ // Magic property
+ $existingProperties[$property] = $obj->{$property};
+ }
+ }
+
+ return $existingProperties;
+}
+
+
/**
* Create a clone of instance of object (new instance with same value for each properties)
* With native = 0: Property that are reference are different memory area in the new object (full isolation clone). This means $this->db of new object may not be valid.
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index b5984798e2e..2b26b7fdda9 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -273,6 +273,11 @@ EditContact=Edit contact
EditContactAddress=Edit contact/address
Contact=Contact/Address
Contacts=Contacts/Addresses
+ContactNotes=Notes
+ContactPersonalData=Personal data
+ContactRelatedItems=Related items
+ContactLinkedFiles=Linked files
+ContactEvents=Events/Agenda
ContactId=Contact id
ContactsAddresses=Contacts/Addresses
FromContactName=Name:
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 3db8ce4573e..3ac72c60364 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -462,6 +462,12 @@ class Tasks extends DolibarrApi
$this->task->context['caller'] = sanitizeVal($request_data['caller'], 'aZ09');
continue;
}
+ if ($field == 'array_options' && is_array($value)) {
+ foreach ($value as $index => $val) {
+ $this->task->array_options[$index] = $this->_checkValForAPI($field, $val, $this->task);;
+ }
+ continue;
+ }
$this->task->$field = $this->_checkValForAPI($field, $value, $this->task);
}
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 0db9b170871..ee5db8c46d4 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -235,6 +235,69 @@ abstract class CommonClassTest extends TestCase
}
}
+
+ /**
+ * Call method, even if protected.
+ *
+ * @param object $obj Object on which to call method
+ * @param string $name Method to call
+ * @param array $args Arguments to provide in method call
+ * @return mixed Return value
+ */
+ public static function callMethod($obj, $name, array $args = [])
+ {
+ $class = new \ReflectionClass($obj);
+ $method = $class->getMethod($name);
+ // If PHP is older then 8.1.0
+ if (PHP_VERSION_ID < 80100) {
+ $method->setAccessible(true);
+ }
+ return $method->invokeArgs($obj, $args);
+ }
+
+
+ /**
+ * Compare all public properties values of 2 objects
+ *
+ * @param Object $oA Object operand 1
+ * @param Object $oB Object operand 2
+ * @param boolean $ignoretype False will not report diff if type of value differs
+ * @param array $fieldstoignorearray Array of fields to ignore in diff
+ * @return array Array with differences
+ */
+ public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
+ {
+ $retAr = array();
+
+ if (get_class($oA) !== get_class($oB)) {
+ $retAr[] = "Supplied objects are not of same class.";
+ } else {
+ $oVarsA = get_object_vars($oA);
+ $oVarsB = get_object_vars($oB);
+ $aKeys = array_keys($oVarsA);
+ if (method_exists($oA, 'deprecatedProperties')) {
+ // Update exclusions
+ foreach (self::callMethod($oA, 'deprecatedProperties') as $deprecated => $new) {
+ if (in_array($deprecated, $fieldstoignorearray)) {
+ $fieldstoignorearray[] = $new;
+ }
+ }
+ }
+ foreach ($aKeys as $sKey) {
+ if (in_array($sKey, $fieldstoignorearray)) {
+ continue;
+ }
+ if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+ $retAr[] = get_class($oA).'::'.$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : json_encode($oVarsA[$sKey])).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : json_encode($oVarsB[$sKey]));
+ }
+ if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
+ $retAr[] = get_class($oA).'::'.$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : json_encode($oVarsA[$sKey])).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : json_encode($oVarsB[$sKey]));
+ }
+ }
+ }
+ return $retAr;
+ }
+
/**
* Map deprecated module names to new module names
*/
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index 2644c4fe084..801a6656131 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -1,6 +1,7 @@
* Copyright (C) 2023 Alexandre Janniaux
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -117,38 +118,4 @@ class FactureRecTest extends CommonClassTest
$localobject->note_private = 'New note';
//$localobject->note='New note after update';
}
-
- /**
- * Compare all public properties values of 2 objects
- *
- * @param Object $oA Object operand 1
- * @param Object $oB Object operand 2
- * @param boolean $ignoretype False will not report diff if type of value differs
- * @param array $fieldstoignorearray Array of fields to ignore in diff
- * @return array Array with differences
- */
- public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
- {
- $retAr = array();
-
- if (get_class($oA) !== get_class($oB)) {
- $retAr[] = "Supplied objects are not of same class.";
- } else {
- $oVarsA = get_object_vars($oA);
- $oVarsB = get_object_vars($oB);
- $aKeys = array_keys($oVarsA);
- foreach ($aKeys as $sKey) {
- if (in_array($sKey, $fieldstoignorearray)) {
- continue;
- }
- if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- }
- }
- return $retAr;
- }
}
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index e2f9fa5f68c..2fc0bb6d67d 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2010 Laurent Destailleur
* Copyright (C) 2018 Frédéric France
* Copyright (C) 2023 Alexandre Janniaux
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -155,7 +156,7 @@ class FactureTest extends CommonClassTest
$this->assertLessThan($result, 0);
- // Test everything are still same than specimen
+ // Test everything is still the same as specimen
$newlocalobject = new Facture($db);
$newlocalobject->initAsSpecimen();
$this->changeProperties($newlocalobject);
@@ -168,6 +169,7 @@ class FactureTest extends CommonClassTest
$localobject,
$newlocalobject,
true,
+ // Not comparing:
array(
'newref','oldref','id','lines','client','thirdparty','brouillon','user_creation_id','date_creation','date_validation','datem','date_modification',
'ref','statut','status','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
@@ -281,38 +283,4 @@ class FactureTest extends CommonClassTest
$localobject->note_private = 'New note';
//$localobject->note='New note after update';
}
-
- /**
- * Compare all public properties values of 2 objects
- *
- * @param Object $oA Object operand 1
- * @param Object $oB Object operand 2
- * @param boolean $ignoretype False will not report diff if type of value differs
- * @param array $fieldstoignorearray Array of fields to ignore in diff
- * @return array Array with differences
- */
- public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
- {
- $retAr = array();
-
- if (get_class($oA) !== get_class($oB)) {
- $retAr[] = "Supplied objects are not of same class.";
- } else {
- $oVarsA = get_object_vars($oA);
- $oVarsB = get_object_vars($oB);
- $aKeys = array_keys($oVarsA);
- foreach ($aKeys as $sKey) {
- if (in_array($sKey, $fieldstoignorearray)) {
- continue;
- }
- if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- }
- }
- return $retAr;
- }
}
diff --git a/test/phpunit/InventoryTest.php b/test/phpunit/InventoryTest.php
index 2d9808e12ce..7761608d1a6 100644
--- a/test/phpunit/InventoryTest.php
+++ b/test/phpunit/InventoryTest.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2010 Laurent Destailleur
* Copyright (C) 2018 Frédéric France
* Copyright (C) 2023 Alexandre Janniaux
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -267,38 +268,4 @@ class InventoryTest extends CommonClassTest
return $result;
}
-
- /**
- * Compare all public properties values of 2 objects
- *
- * @param Object $oA Object operand 1
- * @param Object $oB Object operand 2
- * @param boolean $ignoretype False will not report diff if type of value differs
- * @param array $fieldstoignorearray Array of fields to ignore in diff
- * @return array Array with differences
- */
- public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
- {
- $retAr = array();
-
- if (get_class($oA) !== get_class($oB)) {
- $retAr[] = "Supplied objects are not of same class.";
- } else {
- $oVarsA = get_object_vars($oA);
- $oVarsB = get_object_vars($oB);
- $aKeys = array_keys($oVarsA);
- foreach ($aKeys as $sKey) {
- if (in_array($sKey, $fieldstoignorearray)) {
- continue;
- }
- if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- }
- }
- return $retAr;
- }
}
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 877d258d60b..d5328982f3a 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -1,6 +1,7 @@
* Copyright (C) 2023 Alexandre Janniaux
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -403,38 +404,4 @@ class UserTest extends CommonClassTest
{
$localobject->note_private = 'New note after update';
}
-
- /**
- * Compare all public properties values of 2 objects
- *
- * @param Object $oA Object operand 1
- * @param Object $oB Object operand 2
- * @param boolean $ignoretype False will not report diff if type of value differs
- * @param array $fieldstoignorearray Array of fields to ignore in diff
- * @return array Array with differences
- */
- public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
- {
- $retAr = array();
-
- if (get_class($oA) !== get_class($oB)) {
- $retAr[] = "Supplied objects are not of same class.";
- } else {
- $oVarsA = get_object_vars($oA);
- $oVarsB = get_object_vars($oB);
- $aKeys = array_keys($oVarsA);
- foreach ($aKeys as $sKey) {
- if (in_array($sKey, $fieldstoignorearray)) {
- continue;
- }
- if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
- $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
- }
- }
- }
- return $retAr;
- }
}