Inspection of "PHP 8.1 Deprecated--, sans SVP, éviter urldecode(n..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 8e96c3...1bc8da )

by cam

created 2022-01-22 15:52 UTC

Status

Indentation +75 added lines, -75 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 include_spip('inc/charsets');
 
@@ -27,90 +27,90 @@  discard block
 block discarded – undo
  * @return string
  */
 function plugins_afficher_liste_dist(
-	$url_page,
-	$liste_plugins,
-	$liste_plugins_checked,
-	$liste_plugins_actifs,
-	$dir_plugins = _DIR_PLUGINS,
-	$afficher_un = 'afficher_plugin'
+    $url_page,
+    $liste_plugins,
+    $liste_plugins_checked,
+    $liste_plugins_actifs,
+    $dir_plugins = _DIR_PLUGINS,
+    $afficher_un = 'afficher_plugin'
 ) {
-	$get_infos = charger_fonction('get_infos', 'plugins');
-	$ligne_plug = charger_fonction($afficher_un, 'plugins');
+    $get_infos = charger_fonction('get_infos', 'plugins');
+    $ligne_plug = charger_fonction($afficher_un, 'plugins');
 
-	$all_infos = $get_infos($liste_plugins, false, $dir_plugins);
+    $all_infos = $get_infos($liste_plugins, false, $dir_plugins);
 
-	$all_infos = pipeline(
-		'filtrer_liste_plugins',
-		[
-			'args' => [
-				'liste_plugins' => $liste_plugins,
-				'liste_plugins_checked' => $liste_plugins_checked,
-				'liste_plugins_actifs' => $liste_plugins_actifs,
-				'dir_plugins' => $dir_plugins
-			],
-			'data' => $all_infos
-		]
-	);
+    $all_infos = pipeline(
+        'filtrer_liste_plugins',
+        [
+            'args' => [
+                'liste_plugins' => $liste_plugins,
+                'liste_plugins_checked' => $liste_plugins_checked,
+                'liste_plugins_actifs' => $liste_plugins_actifs,
+                'dir_plugins' => $dir_plugins
+            ],
+            'data' => $all_infos
+        ]
+    );
 
-	$liste_plugins = array_flip($liste_plugins);
-	foreach ($liste_plugins as $chemin => $v) {
-		// des plugins ont pu etre enleves de la liste par le pipeline. On en tient compte.
-		if (isset($all_infos[$chemin])) {
-			$liste_plugins[$chemin] = strtoupper(trim(typo(translitteration(unicode2charset(html2unicode($all_infos[$chemin]['nom']))))));
-		} else {
-			unset($liste_plugins[$chemin]);
-		}
-	}
-	asort($liste_plugins);
-	$exposed = urldecode(_request('plugin') ?? '');
+    $liste_plugins = array_flip($liste_plugins);
+    foreach ($liste_plugins as $chemin => $v) {
+        // des plugins ont pu etre enleves de la liste par le pipeline. On en tient compte.
+        if (isset($all_infos[$chemin])) {
+            $liste_plugins[$chemin] = strtoupper(trim(typo(translitteration(unicode2charset(html2unicode($all_infos[$chemin]['nom']))))));
+        } else {
+            unset($liste_plugins[$chemin]);
+        }
+    }
+    asort($liste_plugins);
+    $exposed = urldecode(_request('plugin') ?? '');
 
-	$block_par_lettre = false;//count($liste_plugins)>10;
-	$fast_liste_plugins_actifs = [];
-	$fast_liste_plugins_checked = [];
-	if (is_array($liste_plugins_actifs)) {
-		$fast_liste_plugins_actifs = array_flip($liste_plugins_actifs);
-	}
-	if (is_array($liste_plugins_checked)) {
-		$fast_liste_plugins_checked = array_flip($liste_plugins_checked);
-	}
+    $block_par_lettre = false;//count($liste_plugins)>10;
+    $fast_liste_plugins_actifs = [];
+    $fast_liste_plugins_checked = [];
+    if (is_array($liste_plugins_actifs)) {
+        $fast_liste_plugins_actifs = array_flip($liste_plugins_actifs);
+    }
+    if (is_array($liste_plugins_checked)) {
+        $fast_liste_plugins_checked = array_flip($liste_plugins_checked);
+    }
 
-	$res = '';
-	$block = '';
-	$initiale = '';
-	$block_actif = false;
-	foreach ($liste_plugins as $plug => $nom) {
-		if (($i = substr($nom, 0, 1)) !== $initiale) {
-			$res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
-			$initiale = $i;
-			$block = '';
-			$block_actif = false;
-		}
-		// le rep suivant
-		$actif = isset($fast_liste_plugins_actifs[$plug]);
-		$checked = isset($fast_liste_plugins_checked[$plug]);
-		$block_actif = $block_actif | $actif;
-		$expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
-			$dir_plugins,
-			strlen(_DIR_RACINE)
-		) . $plug));
-		$block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
-	}
-	$res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
-	$class = basename($dir_plugins);
+    $res = '';
+    $block = '';
+    $initiale = '';
+    $block_actif = false;
+    foreach ($liste_plugins as $plug => $nom) {
+        if (($i = substr($nom, 0, 1)) !== $initiale) {
+            $res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
+            $initiale = $i;
+            $block = '';
+            $block_actif = false;
+        }
+        // le rep suivant
+        $actif = isset($fast_liste_plugins_actifs[$plug]);
+        $checked = isset($fast_liste_plugins_checked[$plug]);
+        $block_actif = $block_actif | $actif;
+        $expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
+            $dir_plugins,
+            strlen(_DIR_RACINE)
+        ) . $plug));
+        $block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
+    }
+    $res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
+    $class = basename($dir_plugins);
 
