fix: plus d'include_spip pour charger les classes d'archiviste

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 ### Changed
 
+- Appel de l'archiviste via `use Spip\Archiver\SpipArchiver`
 - Compatible SPIP 5.0.0-dev
 
 ### Security

action/ajouter_documents.php

 <?php
 
+use Spip\Archiver\SpipArchiver;
+
 /***************************************************************************\
  *  SPIP, Système de publication pour l'internet                           *
  *                                                                         *
@@ -467,8 +469,7 @@ function fixer_fichier_upload($file, $mode = '') {
 
 			$source = _DIR_TMP . basename($tmp_dir) . '.' . $ext;
 
-			include_spip('inc/archives');
-			$archive = new Spip\Archives\SpipArchives($source);
+			$archive = new SpipArchiver($source);
 			$res = $archive->emballer([$tmp]);
 
 			effacer_repertoire_temporaire($tmp_dir);

inc/joindre_document.php

 <?php
 
+use Spip\Archiver\SpipArchiver;
+
 /***************************************************************************\
  *  SPIP, Système de publication pour l'internet                           *
  *                                                                         *
@@ -272,10 +274,9 @@ function joindre_verifier_zip($files) {
 		);
 
 		// Est-ce qu'on sait le lire ?
-		include_spip('inc/archives');
 		if (
 			$zip
-			and $archive = new Spip\Archives\SpipArchives($zip)
+			and $archive = new SpipArchiver($zip)
 			and $infos = $archive->informer()
 			and $contenu = joindre_decrire_contenu_zip($infos)
 			and $tmp = sous_repertoire(_DIR_TMP, 'zip')
@@ -336,8 +337,7 @@ function joindre_decrire_contenu_zip($infos) {
 
 
 function joindre_deballer_lister_zip($path, $tmp_dir) {
-	include_spip('inc/archives');
-	$archive = new Spip\Archives\SpipArchives($path);
+	$archive = new SpipArchiver($path);
 
 	if (
 		$infos = $archive->informer()
@@ -399,7 +399,7 @@ if (!function_exists('fixer_extension_document')) {
 /**
  * Gestion des fichiers ZIP
  *
- * @param sring $f
+ * @param string $f
  * @return bool|int
  */
 function accepte_fichier_upload($f) {

phpstan-baseline.neon

@@ -97,7 +97,7 @@ parameters:
 
 		-
 			message: "#^Function include_spip not found\\.$#"
-			count: 10
+			count: 9
 			path: action/ajouter_documents.php
 
 		-
@@ -151,7 +151,7 @@ parameters:
 			path: action/ajouter_documents.php
 
 		-
-			message: "#^Instantiated class Spip\\\\Archives\\\\SpipArchives not found\\.$#"
+			message: "#^Instantiated class Spip\\\\Archiver\\\\SpipArchiver not found\\.$#"
 			count: 1
 			path: action/ajouter_documents.php
 
@@ -1292,7 +1292,7 @@ parameters:
 
 		-
 			message: "#^Function include_spip not found\\.$#"
-			count: 11
+			count: 9
 			path: inc/joindre_document.php
 
 		-
@@ -1341,7 +1341,7 @@ parameters:
 			path: inc/joindre_document.php
 
 		-
-			message: "#^Instantiated class Spip\\\\Archives\\\\SpipArchives not found\\.$#"
+			message: "#^Instantiated class Spip\\\\Archiver\\\\SpipArchiver not found\\.$#"
 			count: 2
 			path: inc/joindre_document.php