From 8234c9a4319286b1e450cc4112e573e971b000f9 Mon Sep 17 00:00:00 2001 From: RealET <real3t@gmail.com> Date: Mon, 3 Apr 2023 21:59:06 +0200 Subject: [PATCH] build : phpstan level 3 --- phpstan.neon.dist | 2 +- soyezcreateurs_administrations.php | 1 + soyezcreateurs_fonctions.php | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 05b23359..dc914bed 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -7,6 +7,6 @@ parameters: excludePaths: analyseAndScan: - lang - level: 2 + level: 3 bootstrapFiles: - phpstan-constants.php diff --git a/soyezcreateurs_administrations.php b/soyezcreateurs_administrations.php index cbfd90cf..4cb73a44 100644 --- a/soyezcreateurs_administrations.php +++ b/soyezcreateurs_administrations.php @@ -48,6 +48,7 @@ function soyezcreateurs_upgrade($nom_meta_base_version, $version_cible) { $maj['3.1.53'] = [ ['soyezcreateurs_3_1_53'] ]; $maj['3.1.54'] = [ ['soyezcreateurs_3_1_54'] ]; $maj['3.1.55'] = [ ['soyezcreateurs_3_1_55'] ]; + $maj['3.1.58'] = []; cextras_api_upgrade(soyezcreateurs_declarer_champs_extras(), $maj['3.1.58']); $maj['3.1.59'] = [ ['soyezcreateurs_3_1_59'] ]; $maj['3.1.62'] = [ diff --git a/soyezcreateurs_fonctions.php b/soyezcreateurs_fonctions.php index 5432c68a..fbec90b6 100644 --- a/soyezcreateurs_fonctions.php +++ b/soyezcreateurs_fonctions.php @@ -460,7 +460,7 @@ function sc_generer_ligne_agenda($jour, $amj, $evts, $type, $agenda) { //s'il n'y a qu'un evenement else { if ($agenda == 'grand') { - $aff['ligne'] .= intval($jour); + $aff['ligne'] = intval($jour); $aff['ligne'] .= '<div class="odd">'; $row = sc_trouver_corr_pl($evts[0]['ID']); $row2 = sc_trouver_corr_un($evts[0]['ID']); @@ -721,21 +721,21 @@ function critere_archive_dist($idb, &$boucles, $crit) { $art = $boucle->id_table . '.id_article'; $select_article = sql_get_select( $art, - 'spip_articles AS `articlesin` - INNER JOIN spip_mots_liens AS mots_liens_articles + 'spip_articles AS `articlesin` + INNER JOIN spip_mots_liens AS mots_liens_articles ON (articlesin.id_article = mots_liens_articles.id_objet AND mots_liens_articles.objet="article") - INNER JOIN spip_mots AS mots_articles + INNER JOIN spip_mots AS mots_articles ON (mots_liens_articles.id_mot=mots_articles.id_mot)', ["articlesin.id_article = $art",'mots_articles.titre="Archives"'] ); $select_article_rubrique = sql_get_select( $art, - 'spip_articles AS `articlesin` - INNER JOIN spip_rubriques AS rubriques + 'spip_articles AS `articlesin` + INNER JOIN spip_rubriques AS rubriques ON (articlesin.id_rubrique = rubriques.id_rubrique) - INNER JOIN spip_mots_liens AS mots_liens_rubriques + INNER JOIN spip_mots_liens AS mots_liens_rubriques ON (rubriques.id_rubrique = mots_liens_rubriques.id_objet AND mots_liens_rubriques.objet="rubrique") - INNER JOIN spip_mots AS mots_articles ON + INNER JOIN spip_mots AS mots_articles ON (mots_liens_rubriques.id_mot=mots_articles.id_mot)', ["articlesin.id_article = $art",'mots_articles.titre="Archives"'] ); -- GitLab