-	return $res ? "<ul class='liste-items plugins $class'>$res</ul>" : '';
+    return $res ? "<ul class='liste-items plugins $class'>$res</ul>" : '';
 }
 
 
 function affiche_block_initiale($initiale, $block, $block_actif) {
-	if (strlen($block)) {
-		return "<li class='item'>"
-		. bouton_block_depliable($initiale, $block_actif ? true : false)
-		. debut_block_depliable($block_actif)
-		. "<ul>$block</ul>"
-		. fin_block()
-		. '</li>';
-	}
+    if (strlen($block)) {
+        return "<li class='item'>"
+        . bouton_block_depliable($initiale, $block_actif ? true : false)
+        . debut_block_depliable($block_actif)
+        . "<ul>$block</ul>"
+        . fin_block()
+        . '</li>';
+    }
 
-	return '';
+    return '';
 }

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -64,7 +64,7 @@  discard block
 block discarded – undo
 	asort($liste_plugins);
 	$exposed = urldecode(_request('plugin') ?? '');
 
-	$block_par_lettre = false;//count($liste_plugins)>10;
+	$block_par_lettre = false; //count($liste_plugins)>10;
 	$fast_liste_plugins_actifs = [];
 	$fast_liste_plugins_checked = [];
 	if (is_array($liste_plugins_actifs)) {
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
 		$actif = isset($fast_liste_plugins_actifs[$plug]);
 		$checked = isset($fast_liste_plugins_checked[$plug]);
 		$block_actif = $block_actif | $actif;
-		$expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
+		$expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins.$plug or $exposed == substr(
 			$dir_plugins,
 			strlen(_DIR_RACINE)
-		) . $plug));
-		$block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
+		).$plug));
+		$block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins)."\n";
 	}
 	$res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
 	$class = basename($dir_plugins);

Please login to merge, or discard this patch.

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	\***************************************************************************/
12	12
13	13	if (!defined('_ECRIRE_INC_VERSION')) {
14		- return;
	14	+ return;
15	15	}
16	16	include_spip('inc/charsets');
17	17
		@@ -27,90 +27,90 @@ discard block
		block discarded – undo
