spip / SPIP

ecrire/bootstrap/inc/path.php

Spacing +17 added lines, -17 removed lines

@@ -13,7 +13,7 @@ 
  * @param null|array $add List of «plugins» directories to add
  */
 function spip_paths(
-	null|array $add = null,
+	null | array $add = null,
 ): AggregatorInterface {
 	static $paths = null;
 	static $last_dossier_squelettes = null;
@@ -24,13 +24,13 @@ 
 		$paths = new GroupAggregator(Group::cases(), _ROOT_CWD);
 		$paths = $paths->with(Group::App, [
 			_DIR_RACINE,
-			_DIR_RACINE . 'squelettes-dist/',
-			_DIR_RACINE . 'prive/',
+			_DIR_RACINE.'squelettes-dist/',
+			_DIR_RACINE.'prive/',
 			_DIR_RESTREINT,
 		]);
 
-		if (@is_dir(_DIR_RACINE . 'squelettes')) {
-			$paths = $paths->with(Group::Templates, [_DIR_RACINE . 'squelettes']);
+		if (@is_dir(_DIR_RACINE.'squelettes')) {
+			$paths = $paths->with(Group::Templates, [_DIR_RACINE.'squelettes']);
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 			$ds = explode(':', $dossier_squelettes);
 			foreach ($ds as $key => $directory) {
 				if (!str_starts_with($directory, '/')) {
-					$ds[$key] = _DIR_RACINE . $directory;
+					$ds[$key] = _DIR_RACINE.$directory;
 				}
 			}
 			$paths = $paths->with(Group::ExtraTemplates, $ds);
@@ -101,7 +101,7 @@ 
  * @return array
  *     Liste des chemins, par ordre de priorité.
  **/
-function _chemin(string|array|null $dir_path = null): array {
+function _chemin(string | array | null $dir_path = null): array {
 	if (is_array($dir_path) || (is_string($dir_path) && strlen($dir_path))) {
 		spip_paths(add: is_array($dir_path) ? $dir_path : explode(':', $dir_path));
 	}
@@ -117,7 +117,7 @@ 
 function creer_chemin(): array {
 	$dirs = spip_paths()->getDirectories();
 	// canal historique: avec / sauf si ''
-	return array_map(fn ($dir) => $dir === '' ? $dir : $dir . DIRECTORY_SEPARATOR, $dirs);
+	return array_map(fn ($dir) => $dir === '' ? $dir : $dir.DIRECTORY_SEPARATOR, $dirs);
 }
 
 /**
@@ -163,14 +163,14 @@ 
 	// si il y a un .svg a la bonne taille (-16.svg) a cote, on l'utilise en remplacement du -16.png
 	if (
 		preg_match(',-(\d+)[.](png|gif|svg)$,', $file, $m)
-		&& ($file_svg_generique = substr($file, 0, -strlen($m[0])) . '-xx.svg')
+		&& ($file_svg_generique = substr($file, 0, -strlen($m[0])).'-xx.svg')
 		&& ($f = find_in_theme("$file_svg_generique"))
 	) {
-		if (($fsize = substr($f, 0, -6) . $m[1] . '.svg') && file_exists($fsize)) {
+		if (($fsize = substr($f, 0, -6).$m[1].'.svg') && file_exists($fsize)) {
 			return $themefiles["$subdir$file"] = $fsize;
 		}
 		else {
-			return $themefiles["$subdir$file"] = "$f?" . $m[1] . 'px';
+			return $themefiles["$subdir$file"] = "$f?".$m[1].'px';
 		}
 	}
 
@@ -180,7 +180,7 @@ 
 			return $themefiles["$subdir$file"] = $f;
 		}
 	}
-	spip_log("$file introuvable dans le theme prive " . reset($themes), 'theme');
+	spip_log("$file introuvable dans le theme prive ".reset($themes), 'theme');
 
 	return $themefiles["$subdir$file"] = '';
 }
@@ -260,18 +260,18 @@ 
  *     - string : chemin du fichier trouvé
  *     - false : fichier introuvable
  **/
-function find_in_path(string $file, string $dirname = '', bool|string $include = false): ?string {
+function find_in_path(string $file, string $dirname = '', bool | string $include = false): ?string {
 
 	$loader = spip_paths_loader();
 
 	if ($dirname) {
-		$file = rtrim($dirname, '/') . '/' . $file;
+		$file = rtrim($dirname, '/').'/'.$file;
 	}
 
 	$path = $loader->get($file);
 	// find in path retourne des chemins relatif, si possible
 	if ($path !== null && str_starts_with($path, _ROOT_RACINE)) {
-		$path = _DIR_RACINE . substr($path, strlen(_ROOT_RACINE));
+		$path = _DIR_RACINE.substr($path, strlen(_ROOT_RACINE));
 	}
 
 	if ($include === false) {
@@ -326,12 +326,12 @@ 
 	// cas borderline si dans mes_options on appelle redirige_par_entete qui utilise _T et charge un fichier de langue
 	// on a pas encore inclus flock.php
 	if (!function_exists('preg_files')) {
-		include_once _ROOT_RESTREINT . 'inc/flock.php';
+		include_once _ROOT_RESTREINT.'inc/flock.php';
 	}
 
 	// Parcourir le chemin
 	foreach (creer_chemin() as $d) {
-		$f = $d . $dir;
+		$f = $d.$dir;
 		if (@is_dir($f)) {
 			$liste = preg_files($f, $pattern, $maxfiles - count($liste_fichiers), $recurs === true ? [] : $recurs);
 			foreach ($liste as $chemin) {