Skip to content

Commit 745b140

Browse files
authored
fix CI (#33624)
* fix typo * Update card.php * Update card.php * Update card.php * Update interface_95_modWebhook_WebhookTriggers.class.php * Update interface_95_modWebhook_WebhookTriggers.class.php
1 parent d975325 commit 745b140

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
9797
$actionarraytmp = explode(",", $tmpobject->trigger_codes);
9898
$actionarray = array();
9999
foreach ($actionarraytmp as $val) {
100-
$actionarray = trim($val);
100+
$actionarray[] = trim($val);
101101
}
102102

103103
// Test on Target status
104104
$testontargetstatus = ($tmpobject->status == Target::STATUS_AUTOMATIC_TRIGGER || ($tmpobject->status == Target::STATUS_MANUAL_TRIGGER && !empty($sendmanualtriggers)));
105-
if (((!empty($object->context["actiontrigger"]) && in_array($object->context["actiontrigger"], array("sendtrigger", "testsend"))) || $testontargetstatus) && is_array($actionarray) && in_array($action, $actionarray)) {
105+
if (((!empty($object->context["actiontrigger"]) && in_array($object->context["actiontrigger"], array("sendtrigger", "testsend"))) || $testontargetstatus) && in_array($action, $actionarray)) {
106106
// Build the answer object
107107
$resobject = new stdClass();
108108
$resobject->triggercode = $action;

htdocs/salaries/card.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22
/* Copyright (C) 2011-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
33
* Copyright (C) 2014-2020 Laurent Destailleur <eldy@users.sourceforge.net>
4-
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
5-
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
6-
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
7-
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
8-
* Copyright (C) 2023 Maxime Nicolas <maxime@oarces.com>
9-
* Copyright (C) 2023 Benjamin GREMBI <benjamin@oarces.com>
10-
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
11-
* Copyright (C) 2024-2025 Nick Fragoulis
4+
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
5+
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
6+
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
7+
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
8+
* Copyright (C) 2023 Maxime Nicolas <maxime@oarces.com>
9+
* Copyright (C) 2023 Benjamin GREMBI <benjamin@oarces.com>
10+
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
11+
* Copyright (C) 2024-2025 Nick Fragoulis
1212
*
1313
* This program is free software; you can redistribute it and/or modify
1414
* it under the terms of the GNU General Public License as published by
@@ -129,6 +129,7 @@
129129

130130
$upload_dir = $conf->salaries->multidir_output[$conf->entity];
131131

132+
$error = 0;
132133

133134
/*
134135
* Actions
@@ -461,7 +462,7 @@
461462

462463
// Action to update one extrafield
463464
if ($action == 'update_extras' && $permissiontoeditextra) {
464-
$object->oldcopy = dol_clone($object, 2);
465+
$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
465466

466467
$attribute = GETPOST('attribute', 'aZ09');
467468

htdocs/stripe/admin/stripe.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
if (utf8_check(getDolGlobalString('STRIPE_TEST_SECRET_KEY'))) {
331331
try {
332332
\Stripe\Stripe::setApiKey(getDolGlobalString('STRIPE_LIVE_SECRET_KEY'));
333-
$endpoint = \Stripe\WebhookEndpoint::retrieve(getDolglobalString('STRIPE_LIVE_WEBHOOK_ID'));
333+
$endpoint = \Stripe\WebhookEndpoint::retrieve(getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID'));
334334
$endpoint->enabled_events = $stripearrayofwebhookevents;
335335
if (GETPOST('webhook', 'alpha') == getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID')) {
336336
if (empty(GETPOST('status', 'alpha'))) {

0 commit comments

Comments
 (0)