From 0da942210fb90e52bf9f293ba5cb7f063acac350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 09:55:48 +0100 Subject: [PATCH] deprecate non camelCaps functions --- htdocs/expensereport/card.php | 2 +- .../expensereport/class/expensereport.class.php | 15 +++++++++++++++ htdocs/fourn/class/fournisseur.facture.class.php | 4 ++-- htdocs/fourn/facture/card.php | 6 +++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index e61a0a12281..62cfa8e37f6 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -953,7 +953,7 @@ if (empty($reshook)) $object = new ExpenseReport($db); $object->fetch($id); - $result = $object->set_unpaid($user); + $result = $object->setUnpaid($user); if ($result > 0) { diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 7ac1924fec8..3bed33e7781 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1492,6 +1492,8 @@ class ExpenseReport extends CommonObject /** * set_unpaid * + * @deprecated + * @see setUnpaid() * @param User $fuser User * @param int $notrigger Disable triggers * @return int <0 if KO, >0 if OK @@ -1499,6 +1501,19 @@ class ExpenseReport extends CommonObject public function set_unpaid($fuser, $notrigger = 0) { // phpcs:enable + dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE); + return $this->setUnpaid($fuser, $notrigger); + } + + /** + * set_unpaid + * + * @param User $fuser User + * @param int $notrigger Disable triggers + * @return int <0 if KO, >0 if OK + */ + public function setUnpaid($fuser, $notrigger = 0) + { $error = 0; if ($this->paid) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 56151d661f9..67070b99c57 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1261,7 +1261,7 @@ class FactureFournisseur extends CommonInvoice { // phpcs:enable dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE); - $this->setPaid($user, $close_code, $close_note); + return $this->setPaid($user, $close_code, $close_note); } /** @@ -1322,7 +1322,7 @@ class FactureFournisseur extends CommonInvoice { // phpcs:enable dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE); - $this->setUnpaid($user); + return $this->setUnpaid($user); } /** diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index c2c4a91ea36..a8f7fa2cc42 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -277,7 +277,7 @@ if (empty($reshook)) $discount->unlink_invoice(); } elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) { $object->fetch($id); - $result = $object->set_paid($user); + $result = $object->setPaid($user); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } @@ -605,7 +605,7 @@ if (empty($reshook)) { if ($object->type != FactureFournisseur::TYPE_DEPOSIT) { // Classe facture - $result = $object->set_paid($user); + $result = $object->setPaid($user); if ($result >= 0) { $db->commit(); @@ -1545,7 +1545,7 @@ if (empty($reshook)) if ($object->statut == FactureFournisseur::STATUS_CLOSED || ($object->statut == FactureFournisseur::STATUS_ABANDONED && $object->close_code != 'replaced')) { - $result = $object->set_unpaid($user); + $result = $object->setUnpaid($user); if ($result > 0) { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);