diff --git a/base/soyezcreateurs.php b/base/soyezcreateurs.php index b54266e01cd078d2ea95cfafaafa34f40520e23a..1e358d574a36b5d95c351ee4cbc73d34bc2625cf 100644 --- a/base/soyezcreateurs.php +++ b/base/soyezcreateurs.php @@ -662,7 +662,7 @@ function create_document($chemin, $objet, $mode, $champs = 'non', $id_document = $type = ($objet['type'] ?? ''); $id_objet = ($objet['id_objet'] ?? 0); spip_log(['tmp_name' => $chemin, 'name' => basename($chemin)], 'docusc'); - if ($id_document = 'non' and $chemin) { + if ($id_document == 'non' and $chemin) { autoriser_exception('associerdocuments', $type, $id_objet); $id_document = action_ajouter_un_document_dist('non', ['tmp_name' => $chemin, 'name' => basename($chemin)], $type, $id_objet, $mode); autoriser_exception('associerdocuments', $type, $id_objet, false); @@ -671,7 +671,8 @@ function create_document($chemin, $objet, $mode, $champs = 'non', $id_document = } return $id_document; } - else { return false; + else { + return false; } } diff --git a/formulaires/newsletter_subscribe.php b/formulaires/newsletter_subscribe.php index 04f93b50de86a6980a8b562c162f02e09d066cf3..90de3fafa43877642b43f8d4271f152cbca490f8 100644 --- a/formulaires/newsletter_subscribe.php +++ b/formulaires/newsletter_subscribe.php @@ -74,8 +74,6 @@ if (defined('_DIR_PLUGIN_MAILSUBSCRIBERS')) { $listes = _request('listes'); if ($listes and is_string($listes)) { $listes = explode(',', $listes); - } - if ($listes and is_array($listes) and count($listes)) { $options['listes'] = $listes; } diff --git a/inc/sc_agenda.php b/inc/sc_agenda.php index f425022b8f886ba2e779cc995984caafe9e2539a..e64b68ee26943f9ef2c809727d30ee958842012e 100644 --- a/inc/sc_agenda.php +++ b/inc/sc_agenda.php @@ -1140,7 +1140,7 @@ $raz = $regs[1]; $href = parametre_url($href, 'prive', $prive); $href = parametre_url($href, 'ancre', $ancre); - $href = calendrier_args_date($href, $annee, $mois, $jour, '', "$arg_echelle" . ((DEFAUT_PARTIE == DEFAUT_PARTIE_R) ? '' : ('&partie_cal=' . DEFAUT_PARTIE_R))); + $href = calendrier_args_date($href, $annee, $mois, $jour, '', "$arg_echelle"); $id = ($ancre ?: 'agenda') . '-nav'; $onmouseover = "if (!this.trimestre)\n{this.trimestre=!charger_node_url('$href', document.getElementById('$id'));}\n;$('#$id').css('visibility','visible').show();"; @@ -1404,7 +1404,7 @@ function http_calendrier_agenda_rv( (($jour_semaine == 1) ? " calendrier-$spip_lang_left" : (($jour_semaine == 7) ? " calendrier-$spip_lang_right" : '')); - $type = ($semaine ? 'semaine' : 'jour') ; + $type = 'semaine'; } else { if ($j == $jour_today and $cemois) { $toile = ' jour_encours'; @@ -1425,8 +1425,7 @@ function http_calendrier_agenda_rv( $corps = $fclic($script, $annee, $mois, $j, $type, '', $ancre, '', $title, '', '', $j); $ligne .= "\n<td class='$class'>$corps</td>"; if ($jour_semaine == 7) { - if ($ligne) { $total .= "\n<tr>$ligne</tr>"; - } + $total .= "\n<tr>$ligne</tr>"; $ligne = ''; } } diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index a1798273efa6dd01dc79228b5f027a94e4634edd..82061d877b0bf6c80c8fa03485871c71aac7e2c3 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -875,6 +875,11 @@ parameters: count: 1 path: soyezcreateurs_fonctions.php + - + message: "#^Unreachable statement \\- code above always terminates\\.$#" + count: 1 + path: soyezcreateurs_fonctions.php + - message: "#^Access to property \\$texte on an unknown class Texte\\.$#" count: 4 diff --git a/phpstan.neon.dist b/phpstan.neon.dist index dc914beda949343396f825d43b235c29275da1ac..2b7c2fddfb0b852b3c013fd4c23ff15f0d565b54 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -7,6 +7,6 @@ parameters: excludePaths: analyseAndScan: - lang - level: 3 + level: 4 bootstrapFiles: - phpstan-constants.php