diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index f360c5c0cd6..48447acfadf 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -442,6 +442,7 @@ return [ 'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences 'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences 'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning + 'PhanPluginRedundantAssignment', // Not essential, useless 'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences 'PhanPluginUnknownArrayMethodParamType', // Too many troubles to manage. Is enabled into config_extended only. diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php index c0a853313fe..59ce0afe0ff 100644 --- a/dev/tools/phan/config_extended.php +++ b/dev/tools/phan/config_extended.php @@ -87,6 +87,7 @@ $config['suppress_issue_types'] = [ 'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences 'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences 'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning + 'PhanPluginRedundantAssignment', // Not essential, useless 'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences ]; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 2207aaf771e..98c5009594e 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -766,7 +766,6 @@ class AccountingAccount extends CommonObject if ($factureDet->product_type == 1) { if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country) $code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'); - // @phan-suppress-next-line PhanPluginRedundantAssignment $suggestedaccountingaccountbydefaultfor = ''; } else { if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) { // European intravat sale, but with a VAT @@ -785,7 +784,6 @@ class AccountingAccount extends CommonObject } elseif ($factureDet->product_type == 0) { if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country) $code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'); - // @phan-suppress-next-line PhanPluginRedundantAssignment $suggestedaccountingaccountbydefaultfor = ''; } else { if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) { // European intravat sale, but with a VAT diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 3c892ba6d2c..bc0e4a3bec4 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -352,7 +352,6 @@ class BlockedLog global $langs, $cachedUser; if (empty($cachedUser)) { - // @phan-suppress-next-line PhanPluginRedundantAssignment $cachedUser = array(); } diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 491099f1e90..f06265f5491 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1009,7 +1009,7 @@ class Categorie extends CommonObject $nbtotalofrecords = $this->db->num_rows($result); if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0 $page = 0; - $offset = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $offset = 0; } } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 5dd4427aa35..86d74251580 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1583,7 +1583,7 @@ class ActionComm extends CommonObject $statusType = 'status9'; if ($percent == -1 && !$hidenastatus) { - $statusType = 'status9'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status9'; } if ($percent == 0) { $statusType = 'status1'; diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 51179ab3900..573bb9477ff 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -1585,7 +1585,7 @@ class FactureRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } @@ -1604,7 +1604,7 @@ class FactureRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } @@ -1623,7 +1623,7 @@ class FactureRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } @@ -1645,7 +1645,7 @@ class FactureRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 8fe47744080..9025049b4a4 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -517,8 +517,8 @@ class Facture extends CommonInvoice // Define some dates $originaldatewhen = $_facrec->date_when; - $nextdatewhen = null; // @phan-suppress-current-line PhanPluginRedundantAssignment - $previousdaynextdatewhen = null; // @phan-suppress-current-line PhanPluginRedundantAssignment + $nextdatewhen = null; + $previousdaynextdatewhen = null; if ($originaldatewhen) { $nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency); $previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd'); diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 38132802e15..3926e5a48d2 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -333,7 +333,7 @@ class BonPrelevement extends CommonObject if ($resql) { $num = $this->db->num_rows($resql); } else { - $result = -1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = -1; } } else { /* @@ -1666,7 +1666,7 @@ class BonPrelevement extends CommonObject dol_syslog("adnotiff: " . $sql); if ($this->db->query($sql)) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } else { $result = -1; dol_syslog(get_class($this) . "::addNotification Error $result"); diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php index ddb3b12185b..a06348c5f37 100644 --- a/htdocs/core/boxes/box_members_subscriptions_by_year.php +++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php @@ -111,7 +111,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes } - $line = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $line = 0; $this->info_box_contents[$line][] = array( 'td' => 'class=""', 'text' => $langs->trans("Year"), diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index c3f36c3b96f..84d04c38138 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -1162,7 +1162,7 @@ class CMailFile $result = $this->smtps->getErrors(); // applicative error code (not SMTP error code) if (empty($this->error) && empty($result)) { dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG); - $res = true; // @phan-suppress-current-line PhanPluginRedundantAssignment + $res = true; } else { if (empty($this->error)) { $this->error = $result; diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php index e602896e82f..7fe6fb14513 100644 --- a/htdocs/core/class/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -211,7 +211,7 @@ class CSMSFile // Send sms method not correctly defined // -------------------------------------- $this->error = 'Bad value for MAIN_SMS_SENDMODE constant'; - $res = false; // @phan-suppress-current-line PhanPluginRedundantAssignment + $res = false; } } else { $this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS'; diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index ec70fe35078..a97e72086b3 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -1506,7 +1506,7 @@ abstract class CommonInvoice extends CommonObject $description = 'Failed to find or use your payment mode (no payment mode for this customer id)'; $stripefailurecode = 'BADPAYMENTMODE'; $stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)'; - $postactionmessages = []; // @phan-suppress-current-line PhanPluginRedundantAssignment + $postactionmessages = []; $object = $this; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 8be9c5e6e80..1f50fdd9ea0 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -7470,7 +7470,7 @@ abstract class CommonObject } $out = ' '; } elseif ($type == 'select') { // combo list - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) { include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0); @@ -7502,7 +7502,7 @@ abstract class CommonObject $out .= $tmpselect; $out .= ''; } elseif ($type == 'sellist') { - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) { include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0); @@ -7696,7 +7696,7 @@ abstract class CommonObject $value_arr = explode(',', $value); $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, 0, 0, $morecss, 0, '100%'); } elseif ($type == 'radio') { - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; foreach ($param['options'] as $keyopt => $valopt) { $out .= ' '; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 059826a1c80..3eac0aff4f7 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1259,7 +1259,7 @@ class ExtraFields } $out = ' '; } elseif ($type == 'select') { - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; if ($mode) { $options = array(); foreach ($param['options'] as $okey => $val) { @@ -1314,7 +1314,7 @@ class ExtraFields $out .= ''; } } elseif ($type == 'sellist') { - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) { include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0); @@ -1477,7 +1477,7 @@ class ExtraFields } $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%'); } elseif ($type == 'radio') { - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; foreach ($param['options'] as $keyopt => $val) { $out .= 'getHtml($keyprefix.$key.$keysuffix, $geojson, $centroidjson, $type); } else { // If keyprefix is search_ or search_options_, we must just use a simple text field - $out = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $out = ''; } } elseif ($type == 'password') { // If prefix is 'search_', field is used as a filter, we use a common text field. diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cc308903f97..73cff8228ed 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2962,7 +2962,7 @@ class Form $sql .= " FROM ".$this->db->prefix()."product as p"; // Add from (left join) from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('selectProductsListFrom', $parameters); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; @@ -3032,7 +3032,7 @@ class Form $sql .= " AND p.fk_product_type = 0"; } // Add where from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('selectProductsListWhere', $parameters); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; // Add criteria on ref/label @@ -9668,7 +9668,7 @@ class Form '; } else { - $linktoelem = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $linktoelem = ''; } if (!empty($conf->use_javascript_ajax)) { diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index b5f245794fa..7e26252380e 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -594,7 +594,7 @@ class FormFile } else { include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; //$modellist = ModeleExports::liste_modeles($this->db); // liste_modeles() does not exists. We are using listOfAvailableExportFormat() method instead that return a different array format. - $modellist = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $modellist = array(); } } elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') { if (is_array($genallowed)) { @@ -714,7 +714,7 @@ class FormFile $out .= ''; $addcolumforpicto = ($delallowed || $printer || $morepicto); $colspan = (4 + ($addcolumforpicto ? 1 : 0)); - $colspanmore = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $colspanmore = 0; $out .= ''; diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php index 5ff9874fc76..7a0a3124ef1 100644 --- a/htdocs/core/class/utils.class.php +++ b/htdocs/core/class/utils.class.php @@ -466,7 +466,7 @@ class Utils $langs->load("errors"); dol_syslog("Datadump retval after exec=".$retval, LOG_ERR); $errormsg = 'Error '.$retval; - $ok = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $ok = 0; } else { $i = 0; if (!empty($output_arr)) { diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php index e95af16f784..4e9f8d009ed 100644 --- a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php +++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php @@ -263,7 +263,7 @@ function CreateFolder($resourceType, $currentFolder) switch ($sErrorMsg) { case '': - $sErrorNumber = '0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $sErrorNumber = '0'; break; case 'Invalid argument': case 'No such file or directory': diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 1994967a102..78f6f04a58e 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -560,7 +560,7 @@ function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler if ($error == 0) { $ok = 1; } else { - $ok = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $ok = 0; } return $ok; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index b36805b7c38..5ae02e6bf93 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -74,7 +74,7 @@ function societe_prepare_head(Societe $object) $sql .= " WHERE p.fk_soc = ".((int) $object->id); $sql .= " AND p.entity IN (".getEntity($object->element).")"; // Add where from hooks - $parameters = array('contacttab' => true); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array('contacttab' => true); $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $resql = $db->query($sql); diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 086f1ed7bf9..d01f8fd33a3 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1130,7 +1130,7 @@ function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $ } if ($resultecm > 0) { - $result = true; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = true; } else { $result = false; } @@ -1205,7 +1205,7 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase } } } - $result = true; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = true; } } } @@ -2588,9 +2588,9 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = try { if ($mode == 'gz') { - $foundhandler = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $foundhandler = 0; } elseif ($mode == 'bz') { - $foundhandler = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $foundhandler = 0; } elseif ($mode == 'zip') { /*if (defined('ODTPHP_PATHTOPCLZIP')) { @@ -2806,7 +2806,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, $original_file = $conf->mycompany->dir_output.'/'.$original_file; } elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) { // Wrapping for users photos (user photos are allowed to any connected users) - $accessallowed = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $accessallowed = 0; if (preg_match('/^\d+\/photos\//', $original_file)) { $accessallowed = 1; } @@ -2842,7 +2842,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, $original_file = $conf->mycompany->dir_output.'/logos/'.$original_file; } elseif ($modulepart == 'memberphoto' && !empty($conf->member->dir_output)) { // Wrapping for members photos - $accessallowed = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $accessallowed = 0; if (preg_match('/^\d+\/photos\//', $original_file)) { $accessallowed = 1; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0824b5ee19b..eb5e1dfc1e7 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3208,7 +3208,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs = // @phan-suppress-next-line PhanPluginRedundantAssignment $offsetdst = 0; // Dst offset with server timezone (because to_gmt is false), so 0 } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') { - $to_gmt = true; // @phan-suppress-current-line PhanPluginRedundantAssignment + $to_gmt = true; $offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion' if (class_exists('DateTimeZone')) { @@ -4254,7 +4254,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli } elseif ($withpicto == 'mobile') { $picto = 'phoning_mobile'; } else { - $picto = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $picto = ''; } } if ($adddivfloat == 1) { @@ -11530,12 +11530,12 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0) $famime = 'file-alt'; } elseif (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; - $imgmime = 'other.png'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-alt'; } elseif (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; - $imgmime = 'other.png'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-alt'; } elseif (preg_match('/\.bas$/i', $tmpfile)) { // Languages @@ -11699,16 +11699,16 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0) $famime = 'file-image'; } elseif (preg_match('/\.vcs$/i', $tmpfile)) { // Calendar $mime = 'text/calendar'; - $imgmime = 'other.png'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $imgmime = 'other.png'; $famime = 'file-alt'; } elseif (preg_match('/\.ics$/i', $tmpfile)) { $mime = 'text/calendar'; - $imgmime = 'other.png'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $imgmime = 'other.png'; $famime = 'file-alt'; } elseif (preg_match('/\.torrent$/i', $tmpfile)) { // Other $mime = 'application/x-bittorrent'; - $imgmime = 'other.png'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $famime = 'file-o'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $imgmime = 'other.png'; + $famime = 'file-o'; } elseif (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) { // Audio $mime = 'audio'; $imgmime = 'audio.png'; @@ -11748,12 +11748,12 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0) $famime = 'file-archive'; } elseif (preg_match('/\.(exe|com)$/i', $tmpfile)) { // Exe $mime = 'application/octet-stream'; - $imgmime = 'other.png'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $famime = 'file-o'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $imgmime = 'other.png'; + $famime = 'file-o'; } elseif (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) { // Lib $mime = 'library'; $imgmime = 'library.png'; - $famime = 'file-o'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $famime = 'file-o'; } elseif (preg_match('/\.err$/i', $tmpfile)) { // phpcs:ignore $mime = 'error'; $imgmime = 'error.png'; @@ -12010,7 +12010,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st $return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); } elseif (getDolGlobalString('MAIN_STATUS_USES_IMAGES')) { // Use status with images (for backward compatibility) - $return = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $return = ''; $htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); @@ -13471,7 +13471,7 @@ function getTimelineIcon($actionstatic, &$histo, $key) } elseif ($actionstatic->code == 'AC_TICKET_MODIFY') { $iconClass = 'fa fa-pencilxxx'; } elseif (preg_match('/^TICKET_MSG/', $actionstatic->code)) { - $iconClass = 'fa fa-comments'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $iconClass = 'fa fa-comments'; } elseif (preg_match('/^TICKET_MSG_PRIVATE/', $actionstatic->code)) { $iconClass = 'fa fa-mask'; } elseif (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) { diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index a9f7cad04f6..0ccad664f6f 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -531,7 +531,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0) } // Add Group from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldListGroupByCustomerDraft', $parameters); $sql .= $hookmanager->resPrint; diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php index 9badef41ff8..18914beba62 100644 --- a/htdocs/core/lib/invoice2.lib.php +++ b/htdocs/core/lib/invoice2.lib.php @@ -297,7 +297,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte } else { dol_syslog("No invoices found for criteria"); } - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } } else { dol_print_error($db); diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php index 5a55202c5dc..12b0ab69220 100644 --- a/htdocs/core/lib/json.lib.php +++ b/htdocs/core/lib/json.lib.php @@ -283,7 +283,7 @@ function dol_json_decode($json, $assoc = false) // @phan-suppress-next-line PhanPluginUnsafeEval eval('$array = '.$out.';'); } catch (Exception $e) { - $array = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $array = array(); } } diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index 97b21356737..3f33538b24b 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -612,7 +612,7 @@ function includeContainer($containerref) $fullpathfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/'.$containerref; if (empty($includehtmlcontentopened)) { - $includehtmlcontentopened = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $includehtmlcontentopened = 0; } $includehtmlcontentopened++; if ($includehtmlcontentopened > $MAXLEVEL) { diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 0bcd4c10dcf..e325ea94fc4 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -244,7 +244,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK'))) { $result = -2; } else { @@ -253,7 +253,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode if ($is_dispo != 0) { $result = -3; } else { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } } else { if (dol_strlen($code) == 0) { diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php index 5e7e402dcad..e60472fe463 100644 --- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php @@ -247,7 +247,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK'))) { $result = -2; } else { @@ -256,7 +256,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode if ($is_dispo != 0) { $result = -3; } else { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } } else { if (dol_strlen($code) == 0) { diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php index a080266d59f..ca517b5a8a4 100644 --- a/htdocs/core/modules/contract/mod_contract_olive.php +++ b/htdocs/core/modules/contract/mod_contract_olive.php @@ -108,7 +108,7 @@ class mod_contract_olive extends ModelNumRefContracts $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_CONTRACT_CODE_ALWAYS_REQUIRED')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_CONTRACT_CODE_ALWAYS_REQUIRED'))) { $result = -2; } diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php index 94171a4c9f6..018e97f75ac 100644 --- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php +++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php @@ -822,7 +822,7 @@ class pdf_storm extends ModelePDFDeliveryOrder if ($this->page_largeur < 210) { $widthrecbox = 84; // To work with US executive format } - $posy = 42; // @phan-suppress-current-line PhanPluginRedundantAssignment + $posy = 42; $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) { $posx = $this->marge_gauche; diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php index 9278850664f..1c4b158bbd4 100644 --- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php @@ -829,7 +829,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder if ($this->page_largeur < 210) { $widthrecbox = 84; // To work with US executive format } - $posy = 42; // @phan-suppress-current-line PhanPluginRedundantAssignment + $posy = 42; $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) { $posx = $this->marge_gauche; diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 2cc35d093ee..8b6233c40dc 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -306,7 +306,7 @@ class pdf_standard extends ModeleExpenseReport $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs); $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow); - $tab_top = 95; // @phan-suppress-current-line PhanPluginRedundantAssignment + $tab_top = 95; $pdf->SetFont('', '', $default_font_size - 1); $pdf->writeHTMLCell(190, 3, $this->posxpiece - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1); @@ -795,7 +795,7 @@ class pdf_standard extends ModeleExpenseReport } // Show recipient - $posy = 50; // @phan-suppress-current-line PhanPluginRedundantAssignment + $posy = 50; $posx = 100; if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) { $posx = $this->marge_gauche; diff --git a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php index b7a2078bd3a..8c624b85a0d 100644 --- a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php @@ -249,7 +249,7 @@ class pdf_standard extends ModelePDFEvaluation // Show notes if (!empty($object->note_public)) { - $tab_top = 65; // @phan-suppress-current-line PhanPluginRedundantAssignment + $tab_top = 65; $pdf->SetFont('', 'B', $default_font_size); $pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, '', 12, $tab_top); diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index 3fb800731ba..7bc785ebe6d 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -580,9 +580,9 @@ class modAgenda extends DolibarrModules ); // Import Event Extra Fields - $keyforselect = 'actioncomm'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforelement = 'action'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforselect = 'actioncomm'; + $keyforelement = 'action'; + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; } } diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php index 3c47eb376d3..4aa1f0cce75 100644 --- a/htdocs/core/modules/modAi.class.php +++ b/htdocs/core/modules/modAi.class.php @@ -264,7 +264,7 @@ class modAi extends DolibarrModules // Main menu entries to add $this->menu = array(); - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here entries to declare new menus /* BEGIN MODULEBUILDER TOPMENU */ /* END MODULEBUILDER TOPMENU */ @@ -307,7 +307,7 @@ class modAi extends DolibarrModules /* END MODULEBUILDER EXPORT AVAILABILITIES */ // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT AVAILABILITIES */ /* $langs->load("agenda"); diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php index e20a30c12f4..f968b1fa58b 100644 --- a/htdocs/core/modules/modBom.class.php +++ b/htdocs/core/modules/modBom.class.php @@ -282,7 +282,7 @@ class modBom extends DolibarrModules $keyforelement = 'bom'; include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php'; $keyforclass = 'BOMLine'; - $keyforclassfile = '/bom/class/bom.class.php'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforclassfile = '/bom/class/bom.class.php'; $keyforelement = 'bomline'; $keyforalias = 'tl'; include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php'; diff --git a/htdocs/core/modules/modBookCal.class.php b/htdocs/core/modules/modBookCal.class.php index 0b2ce6c2c77..3c8b94f8af5 100644 --- a/htdocs/core/modules/modBookCal.class.php +++ b/htdocs/core/modules/modBookCal.class.php @@ -494,7 +494,7 @@ class modBookCal extends DolibarrModules // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT AVAILABILITIES */ /* $langs->load("agenda"); diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index c046b25e2a2..315e5021796 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -235,7 +235,7 @@ class modCategorie extends DolibarrModules $keyforselect = 'societe'; $keyforelement = 'company'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; @@ -281,9 +281,9 @@ class modCategorie extends DolibarrModules 't.libelle' => 'company', 'pl.code' => 'company', 'st.code' => 'company' ); // We define here only fields that use another picto - $keyforselect = 'societe'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforelement = 'company'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforselect = 'societe'; + $keyforelement = 'company'; + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; @@ -312,7 +312,7 @@ class modCategorie extends DolibarrModules $keyforselect = 'adherent'; $keyforelement = 'member'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; @@ -367,7 +367,7 @@ class modCategorie extends DolibarrModules $keyforselect = 'socpeople'; $keyforelement = 'contact'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; @@ -397,7 +397,7 @@ class modCategorie extends DolibarrModules $keyforselect = 'projet'; $keyforelement = 'project'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; @@ -423,7 +423,7 @@ class modCategorie extends DolibarrModules $keyforselect = 'user'; $keyforelement = 'user'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php index eca7e3eb615..69599413fcc 100644 --- a/htdocs/core/modules/modCollab.class.php +++ b/htdocs/core/modules/modCollab.class.php @@ -108,7 +108,7 @@ class modCollab extends DolibarrModules $r++;*/ // Main menu entries - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $this->menu[$r] = array( 'fk_menu' => '0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'type' => 'top', // This is a Left menu entry diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 1f6bf2defd3..88fdc6d8abc 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -417,10 +417,10 @@ class modCommande extends DolibarrModules $this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC'; } - $import_extrafield_sample = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $import_extrafield_sample = array(); $keyforselect = 'commandedet'; $keyforelement = 'orderline'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php'; $this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commandedet']; diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php index 018ec643045..5932f24509c 100644 --- a/htdocs/core/modules/modECM.class.php +++ b/htdocs/core/modules/modECM.class.php @@ -78,7 +78,7 @@ class modECM extends DolibarrModules // Boxes $this->boxes = array(); // List of boxes - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php index d823f2629b0..0468e9688c6 100644 --- a/htdocs/core/modules/modEventOrganization.class.php +++ b/htdocs/core/modules/modEventOrganization.class.php @@ -340,7 +340,7 @@ class modEventOrganization extends DolibarrModules //unset($this->export_fields_array[$r]['t.fieldtoremove']); $keyforselect = 'conferenceorboothattendee'; $keyforaliasextra = 'extra'; - $keyforelement = 'conferenceorboothattendee'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforelement = 'conferenceorboothattendee'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; //$this->export_dependencies_array[$r] = array('aaaline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields) //$this->export_special_array[$r] = array('t.field'=>'...'); diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php index cd8cc5a0a21..c2843fffcb7 100644 --- a/htdocs/core/modules/modExpenseReport.class.php +++ b/htdocs/core/modules/modExpenseReport.class.php @@ -73,7 +73,7 @@ class modExpenseReport extends DolibarrModules // Constants $this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities') - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF"; $this->const[$r][1] = "chaine"; diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php index 382c1a3821f..6e0cf0b63e4 100644 --- a/htdocs/core/modules/modExternalSite.class.php +++ b/htdocs/core/modules/modExternalSite.class.php @@ -101,7 +101,7 @@ class modExternalSite extends DolibarrModules // Menus //------ - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $this->menu[$r] = array( 'fk_menu' => 0, diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 891ca1b140b..5e7a31b3d77 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -584,7 +584,7 @@ class modFournisseur extends DolibarrModules // Add extra fields object $keyforselect = 'commande_fournisseur'; $keyforelement = 'order'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; // End add extra fields object // Add extra fields line diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php index f5992524911..4642c950664 100644 --- a/htdocs/core/modules/modGravatar.class.php +++ b/htdocs/core/modules/modGravatar.class.php @@ -92,7 +92,7 @@ class modGravatar extends DolibarrModules // Boxes $this->boxes = array(); // List of boxes - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: @@ -104,7 +104,7 @@ class modGravatar extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here list of permission defined by an id, a label, a boolean and two constant strings. // Example: @@ -118,7 +118,7 @@ class modGravatar extends DolibarrModules // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here entries to declare new menus // Example to declare the Top Menu entry: diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php index b2daca3d2f6..8109e36a1f4 100644 --- a/htdocs/core/modules/modHRM.class.php +++ b/htdocs/core/modules/modHRM.class.php @@ -191,7 +191,7 @@ class modHRM extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Skill / Job / Position $this->rights[$r][0] = 4001; // Permission id (must not be already used) diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index a974f86e95a..2cae18c62be 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -93,7 +93,7 @@ class modHoliday extends DolibarrModules // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0), // 1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) ); $this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities') - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $this->const[$r][0] = "HOLIDAY_ADDON"; $this->const[$r][1] = "chaine"; @@ -156,7 +156,7 @@ class modHoliday extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $this->rights[$r][0] = 20001; // Permission id (must not be already used) $this->rights[$r][1] = 'Read leave requests (yours and your subordinates)'; // Permission label diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php index 87d0b6da464..3584a9f9db1 100644 --- a/htdocs/core/modules/modIncoterm.class.php +++ b/htdocs/core/modules/modIncoterm.class.php @@ -103,10 +103,10 @@ class modIncoterm extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; } } diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php index 37784bdeb8d..80dd7b5fe9a 100644 --- a/htdocs/core/modules/modKnowledgeManagement.class.php +++ b/htdocs/core/modules/modKnowledgeManagement.class.php @@ -390,7 +390,7 @@ class modKnowledgeManagement extends DolibarrModules /* END MODULEBUILDER EXPORT KNOWLEDGERECORD */ // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT KNOWLEDGERECORD */ /* $langs->load("knowledgemanagement"); diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index f1a324f3114..274cb6e4550 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -97,11 +97,11 @@ class modMargin extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // left menu entry $this->menu[$r] = array( diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php index 7ffa5157c66..02d7a415d11 100644 --- a/htdocs/core/modules/modOauth.class.php +++ b/htdocs/core/modules/modOauth.class.php @@ -103,7 +103,7 @@ class modOauth extends DolibarrModules // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // This is to declare the Top Menu entry: //$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php index e9def30529b..82f0ae853a8 100644 --- a/htdocs/core/modules/modOpenSurvey.class.php +++ b/htdocs/core/modules/modOpenSurvey.class.php @@ -96,7 +96,7 @@ class modOpenSurvey extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here list of permission defined by an id, a label, a boolean and two constant strings. // Example: diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php index e03a1a666d3..e99045d05fc 100644 --- a/htdocs/core/modules/modPartnership.class.php +++ b/htdocs/core/modules/modPartnership.class.php @@ -406,7 +406,7 @@ class modPartnership extends DolibarrModules /* END MODULEBUILDER EXPORT PARTNERSHIP */ // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT PARTNERSHIP */ /* $langs->load("partnership"); diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php index 263ffdfe490..83048369a4a 100644 --- a/htdocs/core/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -101,7 +101,7 @@ class modPaybox extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here list of permission defined by an id, a label, a boolean and two constant strings. // Example: @@ -115,7 +115,7 @@ class modPaybox extends DolibarrModules // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here entries to declare new menus // Example to declare the Top Menu entry: diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php index 8fbecdc97d8..28a6efd6dd0 100644 --- a/htdocs/core/modules/modPaymentByBankTransfer.class.php +++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php @@ -91,7 +91,7 @@ class modPaymentByBankTransfer extends DolibarrModules // Permissions $this->rights = array(); $this->rights_class = 'paymentbybanktransfer'; - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $r++; $this->rights[$r][0] = 561; $this->rights[$r][1] = 'Read bank transfer payment orders'; diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php index e284195ebcc..69c9844ca19 100644 --- a/htdocs/core/modules/modPaypal.class.php +++ b/htdocs/core/modules/modPaypal.class.php @@ -102,12 +102,12 @@ class modPaypal extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; /*$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'mainmenu'=>'billing', diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 4ef59512632..a2de9b27688 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -451,9 +451,9 @@ class modProduct extends DolibarrModules $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'virtualproduct')); } $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty' => "subproduct", 'pa.incdec' => 'subproduct')); - $keyforselect = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforelement = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforselect = 'product'; + $keyforelement = 'product'; + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description")); $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct")); diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index 1f8f4436a53..5a7e283ccf5 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -119,7 +119,7 @@ class modProductBatch extends DolibarrModules // Exports - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; } /** diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php index 3731002467c..89e26d587e2 100644 --- a/htdocs/core/modules/modRecruitment.class.php +++ b/htdocs/core/modules/modRecruitment.class.php @@ -360,7 +360,7 @@ class modRecruitment extends DolibarrModules /* END MODULEBUILDER EXPORT RECRUITMENTJOBPOSITION */ // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT RECRUITMENTJOBPOSITION */ /* $langs->load("recruitment"); diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 474689202ac..f0797f19899 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -148,7 +148,7 @@ class modResource extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; $this->rights[$r][0] = 63001; $this->rights[$r][1] = 'Read resources'; diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php index ced0c7c9919..7501cebf241 100644 --- a/htdocs/core/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -407,9 +407,9 @@ class modService extends DolibarrModules $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'virtualproduct')); } $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty' => "subproduct", 'pa.incdec' => 'subproduct')); - $keyforselect = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforelement = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforselect = 'product'; + $keyforelement = 'product'; + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description")); $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct")); diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php index 059f011ac28..5f96bd58f73 100644 --- a/htdocs/core/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -420,7 +420,7 @@ class modSociete extends DolibarrModules } $keyforselect = 'socpeople'; $keyforelement = 'contact'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $keyforselect = 'societe'; $keyforelement = 'company'; diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index b88993ccc92..67c0fa4b1ed 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -203,7 +203,7 @@ class modStock extends DolibarrModules // Exports //-------- - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Export warehouses $r++; @@ -277,7 +277,7 @@ class modStock extends DolibarrModules $this->export_dependencies_array[$r] = array('stock' => array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them. $keyforselect = 'product'; $keyforelement = 'product'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ps.reel' => 'Stock')); @@ -336,7 +336,7 @@ class modStock extends DolibarrModules $this->export_dependencies_array[$r] = array('stockbatch' => array('pb.rowid'), 'batch' => array('pb.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them. $keyforselect = 'product_lot'; $keyforelement = 'batch'; - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php index 3da4bea5c1a..bf41a6f036d 100644 --- a/htdocs/core/modules/modStockTransfer.class.php +++ b/htdocs/core/modules/modStockTransfer.class.php @@ -394,7 +394,7 @@ class modStockTransfer extends DolibarrModules /* END MODULEBUILDER EXPORT STOCKTRANSFER */ // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT STOCKTRANSFER */ /* $langs->load("stocktransfer@stocktransfer"); diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php index 99e71b5aba5..9d55ae73334 100644 --- a/htdocs/core/modules/modStripe.class.php +++ b/htdocs/core/modules/modStripe.class.php @@ -89,10 +89,10 @@ class modStripe extends DolibarrModules // Permissions $this->rights = array(); // Permission array used by this module - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Main menu entries - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; /* $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'mainmenu'=>'billing', diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index a60c896ef6e..dfe66bde646 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -381,7 +381,7 @@ class modTicket extends DolibarrModules include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php'; $keyforselect = 'ticket'; $keyforaliasextra = 'extra'; - $keyforelement = 'ticket'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $keyforelement = 'ticket'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_sql_start[$r] = 'SELECT DISTINCT '; $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'ticket as t'; diff --git a/htdocs/core/modules/modWebPortal.class.php b/htdocs/core/modules/modWebPortal.class.php index 355c383c324..cefb27bced3 100644 --- a/htdocs/core/modules/modWebPortal.class.php +++ b/htdocs/core/modules/modWebPortal.class.php @@ -279,7 +279,7 @@ class modWebPortal extends DolibarrModules // Main menu entries to add $this->menu = array(); - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; // Add here entries to declare new menus /* $this->menu[$r++] = array( diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php index 910e133e765..f2774a5722d 100644 --- a/htdocs/core/modules/modWorkflow.class.php +++ b/htdocs/core/modules/modWorkflow.class.php @@ -117,7 +117,7 @@ class modWorkflow extends DolibarrModules // Main menu entries $this->menu = array(); // List of menus to add - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 0; /* $this->menu[$r]=array('fk_menu'=>0, 'type'=>'top', diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php index 6813adc1e46..cc656a9c03d 100644 --- a/htdocs/core/modules/modWorkstation.class.php +++ b/htdocs/core/modules/modWorkstation.class.php @@ -337,7 +337,7 @@ class modWorkstation extends DolibarrModules /* END MODULEBUILDER EXPORT WORKSTATION */ // Imports profiles provided by this module - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment + $r = 1; /* BEGIN MODULEBUILDER IMPORT WORKSTATION */ /* $langs->load("workstation@workstation"); diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php index 3edbaa038c4..bdc78c71778 100644 --- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php @@ -293,7 +293,7 @@ class pdf_standard extends ModelePDFMovement // Add where from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql .= $this->db->order($sortfield, $sortorder); diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 397312fbb5f..03004ad250f 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -256,7 +256,7 @@ class mod_codeproduct_elephant extends ModeleProductCode $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) { $result = -2; } else { diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index d8ae7f91676..8dfab9d177d 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -116,7 +116,7 @@ class mod_codeproduct_leopard extends ModeleProductCode $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) { $result = -2; } diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php index 9cf186afc11..9074500bf2b 100644 --- a/htdocs/core/modules/product_batch/mod_lot_advanced.php +++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php @@ -151,7 +151,7 @@ class mod_lot_advanced extends ModeleNumRefBatch $res = $product->fetch($object->fk_product); if ($res > 0 && !empty($product->batch_mask)) { $mask = $product->batch_mask; - $filter = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $filter = ''; } } diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php index f3e2a71398e..20fcb64d382 100644 --- a/htdocs/core/modules/product_batch/mod_sn_advanced.php +++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php @@ -152,7 +152,7 @@ class mod_sn_advanced extends ModeleNumRefBatch $res = $product->fetch($object->fk_product); if ($res > 0 && !empty($product->batch_mask)) { $mask = $product->batch_mask; - $filter = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $filter = ''; } } diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 06ef3a02cc7..7d412e6c140 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -765,7 +765,7 @@ class doc_generic_task_odt extends ModelePDFTask } // Replace tags of lines for contacts - $sourcearray = array('internal', 'external'); // @phan-suppress-current-line PhanPluginRedundantAssignment + $sourcearray = array('internal', 'external'); $contact_arrray = array(); foreach ($sourcearray as $source) { $contact_temp = $project->liste_contact(-1, $source); diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 6e1d61e165d..f83458dc558 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -272,7 +272,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) { $result = -2; } else { diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 1f592057adb..39c7bda525b 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -119,7 +119,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode $code = trim($code); if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) { $result = -2; } diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 9ddae66f284..b0f6cc1114a 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -164,7 +164,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode $code = strtoupper(trim($code)); if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) { $result = -2; } else { @@ -173,7 +173,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode if ($is_dispo != 0) { $result = -3; } else { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } } else { if (dol_strlen($code) == 0) { @@ -242,7 +242,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode if (dol_strlen($code) < 11) { $res = -1; } else { - $res = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $res = 0; } return $res; } diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php index 904f2212369..b5295c891f7 100644 --- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php +++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php @@ -266,7 +266,7 @@ class InterfaceTicketEmail extends DolibarrTriggers $error_msg = $langs->trans('Error'). ': '; $error_msg .= $langs->transnoentities('TicketWrongContact'); setEventMessages($error_msg, [], 'errors'); - $ok = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $ok = 0; break; } } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 629c4a52cf5..f46b27137e4 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1347,7 +1347,7 @@ class CommandeFournisseur extends CommonOrder $sql .= " WHERE rowid = ".((int) $this->id); if ($this->db->query($sql)) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; if ($error == 0) { // Call trigger @@ -1399,7 +1399,7 @@ class CommandeFournisseur extends CommonOrder $sql .= " WHERE rowid = ".((int) $this->id); dol_syslog(get_class($this)."::cancel", LOG_DEBUG); if ($this->db->query($sql)) { - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; // Call trigger $result = $this->call_trigger('ORDER_SUPPLIER_CANCEL', $user); diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php index ad41d92b7dd..8a5bd82c21b 100644 --- a/htdocs/fourn/class/fournisseur.facture-rec.class.php +++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php @@ -1591,7 +1591,7 @@ class FactureFournisseurRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } @@ -1610,7 +1610,7 @@ class FactureFournisseurRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } @@ -1629,7 +1629,7 @@ class FactureFournisseurRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } @@ -1651,7 +1651,7 @@ class FactureFournisseurRec extends CommonInvoice $statusType = 'status6'; $labelStatus = $langs->transnoentitiesnoconv('Disabled'); } else { - $statusType = 'status0'; // @phan-suppress-current-line PhanPluginRedundantAssignment + $statusType = 'status0'; $labelStatus = $langs->transnoentitiesnoconv('Draft'); } } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 5b2a0405be1..9e523ccf8c0 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -1300,7 +1300,7 @@ class Holiday extends CommonObject } // We found a record, user is on holiday by default, so is not available is true. - $isavailablemorning = true; // @phan-suppress-current-line PhanPluginRedundantAssignment + $isavailablemorning = true; foreach ($arrayofrecord as $record) { if ($timestamp == $record['date_start'] && $record['halfday'] == 2) { continue; @@ -1311,7 +1311,7 @@ class Holiday extends CommonObject $isavailablemorning = false; break; } - $isavailableafternoon = true; // @phan-suppress-current-line PhanPluginRedundantAssignment + $isavailableafternoon = true; foreach ($arrayofrecord as $record) { if ($timestamp == $record['date_end'] && $record['halfday'] == 2) { continue; diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index fc444534b95..a89352a678d 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -951,67 +951,67 @@ function write_conf_file($conffile) fwrite($fp, "\n"); if (empty($force_dolibarr_lib_FPDF_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_FPDF_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_FPDF_PATH = ''; } fwrite($fp, '$dolibarr_lib_FPDF_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDF_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_TCPDF_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_TCPDF_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_TCPDF_PATH = ''; } fwrite($fp, '$dolibarr_lib_TCPDF_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDF_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_FPDI_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_FPDI_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_FPDI_PATH = ''; } fwrite($fp, '$dolibarr_lib_FPDI_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDI_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_TCPDI_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_TCPDI_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_TCPDI_PATH = ''; } fwrite($fp, '$dolibarr_lib_TCPDI_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDI_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_GEOIP_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_GEOIP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_GEOIP_PATH = ''; } fwrite($fp, '$dolibarr_lib_GEOIP_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_GEOIP_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_NUSOAP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_NUSOAP_PATH = ''; } fwrite($fp, '$dolibarr_lib_NUSOAP_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_NUSOAP_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fwrite($fp, '//'); - $force_dolibarr_lib_ODTPHP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_ODTPHP_PATH = ''; } fwrite($fp, '$dolibarr_lib_ODTPHP_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATH)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fwrite($fp, '//'); - $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; } fwrite($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)).'";'); fwrite($fp, "\n"); if (empty($force_dolibarr_js_CKEDITOR)) { fwrite($fp, '//'); - $force_dolibarr_js_CKEDITOR = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_js_CKEDITOR = ''; } fwrite($fp, '$dolibarr_js_CKEDITOR=\''.dol_escape_php($force_dolibarr_js_CKEDITOR, 1).'\';'); fwrite($fp, "\n"); if (empty($force_dolibarr_js_JQUERY)) { fwrite($fp, '//'); - $force_dolibarr_js_JQUERY = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_js_JQUERY = ''; } fwrite($fp, '$dolibarr_js_JQUERY=\''.dol_escape_php($force_dolibarr_js_JQUERY, 1).'\';'); fwrite($fp, "\n"); if (empty($force_dolibarr_js_JQUERY_UI)) { fwrite($fp, '//'); - $force_dolibarr_js_JQUERY_UI = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_js_JQUERY_UI = ''; } fwrite($fp, '$dolibarr_js_JQUERY_UI=\''.dol_escape_php($force_dolibarr_js_JQUERY_UI, 1).'\';'); fwrite($fp, "\n"); @@ -1020,13 +1020,13 @@ function write_conf_file($conffile) fwrite($fp, "\n"); if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fwrite($fp, '//'); - $force_dolibarr_font_DOL_DEFAULT_TTF = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_font_DOL_DEFAULT_TTF = ''; } fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF, 1).'\';'); fwrite($fp, "\n"); if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fwrite($fp, '//'); - $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; } fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD, 1).'\';'); fwrite($fp, "\n"); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c99ff449dce..91ff1f5b7e1 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -3541,7 +3541,7 @@ function main_area($title = '') // Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT if (getDolGlobalString('SHOW_SOCINFO_ON_PRINT') && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'aZ09'))) { - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters); if (empty($reshook)) { print ''."\n"; @@ -3929,7 +3929,7 @@ if (!function_exists("llxFooter")) { } } - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('beforeBodyClose', $parameters); // Note that $action and $object may have been modified by some hooks if ($reshook > 0) { print $hookmanager->resPrint; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 25de2bfb072..e9a89f7e337 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1173,7 +1173,7 @@ class Product extends CommonObject $result = $this->verify(); // We don't check when update called during a create because verify was already done } else { // we can continue - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $result = 0; } if ($result >= 0) { diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 84000fa6692..2530bf431f1 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -3135,7 +3135,7 @@ class Ticket extends CommonObject if ($mode == 'opened') { $status = 'openall'; //$delay_warning = $conf->ticket->warning_delay; - $delay_warning = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment + $delay_warning = 0; $label = $langs->trans("MenuListNonClosed"); $labelShort = $langs->trans("MenuListNonClosed"); } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index eff45f3f609..eeb31d66107 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -3134,7 +3134,7 @@ class User extends CommonObject if ($option == 'xxx') { $linkstart = ''; - $linkend = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment + $linkend = ''; } if ($option == 'nolink') { diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php index 96e110a7b41..a7b2f21a4d3 100644 --- a/htdocs/webportal/class/html.formlistwebportal.class.php +++ b/htdocs/webportal/class/html.formlistwebportal.class.php @@ -303,7 +303,7 @@ class FormListWebPortal $sql .= " FROM " . $this->db->prefix() . $object->table_element . " as t"; // Add table from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; if ($object->ismultientitymanaged == 1) { @@ -349,7 +349,7 @@ class FormListWebPortal // $sql .= natural_search(array_keys($fieldstosearchall), $search_all); //} // Add where from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; @@ -428,7 +428,7 @@ class FormListWebPortal } } // Add $param from hooks - $parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment + $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php index a062c5c9361..ee681c18c73 100644 --- a/htdocs/webservices/server_category.php +++ b/htdocs/webservices/server_category.php @@ -233,7 +233,7 @@ function getCategory($authentication, $id) if (!$error) { $fuser->getrights(); - $nbmax = 10; // @phan-suppress-current-line PhanPluginRedundantAssignment + $nbmax = 10; if ($fuser->hasRight('categorie', 'lire')) { $categorie = new Categorie($db); $result = $categorie->fetch($id);