27	27	* @return string
28	28	*/
29	29	function plugins_afficher_liste_dist(
30		- $url_page,
31		- $liste_plugins,
32		- $liste_plugins_checked,
33		- $liste_plugins_actifs,
34		- $dir_plugins = _DIR_PLUGINS,
35		- $afficher_un = 'afficher_plugin'
	30	+ $url_page,
	31	+ $liste_plugins,
	32	+ $liste_plugins_checked,
	33	+ $liste_plugins_actifs,
	34	+ $dir_plugins = _DIR_PLUGINS,
	35	+ $afficher_un = 'afficher_plugin'
36	36	) {
37		- $get_infos = charger_fonction('get_infos', 'plugins');
38		- $ligne_plug = charger_fonction($afficher_un, 'plugins');
	37	+ $get_infos = charger_fonction('get_infos', 'plugins');
	38	+ $ligne_plug = charger_fonction($afficher_un, 'plugins');
39	39
40		- $all_infos = $get_infos($liste_plugins, false, $dir_plugins);
	40	+ $all_infos = $get_infos($liste_plugins, false, $dir_plugins);
41	41
42		- $all_infos = pipeline(
43		- 'filtrer_liste_plugins',
44		- [
45		- 'args' => [
46		- 'liste_plugins' => $liste_plugins,
47		- 'liste_plugins_checked' => $liste_plugins_checked,
48		- 'liste_plugins_actifs' => $liste_plugins_actifs,
49		- 'dir_plugins' => $dir_plugins
50		- ],
51		- 'data' => $all_infos
52		- ]
53		- );
	42	+ $all_infos = pipeline(
	43	+ 'filtrer_liste_plugins',
	44	+ [
	45	+ 'args' => [
	46	+ 'liste_plugins' => $liste_plugins,
	47	+ 'liste_plugins_checked' => $liste_plugins_checked,
	48	+ 'liste_plugins_actifs' => $liste_plugins_actifs,
	49	+ 'dir_plugins' => $dir_plugins
	50	+ ],
	51	+ 'data' => $all_infos
	52	+ ]
	53	+ );
54	54
55		- $liste_plugins = array_flip($liste_plugins);
56		- foreach ($liste_plugins as $chemin => $v) {
57		- // des plugins ont pu etre enleves de la liste par le pipeline. On en tient compte.
58		- if (isset($all_infos[$chemin])) {
59		- $liste_plugins[$chemin] = strtoupper(trim(typo(translitteration(unicode2charset(html2unicode($all_infos[$chemin]['nom']))))));
60		- } else {
61		- unset($liste_plugins[$chemin]);
62		- }
63		- }
64		- asort($liste_plugins);
65		- $exposed = urldecode(_request('plugin') ?? '');
	55	+ $liste_plugins = array_flip($liste_plugins);
	56	+ foreach ($liste_plugins as $chemin => $v) {
	57	+ // des plugins ont pu etre enleves de la liste par le pipeline. On en tient compte.
	58	+ if (isset($all_infos[$chemin])) {
	59	+ $liste_plugins[$chemin] = strtoupper(trim(typo(translitteration(unicode2charset(html2unicode($all_infos[$chemin]['nom']))))));
	60	+ } else {
	61	+ unset($liste_plugins[$chemin]);
	62	+ }
	63	+ }
	64	+ asort($liste_plugins);
	65	+ $exposed = urldecode(_request('plugin') ?? '');
66	66
67		- $block_par_lettre = false;//count($liste_plugins)>10;
68		- $fast_liste_plugins_actifs = [];
69		- $fast_liste_plugins_checked = [];
70		- if (is_array($liste_plugins_actifs)) {
71		- $fast_liste_plugins_actifs = array_flip($liste_plugins_actifs);
72		- }
73		- if (is_array($liste_plugins_checked)) {
74		- $fast_liste_plugins_checked = array_flip($liste_plugins_checked);
75		- }
	67	+ $block_par_lettre = false;//count($liste_plugins)>10;
	68	+ $fast_liste_plugins_actifs = [];
	69	+ $fast_liste_plugins_checked = [];
	70	+ if (is_array($liste_plugins_actifs)) {
	71	+ $fast_liste_plugins_actifs = array_flip($liste_plugins_actifs);
	72	+ }
	73	+ if (is_array($liste_plugins_checked)) {
	74	+ $fast_liste_plugins_checked = array_flip($liste_plugins_checked);
	75	+ }
76	76
77		- $res = '';
78		- $block = '';
79		- $initiale = '';
80		- $block_actif = false;
81		- foreach ($liste_plugins as $plug => $nom) {
82		- if (($i = substr($nom, 0, 1)) !== $initiale) {
83		- $res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
84		- $initiale = $i;
85		- $block = '';
86		- $block_actif = false;
87		- }
88		- // le rep suivant
89		- $actif = isset($fast_liste_plugins_actifs[$plug]);
90		- $checked = isset($fast_liste_plugins_checked[$plug]);
91		- $block_actif = $block_actif \| $actif;
92		- $expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
93		- $dir_plugins,
94		- strlen(_DIR_RACINE)
95		- ) . $plug));
96		- $block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
97		- }
98		- $res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
99		- $class = basename($dir_plugins);
	77	+ $res = '';
	78	+ $block = '';
	79	+ $initiale = '';
	80	+ $block_actif = false;
	81	+ foreach ($liste_plugins as $plug => $nom) {
	82	+ if (($i = substr($nom, 0, 1)) !== $initiale) {
	83	+ $res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
	84	+ $initiale = $i;
	85	+ $block = '';
	86	+ $block_actif = false;
	87	+ }
	88	+ // le rep suivant
	89	+ $actif = isset($fast_liste_plugins_actifs[$plug]);
	90	+ $checked = isset($fast_liste_plugins_checked[$plug]);
	91	+ $block_actif = $block_actif \| $actif;
	92	+ $expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
	93	+ $dir_plugins,
	94	+ strlen(_DIR_RACINE)
	95	+ ) . $plug));
	96	+ $block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
	97	+ }
	98	+ $res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
	99	+ $class = basename($dir_plugins);
100	100
101		- return $res ? "<ul class='liste-items plugins $class'>$res</ul>" : '';
	101	+ return $res ? "<ul class='liste-items plugins $class'>$res</ul>" : '';
102	102	}
103	103
104	104
105	105	function affiche_block_initiale($initiale, $block, $block_actif) {
106		- if (strlen($block)) {
107		- return "<li class='item'>"
108		- . bouton_block_depliable($initiale, $block_actif ? true : false)
109		- . debut_block_depliable($block_actif)
110		- . "<ul>$block</ul>"
111		- . fin_block()
112		- . '</li>';
113		- }
	106	+ if (strlen($block)) {
	107	+ return "<li class='item'>"
	108	+ . bouton_block_depliable($initiale, $block_actif ? true : false)
	109	+ . debut_block_depliable($block_actif)
	110	+ . "<ul>$block</ul>"
	111	+ . fin_block()
	112	+ . '</li>';
	113	+ }
114	114
115		- return '';
	115	+ return '';
116	116	}

		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	asort($liste_plugins);
65	65	$exposed = urldecode(_request('plugin') ?? '');
66	66
67		- $block_par_lettre = false;//count($liste_plugins)>10;
	67	+ $block_par_lettre = false; //count($liste_plugins)>10;
68	68	$fast_liste_plugins_actifs = [];
69	69	$fast_liste_plugins_checked = [];
70	70	if (is_array($liste_plugins_actifs)) {
		@@ -89,11 +89,11 @@ discard block
		block discarded – undo
89	89	$actif = isset($fast_liste_plugins_actifs[$plug]);
90	90	$checked = isset($fast_liste_plugins_checked[$plug]);
91	91	$block_actif = $block_actif \| $actif;
92		- $expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins . $plug or $exposed == substr(
	92	+ $expose = ($exposed and ($exposed == $plug or $exposed == $dir_plugins.$plug or $exposed == substr(
93	93	$dir_plugins,
94	94	strlen(_DIR_RACINE)
95		- ) . $plug));
96		- $block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins) . "\n";
	95	+ ).$plug));
	96	+ $block .= $ligne_plug($url_page, $plug, $checked, $actif, $expose, 'item', $dir_plugins)."\n";
97	97	}
98	98	$res .= $block_par_lettre ? affiche_block_initiale($initiale, $block, $block_actif) : $block;
99	99	$class = basename($dir_plugins);

spip / SPIP

Push — master ( 8e96c3...1bc8da )

Status

Category

Indentation +75 added lines, -75 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch