spip / SPIP

ecrire/tests/Sql/SqlSchemaTableTest.php

Spacing +16 added lines, -16 removed lines

@@ -63,8 +63,8 @@ 
 	#[Depends('testInsertData')]
 	public function testMajTimestamp() {
 		$table = 'spip_test_tintin';
-		$where1 = 'id_tintin=' . sql_quote(1);
-		$where2 = 'id_tintin=' . sql_quote(2);
+		$where1 = 'id_tintin='.sql_quote(1);
+		$where2 = 'id_tintin='.sql_quote(2);
 
 		// lecture du timestamp actuel
 		$maj1 = sql_getfetsel('maj', $table, $where1);
@@ -123,17 +123,17 @@ 
 		$this->assertEquals(count($data), sql_count($res), 'sql_count() ne renvoie pas la valeur attendue');
 
 		// selection float
-		$res = sql_select('*', 'spip_test_tintin', ['un_double>' . sql_quote(3)]);
+		$res = sql_select('*', 'spip_test_tintin', ['un_double>'.sql_quote(3)]);
 		$n = count(array_filter($data, fn ($entry) => $entry['un_double'] > 3));
 		$this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur un float');
 
 		// selection REGEXP
-		$res = sql_select('*', 'spip_test_tintin', ['un_varchar REGEXP ' . sql_quote('^De')]);
+		$res = sql_select('*', 'spip_test_tintin', ['un_varchar REGEXP '.sql_quote('^De')]);
 		$n = count(array_filter($data, fn ($entry) => str_starts_with($entry['un_varchar'], 'De')));
 		$this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur une REGEXP');
 
 		// selection LIKE
-		$res = sql_select('*', 'spip_test_tintin', ['un_varchar LIKE ' . sql_quote('De%')]);
+		$res = sql_select('*', 'spip_test_tintin', ['un_varchar LIKE '.sql_quote('De%')]);
 		$this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur un LIKE');
 
 		// selection array(champs)
@@ -167,7 +167,7 @@ 
 				'en' => 'Krack',
 			] as $lg => $res
 		) {
-			$multi = sql_getfetsel(sql_multi('grrrr', $lg), 'spip_test_milou', 'id_milou=' . sql_quote(2));
+			$multi = sql_getfetsel(sql_multi('grrrr', $lg), 'spip_test_milou', 'id_milou='.sql_quote(2));
 			$this->assertEquals($res, $multi, 'sql_multi mal rendu');
 		}
 
@@ -178,7 +178,7 @@ 
 				'en' => 'Aérieny',
 			] as $lg => $res
 		) {
-			$multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock=' . sql_quote(2));
+			$multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock='.sql_quote(2));
 			$this->assertEquals($res, $multi, 'sql_multi avec accents, mal rendu');
 		}
 
@@ -190,7 +190,7 @@ 
 				'de' => 'Un début de chaine : Vinasse, et [la fin]',
 			] as $lg => $res
 		) {
-			$multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock=' . sql_quote(4));
+			$multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock='.sql_quote(4));
 			$this->assertEquals($res, $multi, 'sql_multi avec crochets, mal rendu');
 		}
 	}
@@ -291,10 +291,10 @@ 
 				'2.0/2' => (2.0 / 2),
 				'2/2' => (2 / 2),
 				'md5(8)' => md5('8'),
-				'md5(' . sql_quote('a') . ')' => md5('a'),
+				'md5('.sql_quote('a').')' => md5('a'),
 			] as $func => $expected
 		) {
-			$nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin=' . sql_quote(1)]);
+			$nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin='.sql_quote(1)]);
 			$this->assertEquals($expected, $nb, "Selection {$func} en echec");
 		}
 	}
@@ -307,11 +307,11 @@ 
 	function testStringFunctions() {
 		foreach (
 			[
-				'CONCAT(' . sql_quote('cou') . ',' . sql_quote('cou') . ')' => 'coucou',
-				'CONCAT(' . sql_quote('cou,') . ',' . sql_quote('cou') . ')' => 'cou,cou',
+				'CONCAT('.sql_quote('cou').','.sql_quote('cou').')' => 'coucou',
+				'CONCAT('.sql_quote('cou,').','.sql_quote('cou').')' => 'cou,cou',
 			] as $func => $expected
 		) {
-			$nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin=' . sql_quote(1)]);
+			$nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin='.sql_quote(1)]);
 			$this->assertEquals($expected, $nb, "Selection {$func} en echec");
 		}
 	}
@@ -339,11 +339,11 @@ 
 	#[Depends('testInsertData')]
 	public function testUpdateData() {
 		// ajouter un champ
-		$nb = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin=' . sql_quote(1));
+		$nb = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin='.sql_quote(1));
 		sql_update('spip_test_tintin', [
 			'un_bigint' => 'un_bigint+2',
 		]);
-		$nb2 = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin=' . sql_quote(1));
+		$nb2 = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin='.sql_quote(1));
 		$this->assertEquals($nb + 2, $nb2, 'sql_update n’a pas fait l’adition !');
 	}
 
@@ -355,7 +355,7 @@ 
 	public function test_delete_data() {
 		$nb = sql_countsel('spip_test_tintin');
 		// supprimer une ligne
-		sql_delete('spip_test_tintin', 'id_tintin=' . sql_quote(1));
+		sql_delete('spip_test_tintin', 'id_tintin='.sql_quote(1));
 		$this->assertEquals($nb - 1, sql_countsel('spip_test_tintin'), "sql_delete n’a pas supprimé la ligne");
 
 		// supprimer tout

Indentation +685 added lines, -685 removed lines

@@ -10,689 +10,689 @@
 
 class SqlSchemaTableTest extends TestCase
 {
-	public static function setUpBeforeClass(): void
-	{
-		find_in_path('base/abstract_sql.php', '', true);
-	}
-
-	#[DataProvider('providerTablesData')]
-	public function testDropTablesSetup($table, $desc, $data): void
-	{
-		$this->assertTrue(sql_drop_table($table, true));
-	}
-
-	#[Depends('testDropTablesSetup')]
-	#[DataProvider('providerTablesData')]
-	public function testCreateTables($table, $desc, $data): void
-	{
-		$this->assertTrue(sql_create($table, $desc['field'], $desc['key']));
-	}
-
-	/**
-	 * Creation/suppression/analyse de tables dans la base de donnee
-	 *
-	 * Permet de verifier que
-	 * - tous les champs sont correctement ajoutes
-	 * - que les PRIMARY sont pris en compte
-	 * - que les KEY sont prises en compte
-	 */
-	#[Depends('testCreateTables')]
-	#[DataProvider('providerTablesData')]
-	public function testShowTable($table, $desc, $data) {
-		// lire la structure de la table
-		// la structure doit avoir le meme nombre de champs et de cle
-		// attention : la primary key DOIT etre dans les cle aussi
-		$_desc = sql_showtable($table);
-		$this->assertCount(count($desc['field']), $_desc['field']);
-		$this->assertCount($desc['nb_key_attendues'], $_desc['key']);
-	}
-
-	#[Depends('testCreateTables')]
-	#[DataProvider('providerTablesData')]
-	public function testInsertData($table, $desc, $data) {
-		$this->assertNotFalse(sql_insertq_multi($table, $data));
-		$this->assertEquals(count($data), sql_countsel($table));
-	}
-
-	/**
-	 * Teste que le champ "maj" s'actualise bien sur les update
-	 * ainsi que les autres champs !
-	 *
-	 * utilise sql_quote, sql_getfetsel, sql_update et sql_updateq.
-	 */
-	#[Depends('testInsertData')]
-	public function testMajTimestamp() {
-		$table = 'spip_test_tintin';
-		$where1 = 'id_tintin=' . sql_quote(1);
-		$where2 = 'id_tintin=' . sql_quote(2);
-
-		// lecture du timestamp actuel
-		$maj1 = sql_getfetsel('maj', $table, $where1);
-		$this->assertNotEmpty($maj1, "Le champ 'maj' n'a vraisemblablement pas recu de timestamp à l'insertion");
-
-		$maj2 = sql_getfetsel('maj', $table, $where2);
-		$this->assertNotEmpty($maj2, "Le champ 'maj' n'a vraisemblablement pas recu de timestamp à l'insertion");
-
-		// 1s de plus, sinon le timestamp ne change pas !
-		sleep(1);
-
-		// update
-		$texte = 'nouveau texte';
-		sql_update($table, [
-			'un_texte' => sql_quote($texte),
-		], $where1);
-
-		// comparaison timastamp
-		$maj_update = sql_getfetsel('maj', $table, $where1);
-		$this->assertNotEmpty($maj_update, "Le champ 'maj' est vide à l’update");
-		$this->assertNotFalse(strtotime($maj_update), "Le champ 'maj' est incorrect à l’update");
-		$this->assertNotEquals($maj1, $maj_update, "Le champ 'maj' n'a vraisemblablement pas été mis a jour lors de l'update");
-
-		// comparaison texte
-		$texte_update = sql_getfetsel('un_texte', $table, $where1);
-		$this->assertNotEmpty($texte_update, "Le champ 'un_texte' est vide à l’update");
-		$this->assertEquals($texte, $texte_update, "Le champ 'un_texte' n'est pas correctement rempli a l'update");
-
-		// idem avec updateq
-		$texte = 'encore un nouveau texte';
-		sql_updateq($table, [
-			'un_texte' => $texte,
-		], $where2);
-
-		// comparaison timastamp
-		$maj_updateq = sql_getfetsel('maj', $table, $where2);
-		$this->assertNotEmpty($maj_updateq, "Le champ 'maj' est vide à l’updateq");
-		$this->assertNotFalse(strtotime($maj_updateq), "Le champ 'maj' est incorrect à l’updateq");
-		$this->assertNotEquals($maj1, $maj_updateq, "Le champ 'maj' n'a vraisemblablement pas été mis a jour lors de l'updateq");
-
-		// comparaison texte
-		$texte_updateq = sql_getfetsel('un_texte', $table, $where2);
-		$this->assertNotEmpty($texte_updateq, "Le champ 'un_texte' est vide à l’updateq");
-		$this->assertEquals($texte, $texte_updateq, "Le champ 'un_texte' n'est pas correctement rempli a l'updateq");
-	}
-
-	/**
-	 * Selections diverses selon criteres
-	 */
-	#[Depends('testInsertData')]
-	public function testSelections() {
-		$data = $this->providerTablesData()['tintin'][2];
-
-		$res = sql_select('*', 'spip_test_tintin');
-		$this->assertNotFalse($res);
-		$this->assertEquals(count($data), sql_count($res), 'sql_count() ne renvoie pas la valeur attendue');
-
-		// selection float
-		$res = sql_select('*', 'spip_test_tintin', ['un_double>' . sql_quote(3)]);
-		$n = count(array_filter($data, fn ($entry) => $entry['un_double'] > 3));
-		$this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur un float');
-
-		// selection REGEXP
-		$res = sql_select('*', 'spip_test_tintin', ['un_varchar REGEXP ' . sql_quote('^De')]);
-		$n = count(array_filter($data, fn ($entry) => str_starts_with($entry['un_varchar'], 'De')));
-		$this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur une REGEXP');
-
-		// selection LIKE
-		$res = sql_select('*', 'spip_test_tintin', ['un_varchar LIKE ' . sql_quote('De%')]);
-		$this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur un LIKE');
-
-		// selection array(champs)
-		$res = sql_fetsel(['id_tintin', 'un_varchar'], 'spip_test_tintin');
-		$this->assertArrayHasKey('id_tintin', $res);
-		$this->assertArrayHasKey('un_varchar', $res);
-
-		// selection array(champs=>alias)
-		$res = sql_fetsel(['id_tintin AS id', 'un_varchar AS vchar'], 'spip_test_tintin');
-		$this->assertArrayHasKey('id', $res);
-		$this->assertArrayHasKey('vchar', $res);
-	}
-
-
-	#[Depends('testInsertData')]
-	public function testSelectionsMulti() {
-		$data = $this->providerTablesData()['milou'][2];
-
-		// selection avec sql_multi
-		$res = sql_select(['id_milou', sql_multi('grrrr', 'fr')], 'spip_test_milou', orderby: 'multi');
-		$this->assertNotFalse($res);
-		$this->assertEquals(count($data), sql_count($res), 'sql_multi mal interprété');
-		$this->assertEquals(3, sql_fetch($res)['id_milou'], 'sql_multi order by multi raté');
-		$this->assertEquals(2, sql_fetch($res)['id_milou'], 'sql_multi order by multi raté');
-		$this->assertEquals(1, sql_fetch($res)['id_milou'], 'sql_multi order by multi raté');
-
-		// le bon texte avec multi
-		foreach (
-			[
-				'fr' => 'Crac',
-				'en' => 'Krack',
-			] as $lg => $res
-		) {
-			$multi = sql_getfetsel(sql_multi('grrrr', $lg), 'spip_test_milou', 'id_milou=' . sql_quote(2));
-			$this->assertEquals($res, $multi, 'sql_multi mal rendu');
-		}
-
-		// le bon texte avec multi et accents
-		foreach (
-			[
-				'fr' => 'Aérien',
-				'en' => 'Aérieny',
-			] as $lg => $res
-		) {
-			$multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock=' . sql_quote(2));
-			$this->assertEquals($res, $multi, 'sql_multi avec accents, mal rendu');
-		}
-
-		// le bon texte avec multi et debut et fin de chaine
-		foreach (
-			[
-				'fr' => 'Un début de chaine : Vinasse, et [la fin]',
-				'en' => 'Un début de chaine : Vinassy, et [la fin]',
-				'de' => 'Un début de chaine : Vinasse, et [la fin]',
-			] as $lg => $res
-		) {
-			$multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock=' . sql_quote(4));
-			$this->assertEquals($res, $multi, 'sql_multi avec crochets, mal rendu');
-		}
-	}
-
-
-
-	/**
-	 * Selections diverses entre plusieurs tables
-	 */
-	#[Depends('testInsertData')]
-	public function testSelectionsEntreTable() {
-		// selection 2 tables
-		// ! nombre en dur !
-		$res = sql_select(
-			['spip_test_tintin.id_tintin', 'spip_test_milou.id_milou'],
-			['spip_test_tintin', 'spip_test_milou'],
-			['spip_test_milou.id_tintin=spip_test_tintin.id_tintin']
-		);
-		$this->assertEquals(3, sql_count($res), 'Echec sélection');
-
-		// selection 2 tables avec alias =>
-		// ! nombre en dur !
-		$res = sql_select(
-			['a.id_tintin AS x', 'b.id_milou AS y'],
-			[
-				'a' => 'spip_test_tintin',
-				'b' => 'spip_test_milou',
-			],
-			['a.id_tintin=b.id_tintin']
-		);
-		$this->assertEquals(3, sql_count($res), 'Echec sélection avec alias de colonnes et tables');
-
-		// selection 2 tables avec alias AS
-		// ! nombre en dur !
-		$res = sql_select(
-			['a.id_tintin AS x', 'b.id_milou AS y'],
-			['spip_test_tintin AS a', 'spip_test_milou AS b'],
-			['a.id_tintin=b.id_tintin']
-		);
-		$this->assertEquals(3, sql_count($res));
-
-		// selection 2 tables avec INNER JOIN + ON
-		// ! nombre en dur !
-		$res = sql_select(
-			['a.id_tintin AS x', 'b.id_milou AS y'],
-			['spip_test_tintin AS a INNER JOIN spip_test_milou AS b ON (a.id_tintin=b.id_tintin)']
-		);
-		$this->assertEquals(3, sql_count($res), 'Echec sélection avec INNER JOIN + ON');
-
-		// selection 2 tables avec LEFT JOIN + ON
-		// ! nombre en dur !
-		$res = sql_select(
-			['a.id_tintin AS x', 'b.id_milou AS y'],
-			['spip_test_tintin AS a LEFT JOIN spip_test_milou AS b ON (a.id_tintin=b.id_tintin)']
-		);
-		$this->assertEquals(4, sql_count($res), 'Echec sélection avec LEFT JOIN + ON');
-
-
-		// selection 2 tables avec jointure INNER JOIN + USING
-		// ! nombre en dur !
-		// SQLite 2 se plante : il ne connait pas USING (enleve de la requete,
-		// et du coup ne fait pas correctement la jointure)
-		$res = sql_select(
-			['a.id_tintin AS x', 'b.id_milou AS y'],
-			['spip_test_tintin AS a INNER JOIN spip_test_milou AS b USING (id_tintin)']
-		);
-		$this->assertEquals(3, sql_count($res), 'Echec sélection avec INNER JOIN + USING');
-	}
-
-
-	/**
-	 * Selections mathematiques
-	 */
-	#[Depends('testInsertData')]
-	function testMathFunctions() {
-		foreach (
-			[
-				'COUNT' => 3,
-				'SUM' => 9000,
-				'AVG' => 3000,
-			] as $func => $expected
-		) {
-			$nb = sql_getfetsel("{$func}(un_int) AS nb", ['spip_test_tintin']);
-			$this->assertEquals($expected, $nb, "Selection {$func} en echec");
-		}
-
-		foreach (
-			[
-				'EXP(0)' => exp(0),
-				'ROUND(3.56)' => round(3.56),
-				'ROUND(3.5684,2)' => round(3.5684, 2),
-				'SQRT(9)' => 3,
-				//'1/2'=>(0), // Le standard SQL : entier divise par entier = division entiere (pas trouve la reference)
-				'1.0/2' => (1 / 2), // Le standart SQL : reel divise par entier = reel
-				//'4/3'=>1,
-				'ROUND(4.0/3,2)' => round(4 / 3, 2),
-				'1.5/2' => (1.5 / 2),
-				'2.0/2' => (2.0 / 2),
-				'2/2' => (2 / 2),
-				'md5(8)' => md5('8'),
-				'md5(' . sql_quote('a') . ')' => md5('a'),
-			] as $func => $expected
-		) {
-			$nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin=' . sql_quote(1)]);
-			$this->assertEquals($expected, $nb, "Selection {$func} en echec");
-		}
-	}
-
-	/**
-	 * Selections mathematiques
-	 */
-	#[Depends('testInsertData')]
-
-	function testStringFunctions() {
-		foreach (
-			[
-				'CONCAT(' . sql_quote('cou') . ',' . sql_quote('cou') . ')' => 'coucou',
-				'CONCAT(' . sql_quote('cou,') . ',' . sql_quote('cou') . ')' => 'cou,cou',
-			] as $func => $expected
-		) {
-			$nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin=' . sql_quote(1)]);
-			$this->assertEquals($expected, $nb, "Selection {$func} en echec");
-		}
-	}
-
-	/**
-	 * retours des fonctions d'erreurs lors d'une requete
-	 */
-	#[Depends('testCreateTables')]
-
-	function testErrorFunctions() {
-		// requete sans erreur
-		sql_select('*', 'spip_test_tintin');
-		$this->assertEquals('', sql_error(), 'sql_error() non vide lors d’une requete sans erreur');
-		$this->assertEquals(0, sql_errno(), 'sql_errno() ne retourne pas 0 lors d’une requete sans erreur');
-
-		// requete en erreur
-		sql_select('*', 'spip_test_toto');
-		$this->assertNotEquals('', sql_error(), 'sql_error() vide lors d’une requete en erreur');
-		$this->assertNotEquals(0, sql_errno(), 'sql_errno() retourne 0 lors d’une requete en erreur');
-	}
-
-	/**
-	 * Update de data
-	 */
-	#[Depends('testInsertData')]
-	public function testUpdateData() {
-		// ajouter un champ
-		$nb = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin=' . sql_quote(1));
-		sql_update('spip_test_tintin', [
-			'un_bigint' => 'un_bigint+2',
-		]);
-		$nb2 = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin=' . sql_quote(1));
-		$this->assertEquals($nb + 2, $nb2, 'sql_update n’a pas fait l’adition !');
-	}
-
-	/**
-	 * Delete de data
-	 */
-	#[Depends('testInsertData')]
-
-	public function test_delete_data() {
-		$nb = sql_countsel('spip_test_tintin');
-		// supprimer une ligne
-		sql_delete('spip_test_tintin', 'id_tintin=' . sql_quote(1));
-		$this->assertEquals($nb - 1, sql_countsel('spip_test_tintin'), "sql_delete n’a pas supprimé la ligne");
-
-		// supprimer tout
-		sql_delete('spip_test_tintin');
-		$this->assertEquals(0, sql_countsel('spip_test_tintin'), "sql_delete n’a pas vidé la table");
-	}
-
-	/**
-	 * Alter colonne
-	 */
-	#[Depends('testCreateTables')]
-	function testAlterColumns() {
-		$table = 'spip_test_tintin';
-
-		// supprimer une colonne
-		sql_alter("TABLE {$table} DROP COLUMN un_bigint");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate DROP COLUMN (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayNotHasKey('un_bigint', $desc['field']);
-		$this->assertArrayHasKey('un_smallint', $desc['field']);
-
-		// supprimer une colonne (sans COLUMN)
-		sql_alter("TABLE {$table} DROP un_smallint");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate DROP sans COLUMN (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayNotHasKey('un_smallint', $desc['field']);
-
-		// renommer une colonne
-		sql_alter("TABLE {$table} CHANGE un_varchar deux_varchars VARCHAR(30) NOT NULL DEFAULT ''");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate CHANGE (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('deux_varchars', $desc['field']);
-		$this->assertArrayNotHasKey('un_varchar', $desc['field']);
-
-		// changer le type d'une colonne
-		$table = 'spip_test_milou';
-		sql_alter("TABLE {$table} MODIFY schtroumf TEXT NOT NULL DEFAULT ''");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate MODIFY (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('schtroumf', $desc['field'], 'sql_alter rate MODIFY varchar en text');
-		$this->assertStringContainsStringIgnoringCase('TEXT', $desc['field']['schtroumf'], 'sql_alter rate MODIFY varchar en text');
-
-		// ajouter des colonnes
-		sql_alter("TABLE {$table} ADD COLUMN houba BIGINT(21) NOT NULL DEFAULT '0'");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD COLUMN (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('houba', $desc['field'], 'sql_alter rate ADD COLUMN');
-		$this->assertStringContainsStringIgnoringCase('INT', $desc['field']['houba'], 'sql_alter rate ADD COLUMN');
-
-		// ajouter des colonnes avec "AFTER"
-		sql_alter("TABLE {$table} ADD COLUMN hop BIGINT(21) NOT NULL DEFAULT '0' AFTER id_tintin");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD COLUMN avec AFTER (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('hop', $desc['field'], 'sql_alter rate ADD COLUMN avec AFTER');
-		$this->assertStringContainsStringIgnoringCase('INT', $desc['field']['hop'], 'sql_alter rate ADD COLUMN avec AFTER');
-	}
-
-
-	/**
-	 * Renomme table
-	 */
-	#[Depends('testCreateTables')]
-
-	public function testAlterRenameTable() {
-
-		$table_before = 'spip_test_tintin';
-		$table_after = 'spip_test_castafiore';
-		sql_drop_table($table_after, true);
-		$this->assertEmpty(sql_showtable($table_after));
-		$this->assertIsArray(sql_showtable($table_before));
-
-		// renommer une table
-		sql_alter("TABLE {$table_before} RENAME {$table_after}");
-		$this->assertEmpty(sql_showtable($table_before));
-		$this->assertIsArray(sql_showtable($table_after));
-
-		sql_alter("TABLE {$table_after} RENAME {$table_before}");
-		$this->assertEmpty(sql_showtable($table_after));
-		$this->assertIsArray(sql_showtable($table_before));
-	}
-
-
-	/**
-	 * pointer l'index
-	 */
-	#[Depends('testCreateTables')]
-
-	public function testAlterIndex() {
-		$table = 'spip_test_milou';
-
-		// supprimer un index
-		sql_alter("TABLE {$table} DROP INDEX sons");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate DROP INDEX sons (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayNotHasKey('KEY sons', $desc['key'], 'sql_alter rate DROP INDEX sons');
-
-		// ajouter un index simple
-		sql_alter("TABLE {$table} ADD INDEX (wouaf)");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD INDEX (wouaf) (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('KEY wouaf', $desc['key'], 'sql_alter rate ADD INDEX (wouaf)');
-
-		// ajouter un index nomme
-		sql_alter("TABLE {$table} ADD INDEX pluie (grrrr)");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD INDEX pluie (grrrr) (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('KEY pluie', $desc['key'], 'sql_alter rate ADD INDEX pluie (grrrr)');
-
-		// supprimer un index
-		sql_alter("TABLE {$table} DROP INDEX pluie");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate DROP INDEX pluie (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayNotHasKey('KEY pluie', $desc['key'], 'sql_alter rate DROP INDEX pluie');
-
-		// ajouter un index nomme double
-		sql_alter("TABLE {$table} ADD INDEX dring (grrrr, wouaf)");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD INDEX dring (grrrr, wouaf) (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('KEY dring', $desc['key'], 'sql_alter rate ADD INDEX dring (grrrr, wouaf)');
-	}
-
-
-	/**
-	 * dezinguer la primary
-	 */
-	#[Depends('testCreateTables')]
-
-	public function testAlterPrimary() {
-		$table = 'spip_test_kirikou';
-		sql_drop_table($table, true);
-
-		// creer une table pour jouer
-		sql_create(
-			$table,
-			[
-				'un' => 'INTEGER NOT NULL',
-				'deux' => 'INTEGER NOT NULL',
-				'trois' => 'INTEGER NOT NULL',
-			],
-			[
-				'PRIMARY KEY' => 'un',
-			]
-		);
-
-		// supprimer une primary
-		$desc = sql_showtable($table);
-		sql_alter("TABLE {$table} DROP PRIMARY KEY");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate DROP PRIMARY KEY (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayNotHasKey('PRIMARY KEY', $desc['key'], 'sql_alter rate DROP PRIMARY KEY');
-
-		// ajouter une primary
-		$desc = sql_showtable($table);
-		sql_alter("TABLE {$table} ADD PRIMARY KEY (deux, trois)");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD PRIMARY KEY (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('PRIMARY KEY', $desc['key'], 'sql_alter rate ADD PRIMARY KEY');
-
-		sql_drop_table($table, true);
-	}
-
-	/**
-	 * Alter colonne
-	 */
-	#[Depends('testAlterColumns')]
-	#[Depends('testAlterIndex')]
-
-	function testAlterMultiple() {
-		$table = 'spip_test_milou';
-
-		// supprimer des colonnes
-		sql_alter("TABLE {$table} DROP INDEX dring, DROP COLUMN wouaf, DROP COLUMN grrrr");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate DROP multiples (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayNotHasKey('waouf', $desc['field'], 'sql_alter rate DROP multiples');
-		$this->assertArrayNotHasKey('grrrr', $desc['field'], 'sql_alter rate DROP multiples');
-		$this->assertArrayNotHasKey('KEY dring', $desc['key'], 'sql_alter rate DROP multiples');
-
-		// ajouter des colonnes
-		sql_alter("TABLE {$table} ADD COLUMN a INT, ADD COLUMN b INT, ADD COLUMN c INT, ADD INDEX abc (a,b,c)");
-		$desc = sql_showtable($table);
-		$this->assertIsArray($desc, 'sql_alter rate ADD multiples (plus de table ou sql_showtable en erreur?)');
-		$this->assertArrayHasKey('a', $desc['field'], 'sql_alter rate ADD multiples');
-		$this->assertArrayHasKey('b', $desc['field'], 'sql_alter rate ADD multiples');
-		$this->assertArrayHasKey('c', $desc['field'], 'sql_alter rate ADD multiples');
-		$this->assertArrayHasKey('KEY abc', $desc['key'], 'sql_alter rate ADD multiples');
-	}
-
-	#[Depends('testCreateTables')]
-	#[DataProvider('providerTablesData')]
-	public function testDropTables($table, $desc, $data): void
-	{
-		$this->assertTrue(sql_drop_table($table, false));
-	}
-
-	/**
-	 * Description des tables & données de tests
-	 */
-	public static function providerTablesData(): array
-	{
-		return [
-			'tintin' => [
-				'spip_test_tintin',
-				[
-					'field' => [
-						"id_tintin" => "INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY",
-						"un_bigint" => "BIGINT(21) NOT NULL DEFAULT '0'",
-						"un_int" => "BIGINT(21) NOT NULL DEFAULT '0'",
-						"un_smallint" => "SMALLINT(3) NOT NULL DEFAULT '0'",
-						"un_double" => "DOUBLE NOT NULL DEFAULT '0'",
-						"un_tinyint" => "TINYINT(2) NOT NULL DEFAULT '0'",
-						"un_varchar" => "VARCHAR(30) NOT NULL DEFAULT ''",
-						"un_texte" => "TEXT NOT NULL DEFAULT ''",
-						"maj" => "TIMESTAMP"
-					],
-					'key' => [
-
-					],
-					'nb_key_attendues' => 1 // attention : la primary key DOIT etre dans les cle aussi
-				],
-				[
-					[
-						"id_tintin" => 1,
-						"un_bigint" => 30000,
-						"un_int" => 2000,
-						"un_smallint" => 40,
-						"un_double" => 2.58,
-						"un_tinyint" => 8,
-						"un_varchar" => "Premier varchar",
-						"un_texte" => "Premier texte",
-						//"maj" => "" // doit se remplir automatiquement
-					],
-					[
-						"id_tintin" => 2,
-						"un_bigint" => 40000,
-						"un_int" => 3000,
-						"un_smallint" => 50,
-						"un_double" => 3.58,
-						"un_tinyint" => 9,
-						"un_varchar" => "Deuxieme varchar",
-						"un_texte" => "Second texte",
-						//"maj" => "" // doit se remplir automatiquement
-					],
-					[
-						"id_tintin" => 3,
-						"un_bigint" => 60000,
-						"un_int" => 4000,
-						"un_smallint" => 70,
-						"un_double" => 8.58,
-						"un_tinyint" => 3,
-						"un_varchar" => "Troisieme varchar",
-						"un_texte" => "Troisieme texte",
-						//"maj" => "" // doit se remplir automatiquement
-					],
-				],
-
-			],
-			'milou' => [
-				'spip_test_milou',
-				[
-					'field' => [
-						"id_milou" => "INTEGER NOT NULL AUTO_INCREMENT",
-						"id_tintin" => "INTEGER NOT NULL",
-						"un_enum" => "ENUM('blanc','noir') NOT NULL DEFAULT 'blanc'",
-						"wouaf" => "VARCHAR(80) NOT NULL DEFAULT ''",
-						"grrrr" => "VARCHAR(80) NOT NULL DEFAULT ''",
-						"schtroumf" => "VARCHAR(80) NOT NULL DEFAULT ''",
-						"maj" => "TIMESTAMP"
-					],
-					'key' => [
-						"PRIMARY KEY" => "id_milou",
-						"KEY id_tintin" => "id_tintin",
-						"KEY sons" => "wouaf, grrrr",
-					],
-					'nb_key_attendues' => 3 // attention : la primary key DOIT etre dans les cle aussi
-				],
-				[
-					[
-						"id_milou" => 1,
-						"id_tintin" => 1,
-						"un_enum" => "blanc",
-						"wouaf" => "Warf !!",
-						"grrrr" => "Grogne !",
-						// "maj" => "" // doit se remplir automatiquement
-					],
-					[
-						"id_milou" => 2,
-						"id_tintin" => 1,
-						"un_enum" => "noir",
-						"wouaf" => "Wouf",
-						"grrrr" => "<multi>[fr]Crac[en]Krack</multi>",
-						// "maj" => "" // doit se remplir automatiquement
-					],
-					[
-						"id_milou" => 3,
-						"id_tintin" => 2,
-						"un_enum" => "blanc",
-						"wouaf" => "Wif",
-						"grrrr" => "Ahrg",
-						// "maj" => "" // doit se remplir automatiquement
-					],
-				],
-
-			],
-			'haddock' => [
-				'spip_test_haddock',
-				[
-					'field' => [
-						"id_haddock" => "INTEGER NOT NULL AUTO_INCREMENT",
-						"alcool" => "VARCHAR(80) NOT NULL DEFAULT ''",
-
-					],
-					'key' => [
-						"PRIMARY KEY" => "id_haddock",
-					],
-					'nb_key_attendues' => 1 // attention : la primary key DOIT etre dans les cle aussi
-				],
-				[
-					[
-						"id_haddock" => 1,
-						"alcool" => "<multi>[fr]Agile[en]Agily</multi>",
-					],
-					[
-						"id_haddock" => 2,
-						"alcool" => "<multi>[fr]Aérien[en]Aérieny</multi>",
-					],
-					[
-						"id_haddock" => 3,
-						"alcool" => "<multi>[fr]Vinasse[en]Vinassy</multi>",
-					],
-					[
-						"id_haddock" => 4,
-						"alcool" => "Un début de chaine : <multi>[fr]Vinasse[en]Vinassy</multi>, et [la fin]",
-					],
-				],
-
-			],
-		];
-	}
+    public static function setUpBeforeClass(): void
+    {
+        find_in_path('base/abstract_sql.php', '', true);
+    }
+
+    #[DataProvider('providerTablesData')]
+    public function testDropTablesSetup($table, $desc, $data): void
+    {
+        $this->assertTrue(sql_drop_table($table, true));
+    }
+
+    #[Depends('testDropTablesSetup')]
+    #[DataProvider('providerTablesData')]
+    public function testCreateTables($table, $desc, $data): void
+    {
+        $this->assertTrue(sql_create($table, $desc['field'], $desc['key']));
+    }
+
+    /**
+     * Creation/suppression/analyse de tables dans la base de donnee
+     *
+     * Permet de verifier que
+     * - tous les champs sont correctement ajoutes
+     * - que les PRIMARY sont pris en compte
+     * - que les KEY sont prises en compte
+     */
+    #[Depends('testCreateTables')]
+    #[DataProvider('providerTablesData')]
+    public function testShowTable($table, $desc, $data) {
+        // lire la structure de la table
+        // la structure doit avoir le meme nombre de champs et de cle
+        // attention : la primary key DOIT etre dans les cle aussi
+        $_desc = sql_showtable($table);
+        $this->assertCount(count($desc['field']), $_desc['field']);
+        $this->assertCount($desc['nb_key_attendues'], $_desc['key']);
+    }
+
+    #[Depends('testCreateTables')]
+    #[DataProvider('providerTablesData')]
+    public function testInsertData($table, $desc, $data) {
+        $this->assertNotFalse(sql_insertq_multi($table, $data));
+        $this->assertEquals(count($data), sql_countsel($table));
+    }
+
+    /**
+     * Teste que le champ "maj" s'actualise bien sur les update
+     * ainsi que les autres champs !
+     *
+     * utilise sql_quote, sql_getfetsel, sql_update et sql_updateq.
+     */
+    #[Depends('testInsertData')]
+    public function testMajTimestamp() {
+        $table = 'spip_test_tintin';
+        $where1 = 'id_tintin=' . sql_quote(1);
+        $where2 = 'id_tintin=' . sql_quote(2);
+
+        // lecture du timestamp actuel
+        $maj1 = sql_getfetsel('maj', $table, $where1);
+        $this->assertNotEmpty($maj1, "Le champ 'maj' n'a vraisemblablement pas recu de timestamp à l'insertion");
+
+        $maj2 = sql_getfetsel('maj', $table, $where2);
+        $this->assertNotEmpty($maj2, "Le champ 'maj' n'a vraisemblablement pas recu de timestamp à l'insertion");
+
+        // 1s de plus, sinon le timestamp ne change pas !
+        sleep(1);
+
+        // update
+        $texte = 'nouveau texte';
+        sql_update($table, [
+            'un_texte' => sql_quote($texte),
+        ], $where1);
+
+        // comparaison timastamp
+        $maj_update = sql_getfetsel('maj', $table, $where1);
+        $this->assertNotEmpty($maj_update, "Le champ 'maj' est vide à l’update");
+        $this->assertNotFalse(strtotime($maj_update), "Le champ 'maj' est incorrect à l’update");
+        $this->assertNotEquals($maj1, $maj_update, "Le champ 'maj' n'a vraisemblablement pas été mis a jour lors de l'update");
+
+        // comparaison texte
+        $texte_update = sql_getfetsel('un_texte', $table, $where1);
+        $this->assertNotEmpty($texte_update, "Le champ 'un_texte' est vide à l’update");
+        $this->assertEquals($texte, $texte_update, "Le champ 'un_texte' n'est pas correctement rempli a l'update");
+
+        // idem avec updateq
+        $texte = 'encore un nouveau texte';
+        sql_updateq($table, [
+            'un_texte' => $texte,
+        ], $where2);
+
+        // comparaison timastamp
+        $maj_updateq = sql_getfetsel('maj', $table, $where2);
+        $this->assertNotEmpty($maj_updateq, "Le champ 'maj' est vide à l’updateq");
+        $this->assertNotFalse(strtotime($maj_updateq), "Le champ 'maj' est incorrect à l’updateq");
+        $this->assertNotEquals($maj1, $maj_updateq, "Le champ 'maj' n'a vraisemblablement pas été mis a jour lors de l'updateq");
+
+        // comparaison texte
+        $texte_updateq = sql_getfetsel('un_texte', $table, $where2);
+        $this->assertNotEmpty($texte_updateq, "Le champ 'un_texte' est vide à l’updateq");
+        $this->assertEquals($texte, $texte_updateq, "Le champ 'un_texte' n'est pas correctement rempli a l'updateq");
+    }
+
+    /**
+     * Selections diverses selon criteres
+     */
+    #[Depends('testInsertData')]
+    public function testSelections() {
+        $data = $this->providerTablesData()['tintin'][2];
+
+        $res = sql_select('*', 'spip_test_tintin');
+        $this->assertNotFalse($res);
+        $this->assertEquals(count($data), sql_count($res), 'sql_count() ne renvoie pas la valeur attendue');
+
+        // selection float
+        $res = sql_select('*', 'spip_test_tintin', ['un_double>' . sql_quote(3)]);
+        $n = count(array_filter($data, fn ($entry) => $entry['un_double'] > 3));
+        $this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur un float');
+
+        // selection REGEXP
+        $res = sql_select('*', 'spip_test_tintin', ['un_varchar REGEXP ' . sql_quote('^De')]);
+        $n = count(array_filter($data, fn ($entry) => str_starts_with($entry['un_varchar'], 'De')));
+        $this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur une REGEXP');
+
+        // selection LIKE
+        $res = sql_select('*', 'spip_test_tintin', ['un_varchar LIKE ' . sql_quote('De%')]);
+        $this->assertEquals($n, sql_count($res), 'sql_count() ne renvoie pas la valeur attendue sur un LIKE');
+
+        // selection array(champs)
+        $res = sql_fetsel(['id_tintin', 'un_varchar'], 'spip_test_tintin');
+        $this->assertArrayHasKey('id_tintin', $res);
+        $this->assertArrayHasKey('un_varchar', $res);
+
+        // selection array(champs=>alias)
+        $res = sql_fetsel(['id_tintin AS id', 'un_varchar AS vchar'], 'spip_test_tintin');
+        $this->assertArrayHasKey('id', $res);
+        $this->assertArrayHasKey('vchar', $res);
+    }
+
+
+    #[Depends('testInsertData')]
+    public function testSelectionsMulti() {
+        $data = $this->providerTablesData()['milou'][2];
+
+        // selection avec sql_multi
+        $res = sql_select(['id_milou', sql_multi('grrrr', 'fr')], 'spip_test_milou', orderby: 'multi');
+        $this->assertNotFalse($res);
+        $this->assertEquals(count($data), sql_count($res), 'sql_multi mal interprété');
+        $this->assertEquals(3, sql_fetch($res)['id_milou'], 'sql_multi order by multi raté');
+        $this->assertEquals(2, sql_fetch($res)['id_milou'], 'sql_multi order by multi raté');
+        $this->assertEquals(1, sql_fetch($res)['id_milou'], 'sql_multi order by multi raté');
+
+        // le bon texte avec multi
+        foreach (
+            [
+                'fr' => 'Crac',
+                'en' => 'Krack',
+            ] as $lg => $res
+        ) {
+            $multi = sql_getfetsel(sql_multi('grrrr', $lg), 'spip_test_milou', 'id_milou=' . sql_quote(2));
+            $this->assertEquals($res, $multi, 'sql_multi mal rendu');
+        }
+
+        // le bon texte avec multi et accents
+        foreach (
+            [
+                'fr' => 'Aérien',
+                'en' => 'Aérieny',
+            ] as $lg => $res
+        ) {
+            $multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock=' . sql_quote(2));
+            $this->assertEquals($res, $multi, 'sql_multi avec accents, mal rendu');
+        }
+
+        // le bon texte avec multi et debut et fin de chaine
+        foreach (
+            [
+                'fr' => 'Un début de chaine : Vinasse, et [la fin]',
+                'en' => 'Un début de chaine : Vinassy, et [la fin]',
+                'de' => 'Un début de chaine : Vinasse, et [la fin]',
+            ] as $lg => $res
+        ) {
+            $multi = sql_getfetsel(sql_multi('alcool', $lg), 'spip_test_haddock', 'id_haddock=' . sql_quote(4));
+            $this->assertEquals($res, $multi, 'sql_multi avec crochets, mal rendu');
+        }
+    }
+
+
+
+    /**
+     * Selections diverses entre plusieurs tables
+     */
+    #[Depends('testInsertData')]
+    public function testSelectionsEntreTable() {
+        // selection 2 tables
+        // ! nombre en dur !
+        $res = sql_select(
+            ['spip_test_tintin.id_tintin', 'spip_test_milou.id_milou'],
+            ['spip_test_tintin', 'spip_test_milou'],
+            ['spip_test_milou.id_tintin=spip_test_tintin.id_tintin']
+        );
+        $this->assertEquals(3, sql_count($res), 'Echec sélection');
+
+        // selection 2 tables avec alias =>
+        // ! nombre en dur !
+        $res = sql_select(
+            ['a.id_tintin AS x', 'b.id_milou AS y'],
+            [
+                'a' => 'spip_test_tintin',
+                'b' => 'spip_test_milou',
+            ],
+            ['a.id_tintin=b.id_tintin']
+        );
+        $this->assertEquals(3, sql_count($res), 'Echec sélection avec alias de colonnes et tables');
+
+        // selection 2 tables avec alias AS
+        // ! nombre en dur !
+        $res = sql_select(
+            ['a.id_tintin AS x', 'b.id_milou AS y'],
+            ['spip_test_tintin AS a', 'spip_test_milou AS b'],
+            ['a.id_tintin=b.id_tintin']
+        );
+        $this->assertEquals(3, sql_count($res));
+
+        // selection 2 tables avec INNER JOIN + ON
+        // ! nombre en dur !
+        $res = sql_select(
+            ['a.id_tintin AS x', 'b.id_milou AS y'],
+            ['spip_test_tintin AS a INNER JOIN spip_test_milou AS b ON (a.id_tintin=b.id_tintin)']
+        );
+        $this->assertEquals(3, sql_count($res), 'Echec sélection avec INNER JOIN + ON');
+
+        // selection 2 tables avec LEFT JOIN + ON
+        // ! nombre en dur !
+        $res = sql_select(
+            ['a.id_tintin AS x', 'b.id_milou AS y'],
+            ['spip_test_tintin AS a LEFT JOIN spip_test_milou AS b ON (a.id_tintin=b.id_tintin)']
+        );
+        $this->assertEquals(4, sql_count($res), 'Echec sélection avec LEFT JOIN + ON');
+
+
+        // selection 2 tables avec jointure INNER JOIN + USING
+        // ! nombre en dur !
+        // SQLite 2 se plante : il ne connait pas USING (enleve de la requete,
+        // et du coup ne fait pas correctement la jointure)
+        $res = sql_select(
+            ['a.id_tintin AS x', 'b.id_milou AS y'],
+            ['spip_test_tintin AS a INNER JOIN spip_test_milou AS b USING (id_tintin)']
+        );
+        $this->assertEquals(3, sql_count($res), 'Echec sélection avec INNER JOIN + USING');
+    }
+
+
+    /**
+     * Selections mathematiques
+     */
+    #[Depends('testInsertData')]
+    function testMathFunctions() {
+        foreach (
+            [
+                'COUNT' => 3,
+                'SUM' => 9000,
+                'AVG' => 3000,
+            ] as $func => $expected
+        ) {
+            $nb = sql_getfetsel("{$func}(un_int) AS nb", ['spip_test_tintin']);
+            $this->assertEquals($expected, $nb, "Selection {$func} en echec");
+        }
+
+        foreach (
+            [
+                'EXP(0)' => exp(0),
+                'ROUND(3.56)' => round(3.56),
+                'ROUND(3.5684,2)' => round(3.5684, 2),
+                'SQRT(9)' => 3,
+                //'1/2'=>(0), // Le standard SQL : entier divise par entier = division entiere (pas trouve la reference)
+                '1.0/2' => (1 / 2), // Le standart SQL : reel divise par entier = reel
+                //'4/3'=>1,
+                'ROUND(4.0/3,2)' => round(4 / 3, 2),
+                '1.5/2' => (1.5 / 2),
+                '2.0/2' => (2.0 / 2),
+                '2/2' => (2 / 2),
+                'md5(8)' => md5('8'),
+                'md5(' . sql_quote('a') . ')' => md5('a'),
+            ] as $func => $expected
+        ) {
+            $nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin=' . sql_quote(1)]);
+            $this->assertEquals($expected, $nb, "Selection {$func} en echec");
+        }
+    }
+
+    /**
+     * Selections mathematiques
+     */
+    #[Depends('testInsertData')]
+
+    function testStringFunctions() {
+        foreach (
+            [
+                'CONCAT(' . sql_quote('cou') . ',' . sql_quote('cou') . ')' => 'coucou',
+                'CONCAT(' . sql_quote('cou,') . ',' . sql_quote('cou') . ')' => 'cou,cou',
+            ] as $func => $expected
+        ) {
+            $nb = sql_getfetsel("{$func} AS nb", ['spip_test_tintin'], ['id_tintin=' . sql_quote(1)]);
+            $this->assertEquals($expected, $nb, "Selection {$func} en echec");
+        }
+    }
+
+    /**
+     * retours des fonctions d'erreurs lors d'une requete
+     */
+    #[Depends('testCreateTables')]
+
+    function testErrorFunctions() {
+        // requete sans erreur
+        sql_select('*', 'spip_test_tintin');
+        $this->assertEquals('', sql_error(), 'sql_error() non vide lors d’une requete sans erreur');
+        $this->assertEquals(0, sql_errno(), 'sql_errno() ne retourne pas 0 lors d’une requete sans erreur');
+
+        // requete en erreur
+        sql_select('*', 'spip_test_toto');
+        $this->assertNotEquals('', sql_error(), 'sql_error() vide lors d’une requete en erreur');
+        $this->assertNotEquals(0, sql_errno(), 'sql_errno() retourne 0 lors d’une requete en erreur');
+    }
+
+    /**
+     * Update de data
+     */
+    #[Depends('testInsertData')]
+    public function testUpdateData() {
+        // ajouter un champ
+        $nb = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin=' . sql_quote(1));
+        sql_update('spip_test_tintin', [
+            'un_bigint' => 'un_bigint+2',
+        ]);
+        $nb2 = sql_getfetsel('un_bigint', 'spip_test_tintin', 'id_tintin=' . sql_quote(1));
+        $this->assertEquals($nb + 2, $nb2, 'sql_update n’a pas fait l’adition !');
+    }
+
+    /**
+     * Delete de data
+     */
+    #[Depends('testInsertData')]
+
+    public function test_delete_data() {
+        $nb = sql_countsel('spip_test_tintin');
+        // supprimer une ligne
+        sql_delete('spip_test_tintin', 'id_tintin=' . sql_quote(1));
+        $this->assertEquals($nb - 1, sql_countsel('spip_test_tintin'), "sql_delete n’a pas supprimé la ligne");
+
+        // supprimer tout
+        sql_delete('spip_test_tintin');
+        $this->assertEquals(0, sql_countsel('spip_test_tintin'), "sql_delete n’a pas vidé la table");
+    }
+
+    /**
+     * Alter colonne
+     */
+    #[Depends('testCreateTables')]
+    function testAlterColumns() {
+        $table = 'spip_test_tintin';
+
+        // supprimer une colonne
+        sql_alter("TABLE {$table} DROP COLUMN un_bigint");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate DROP COLUMN (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayNotHasKey('un_bigint', $desc['field']);
+        $this->assertArrayHasKey('un_smallint', $desc['field']);
+
+        // supprimer une colonne (sans COLUMN)
+        sql_alter("TABLE {$table} DROP un_smallint");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate DROP sans COLUMN (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayNotHasKey('un_smallint', $desc['field']);
+
+        // renommer une colonne
+        sql_alter("TABLE {$table} CHANGE un_varchar deux_varchars VARCHAR(30) NOT NULL DEFAULT ''");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate CHANGE (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('deux_varchars', $desc['field']);
+        $this->assertArrayNotHasKey('un_varchar', $desc['field']);
+
+        // changer le type d'une colonne
+        $table = 'spip_test_milou';
+        sql_alter("TABLE {$table} MODIFY schtroumf TEXT NOT NULL DEFAULT ''");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate MODIFY (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('schtroumf', $desc['field'], 'sql_alter rate MODIFY varchar en text');
+        $this->assertStringContainsStringIgnoringCase('TEXT', $desc['field']['schtroumf'], 'sql_alter rate MODIFY varchar en text');
+
+        // ajouter des colonnes
+        sql_alter("TABLE {$table} ADD COLUMN houba BIGINT(21) NOT NULL DEFAULT '0'");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD COLUMN (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('houba', $desc['field'], 'sql_alter rate ADD COLUMN');
+        $this->assertStringContainsStringIgnoringCase('INT', $desc['field']['houba'], 'sql_alter rate ADD COLUMN');
+
+        // ajouter des colonnes avec "AFTER"
+        sql_alter("TABLE {$table} ADD COLUMN hop BIGINT(21) NOT NULL DEFAULT '0' AFTER id_tintin");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD COLUMN avec AFTER (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('hop', $desc['field'], 'sql_alter rate ADD COLUMN avec AFTER');
+        $this->assertStringContainsStringIgnoringCase('INT', $desc['field']['hop'], 'sql_alter rate ADD COLUMN avec AFTER');
+    }
+
+
+    /**
+     * Renomme table
+     */
+    #[Depends('testCreateTables')]
+
+    public function testAlterRenameTable() {
+
+        $table_before = 'spip_test_tintin';
+        $table_after = 'spip_test_castafiore';
+        sql_drop_table($table_after, true);
+        $this->assertEmpty(sql_showtable($table_after));
+        $this->assertIsArray(sql_showtable($table_before));
+
+        // renommer une table
+        sql_alter("TABLE {$table_before} RENAME {$table_after}");
+        $this->assertEmpty(sql_showtable($table_before));
+        $this->assertIsArray(sql_showtable($table_after));
+
+        sql_alter("TABLE {$table_after} RENAME {$table_before}");
+        $this->assertEmpty(sql_showtable($table_after));
+        $this->assertIsArray(sql_showtable($table_before));
+    }
+
+
+    /**
+     * pointer l'index
+     */
+    #[Depends('testCreateTables')]
+
+    public function testAlterIndex() {
+        $table = 'spip_test_milou';
+
+        // supprimer un index
+        sql_alter("TABLE {$table} DROP INDEX sons");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate DROP INDEX sons (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayNotHasKey('KEY sons', $desc['key'], 'sql_alter rate DROP INDEX sons');
+
+        // ajouter un index simple
+        sql_alter("TABLE {$table} ADD INDEX (wouaf)");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD INDEX (wouaf) (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('KEY wouaf', $desc['key'], 'sql_alter rate ADD INDEX (wouaf)');
+
+        // ajouter un index nomme
+        sql_alter("TABLE {$table} ADD INDEX pluie (grrrr)");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD INDEX pluie (grrrr) (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('KEY pluie', $desc['key'], 'sql_alter rate ADD INDEX pluie (grrrr)');
+
+        // supprimer un index
+        sql_alter("TABLE {$table} DROP INDEX pluie");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate DROP INDEX pluie (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayNotHasKey('KEY pluie', $desc['key'], 'sql_alter rate DROP INDEX pluie');
+
+        // ajouter un index nomme double
+        sql_alter("TABLE {$table} ADD INDEX dring (grrrr, wouaf)");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD INDEX dring (grrrr, wouaf) (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('KEY dring', $desc['key'], 'sql_alter rate ADD INDEX dring (grrrr, wouaf)');
+    }
+
+
+    /**
+     * dezinguer la primary
+     */
+    #[Depends('testCreateTables')]
+
+    public function testAlterPrimary() {
+        $table = 'spip_test_kirikou';
+        sql_drop_table($table, true);
+
+        // creer une table pour jouer
+        sql_create(
+            $table,
+            [
+                'un' => 'INTEGER NOT NULL',
+                'deux' => 'INTEGER NOT NULL',
+                'trois' => 'INTEGER NOT NULL',
+            ],
+            [
+                'PRIMARY KEY' => 'un',
+            ]
+        );
+
+        // supprimer une primary
+        $desc = sql_showtable($table);
+        sql_alter("TABLE {$table} DROP PRIMARY KEY");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate DROP PRIMARY KEY (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayNotHasKey('PRIMARY KEY', $desc['key'], 'sql_alter rate DROP PRIMARY KEY');
+
+        // ajouter une primary
+        $desc = sql_showtable($table);
+        sql_alter("TABLE {$table} ADD PRIMARY KEY (deux, trois)");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD PRIMARY KEY (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('PRIMARY KEY', $desc['key'], 'sql_alter rate ADD PRIMARY KEY');
+
+        sql_drop_table($table, true);
+    }
+
+    /**
+     * Alter colonne
+     */
+    #[Depends('testAlterColumns')]
+    #[Depends('testAlterIndex')]
+
+    function testAlterMultiple() {
+        $table = 'spip_test_milou';
+
+        // supprimer des colonnes
+        sql_alter("TABLE {$table} DROP INDEX dring, DROP COLUMN wouaf, DROP COLUMN grrrr");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate DROP multiples (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayNotHasKey('waouf', $desc['field'], 'sql_alter rate DROP multiples');
+        $this->assertArrayNotHasKey('grrrr', $desc['field'], 'sql_alter rate DROP multiples');
+        $this->assertArrayNotHasKey('KEY dring', $desc['key'], 'sql_alter rate DROP multiples');
+
+        // ajouter des colonnes
+        sql_alter("TABLE {$table} ADD COLUMN a INT, ADD COLUMN b INT, ADD COLUMN c INT, ADD INDEX abc (a,b,c)");
+        $desc = sql_showtable($table);
+        $this->assertIsArray($desc, 'sql_alter rate ADD multiples (plus de table ou sql_showtable en erreur?)');
+        $this->assertArrayHasKey('a', $desc['field'], 'sql_alter rate ADD multiples');
+        $this->assertArrayHasKey('b', $desc['field'], 'sql_alter rate ADD multiples');
+        $this->assertArrayHasKey('c', $desc['field'], 'sql_alter rate ADD multiples');
+        $this->assertArrayHasKey('KEY abc', $desc['key'], 'sql_alter rate ADD multiples');
+    }
+
+    #[Depends('testCreateTables')]
+    #[DataProvider('providerTablesData')]
+    public function testDropTables($table, $desc, $data): void
+    {
+        $this->assertTrue(sql_drop_table($table, false));
+    }
+
+    /**
+     * Description des tables & données de tests
+     */
+    public static function providerTablesData(): array
+    {
+        return [
+            'tintin' => [
+                'spip_test_tintin',
+                [
+                    'field' => [
+                        "id_tintin" => "INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY",
+                        "un_bigint" => "BIGINT(21) NOT NULL DEFAULT '0'",
+                        "un_int" => "BIGINT(21) NOT NULL DEFAULT '0'",
+                        "un_smallint" => "SMALLINT(3) NOT NULL DEFAULT '0'",
+                        "un_double" => "DOUBLE NOT NULL DEFAULT '0'",
+                        "un_tinyint" => "TINYINT(2) NOT NULL DEFAULT '0'",
+                        "un_varchar" => "VARCHAR(30) NOT NULL DEFAULT ''",
+                        "un_texte" => "TEXT NOT NULL DEFAULT ''",
+                        "maj" => "TIMESTAMP"
+                    ],
+                    'key' => [
+
+                    ],
+                    'nb_key_attendues' => 1 // attention : la primary key DOIT etre dans les cle aussi
+                ],
+                [
+                    [
+                        "id_tintin" => 1,
+                        "un_bigint" => 30000,
+                        "un_int" => 2000,
+                        "un_smallint" => 40,
+                        "un_double" => 2.58,
+                        "un_tinyint" => 8,
+                        "un_varchar" => "Premier varchar",
+                        "un_texte" => "Premier texte",
+                        //"maj" => "" // doit se remplir automatiquement
+                    ],
+                    [
+                        "id_tintin" => 2,
+                        "un_bigint" => 40000,
+                        "un_int" => 3000,
+                        "un_smallint" => 50,
+                        "un_double" => 3.58,
+                        "un_tinyint" => 9,
+                        "un_varchar" => "Deuxieme varchar",
+                        "un_texte" => "Second texte",
+                        //"maj" => "" // doit se remplir automatiquement
+                    ],
+                    [
+                        "id_tintin" => 3,
+                        "un_bigint" => 60000,
+                        "un_int" => 4000,
+                        "un_smallint" => 70,
+                        "un_double" => 8.58,
+                        "un_tinyint" => 3,
+                        "un_varchar" => "Troisieme varchar",
+                        "un_texte" => "Troisieme texte",
+                        //"maj" => "" // doit se remplir automatiquement
+                    ],
+                ],
+
+            ],
+            'milou' => [
+                'spip_test_milou',
+                [
+                    'field' => [
+                        "id_milou" => "INTEGER NOT NULL AUTO_INCREMENT",
+                        "id_tintin" => "INTEGER NOT NULL",
+                        "un_enum" => "ENUM('blanc','noir') NOT NULL DEFAULT 'blanc'",
+                        "wouaf" => "VARCHAR(80) NOT NULL DEFAULT ''",
+                        "grrrr" => "VARCHAR(80) NOT NULL DEFAULT ''",
+                        "schtroumf" => "VARCHAR(80) NOT NULL DEFAULT ''",
+                        "maj" => "TIMESTAMP"
+                    ],
+                    'key' => [
+                        "PRIMARY KEY" => "id_milou",
+                        "KEY id_tintin" => "id_tintin",
+                        "KEY sons" => "wouaf, grrrr",
+                    ],
+                    'nb_key_attendues' => 3 // attention : la primary key DOIT etre dans les cle aussi
+                ],
+                [
+                    [
+                        "id_milou" => 1,
+                        "id_tintin" => 1,
+                        "un_enum" => "blanc",
+                        "wouaf" => "Warf !!",
+                        "grrrr" => "Grogne !",
+                        // "maj" => "" // doit se remplir automatiquement
+                    ],
+                    [
+                        "id_milou" => 2,
+                        "id_tintin" => 1,
+                        "un_enum" => "noir",
+                        "wouaf" => "Wouf",
+                        "grrrr" => "<multi>[fr]Crac[en]Krack</multi>",
+                        // "maj" => "" // doit se remplir automatiquement
+                    ],
+                    [
+                        "id_milou" => 3,
+                        "id_tintin" => 2,
+                        "un_enum" => "blanc",
+                        "wouaf" => "Wif",
+                        "grrrr" => "Ahrg",
+                        // "maj" => "" // doit se remplir automatiquement
+                    ],
+                ],
+
+            ],
+            'haddock' => [
+                'spip_test_haddock',
+                [
+                    'field' => [
+                        "id_haddock" => "INTEGER NOT NULL AUTO_INCREMENT",
+                        "alcool" => "VARCHAR(80) NOT NULL DEFAULT ''",
+
+                    ],
+                    'key' => [
+                        "PRIMARY KEY" => "id_haddock",
+                    ],
+                    'nb_key_attendues' => 1 // attention : la primary key DOIT etre dans les cle aussi
+                ],
+                [
+                    [
+                        "id_haddock" => 1,
+                        "alcool" => "<multi>[fr]Agile[en]Agily</multi>",
+                    ],
+                    [
+                        "id_haddock" => 2,
+                        "alcool" => "<multi>[fr]Aérien[en]Aérieny</multi>",
+                    ],
+                    [
+                        "id_haddock" => 3,
+                        "alcool" => "<multi>[fr]Vinasse[en]Vinassy</multi>",
+                    ],
+                    [
+                        "id_haddock" => 4,
+                        "alcool" => "Un début de chaine : <multi>[fr]Vinasse[en]Vinassy</multi>, et [la fin]",
+                    ],
+                ],
+
+            ],
+        ];
+    }
 }

ecrire/tests/Sql/Objets/TableObjetTest.php

Indentation +86 added lines, -86 removed lines

@@ -13,92 +13,92 @@
 
 class TableObjetTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('base/connect_sql.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('base/connect_sql.php', '', true);
+    }
 
-	#[DataProvider('providerConnectSqlTableObjet')]
-	public function testConnectSqlTableObjet($expected, ...$args): void {
-		$actual = table_objet(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerConnectSqlTableObjet')]
+    public function testConnectSqlTableObjet($expected, ...$args): void {
+        $actual = table_objet(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerConnectSqlTableObjet(): array {
-		return [[
-			0 => 'articles',
-			1 => 'articles',
-		], [
-			0 => 'articles',
-			1 => 'article',
-		], [
-			0 => 'articles',
-			1 => 'spip_articles',
-		], [
-			0 => 'articles',
-			1 => 'id_article',
-		], [
-			0 => 'rubriques',
-			1 => 'rubrique',
-		], [
-			0 => 'rubriques',
-			1 => 'spip_rubriques',
-		], [
-			0 => 'rubriques',
-			1 => 'id_rubrique',
-		], [
-			0 => 'mots',
-			1 => 'mot',
-		], [
-			0 => 'mots',
-			1 => 'spip_mots',
-		], [
-			0 => 'mots',
-			1 => 'id_mot',
-		], [
-			0 => 'groupes_mots',
-			1 => 'groupe_mots',
-		], [
-			0 => 'groupes_mots',
-			1 => 'spip_groupes_mots',
-		], [
-			0 => 'groupes_mots',
-			1 => 'id_groupe',
-		], [
-			0 => 'groupes_mots',
-			1 => 'groupes_mot',
-		], [
-			0 => 'syndic',
-			1 => 'syndic',
-		], [
-			0 => 'syndic',
-			1 => 'site',
-		], [
-			0 => 'syndic',
-			1 => 'spip_syndic',
-		], [
-			0 => 'syndic',
-			1 => 'id_syndic',
-		], [
-			0 => 'syndic_articles',
-			1 => 'syndic_article',
-		], [
-			0 => 'syndic_articles',
-			1 => 'spip_syndic_articles',
-		], [
-			0 => 'syndic_articles',
-			1 => 'id_syndic_article',
-		], [
-			0 => 'syndic_articles',
-			1 => 'syndic_article',
-		], ['articles', 'article'], ['auteurs', 'auteur'], ['documents', 'document'], ['documents', 'doc'], [
-			'documents',
-			'img',
-		], ['documents', 'img'], ['forums', 'forum'], [
-			'groupes_mots',
-			'groupe_mots',
-		], ['groupes_mots', 'groupe_mot'], ['groupes_mots', 'groupe'], ['mots', 'mot'], ['rubriques', 'rubrique'], [
-			'syndic',
-			'syndic',
-		], ['syndic', 'site'], ['syndic_articles', 'syndic_article'], ['types_documents', 'type_document']];
-	}
+    public static function providerConnectSqlTableObjet(): array {
+        return [[
+            0 => 'articles',
+            1 => 'articles',
+        ], [
+            0 => 'articles',
+            1 => 'article',
+        ], [
+            0 => 'articles',
+            1 => 'spip_articles',
+        ], [
+            0 => 'articles',
+            1 => 'id_article',
+        ], [
+            0 => 'rubriques',
+            1 => 'rubrique',
+        ], [
+            0 => 'rubriques',
+            1 => 'spip_rubriques',
+        ], [
+            0 => 'rubriques',
+            1 => 'id_rubrique',
+        ], [
+            0 => 'mots',
+            1 => 'mot',
+        ], [
+            0 => 'mots',
+            1 => 'spip_mots',
+        ], [
+            0 => 'mots',
+            1 => 'id_mot',
+        ], [
+            0 => 'groupes_mots',
+            1 => 'groupe_mots',
+        ], [
+            0 => 'groupes_mots',
+            1 => 'spip_groupes_mots',
+        ], [
+            0 => 'groupes_mots',
+            1 => 'id_groupe',
+        ], [
+            0 => 'groupes_mots',
+            1 => 'groupes_mot',
+        ], [
+            0 => 'syndic',
+            1 => 'syndic',
+        ], [
+            0 => 'syndic',
+            1 => 'site',
+        ], [
+            0 => 'syndic',
+            1 => 'spip_syndic',
+        ], [
+            0 => 'syndic',
+            1 => 'id_syndic',
+        ], [
+            0 => 'syndic_articles',
+            1 => 'syndic_article',
+        ], [
+            0 => 'syndic_articles',
+            1 => 'spip_syndic_articles',
+        ], [
+            0 => 'syndic_articles',
+            1 => 'id_syndic_article',
+        ], [
+            0 => 'syndic_articles',
+            1 => 'syndic_article',
+        ], ['articles', 'article'], ['auteurs', 'auteur'], ['documents', 'document'], ['documents', 'doc'], [
+            'documents',
+            'img',
+        ], ['documents', 'img'], ['forums', 'forum'], [
+            'groupes_mots',
+            'groupe_mots',
+        ], ['groupes_mots', 'groupe_mot'], ['groupes_mots', 'groupe'], ['mots', 'mot'], ['rubriques', 'rubrique'], [
+            'syndic',
+            'syndic',
+        ], ['syndic', 'site'], ['syndic_articles', 'syndic_article'], ['types_documents', 'type_document']];
+    }
 }

ecrire/tests/Sql/Objets/TableObjetSqlTest.php

Indentation +89 added lines, -89 removed lines

@@ -13,95 +13,95 @@
 
 class TableObjetSqlTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('base/connect_sql.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('base/connect_sql.php', '', true);
+    }
 
-	#[DataProvider('providerConnectSqlTableObjetSql')]
-	public function testConnectSqlTableObjetSql($expected, ...$args): void {
-		$actual = table_objet_sql(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerConnectSqlTableObjetSql')]
+    public function testConnectSqlTableObjetSql($expected, ...$args): void {
+        $actual = table_objet_sql(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerConnectSqlTableObjetSql(): array {
-		return [[
-			0 => 'spip_articles',
-			1 => 'articles',
-		], [
-			0 => 'spip_articles',
-			1 => 'article',
-		], [
-			0 => 'spip_articles',
-			1 => 'spip_articles',
-		], [
-			0 => 'spip_articles',
-			1 => 'id_article',
-		], [
-			0 => 'spip_rubriques',
-			1 => 'rubrique',
-		], [
-			0 => 'spip_rubriques',
-			1 => 'spip_rubriques',
-		], [
-			0 => 'spip_rubriques',
-			1 => 'id_rubrique',
-		], [
-			0 => 'spip_mots',
-			1 => 'mot',
-		], [
-			0 => 'spip_mots',
-			1 => 'spip_mots',
-		], [
-			0 => 'spip_mots',
-			1 => 'id_mot',
-		], [
-			0 => 'spip_groupes_mots',
-			1 => 'groupe_mots',
-		], [
-			0 => 'spip_groupes_mots',
-			1 => 'spip_groupes_mots',
-		], [
-			0 => 'spip_groupes_mots',
-			1 => 'id_groupe',
-		], [
-			0 => 'spip_groupes_mots',
-			1 => 'groupes_mot',
-		], [
-			0 => 'spip_syndic',
-			1 => 'syndic',
-		], [
-			0 => 'spip_syndic',
-			1 => 'site',
-		], [
-			0 => 'spip_syndic',
-			1 => 'spip_syndic',
-		], [
-			0 => 'spip_syndic',
-			1 => 'id_syndic',
-		], [
-			0 => 'spip_syndic_articles',
-			1 => 'syndic_article',
-		], [
-			0 => 'spip_syndic_articles',
-			1 => 'spip_syndic_articles',
-		], [
-			0 => 'spip_syndic_articles',
-			1 => 'id_syndic_article',
-		], [
-			0 => 'spip_syndic_articles',
-			1 => 'syndic_article',
-		], ['spip_articles', 'article'], ['spip_auteurs', 'auteur'], ['spip_documents', 'document'], [
-			'spip_documents',
-			'doc',
-		], ['spip_documents', 'img'], ['spip_documents', 'img'], ['spip_forum', 'forum'], [
-			'spip_groupes_mots',
-			'groupes_mots',
-		], ['spip_groupes_mots', 'groupe_mots'], ['spip_groupes_mots', 'groupe_mot'], [
-			'spip_groupes_mots',
-			'groupe',
-		], ['spip_mots', 'mot'], ['spip_rubriques', 'rubrique'], ['spip_syndic', 'syndic'], [
-			'spip_syndic',
-			'site',
-		], ['spip_syndic_articles', 'syndic_article'], ['spip_types_documents', 'type_document']];
-	}
+    public static function providerConnectSqlTableObjetSql(): array {
+        return [[
+            0 => 'spip_articles',
+            1 => 'articles',
+        ], [
+            0 => 'spip_articles',
+            1 => 'article',
+        ], [
+            0 => 'spip_articles',
+            1 => 'spip_articles',
+        ], [
+            0 => 'spip_articles',
+            1 => 'id_article',
+        ], [
+            0 => 'spip_rubriques',
+            1 => 'rubrique',
+        ], [
+            0 => 'spip_rubriques',
+            1 => 'spip_rubriques',
+        ], [
+            0 => 'spip_rubriques',
+            1 => 'id_rubrique',
+        ], [
+            0 => 'spip_mots',
+            1 => 'mot',
+        ], [
+            0 => 'spip_mots',
+            1 => 'spip_mots',
+        ], [
+            0 => 'spip_mots',
+            1 => 'id_mot',
+        ], [
+            0 => 'spip_groupes_mots',
+            1 => 'groupe_mots',
+        ], [
+            0 => 'spip_groupes_mots',
+            1 => 'spip_groupes_mots',
+        ], [
+            0 => 'spip_groupes_mots',
+            1 => 'id_groupe',
+        ], [
+            0 => 'spip_groupes_mots',
+            1 => 'groupes_mot',
+        ], [
+            0 => 'spip_syndic',
+            1 => 'syndic',
+        ], [
+            0 => 'spip_syndic',
+            1 => 'site',
+        ], [
+            0 => 'spip_syndic',
+            1 => 'spip_syndic',
+        ], [
+            0 => 'spip_syndic',
+            1 => 'id_syndic',
+        ], [
+            0 => 'spip_syndic_articles',
+            1 => 'syndic_article',
+        ], [
+            0 => 'spip_syndic_articles',
+            1 => 'spip_syndic_articles',
+        ], [
+            0 => 'spip_syndic_articles',
+            1 => 'id_syndic_article',
+        ], [
+            0 => 'spip_syndic_articles',
+            1 => 'syndic_article',
+        ], ['spip_articles', 'article'], ['spip_auteurs', 'auteur'], ['spip_documents', 'document'], [
+            'spip_documents',
+            'doc',
+        ], ['spip_documents', 'img'], ['spip_documents', 'img'], ['spip_forum', 'forum'], [
+            'spip_groupes_mots',
+            'groupes_mots',
+        ], ['spip_groupes_mots', 'groupe_mots'], ['spip_groupes_mots', 'groupe_mot'], [
+            'spip_groupes_mots',
+            'groupe',
+        ], ['spip_mots', 'mot'], ['spip_rubriques', 'rubrique'], ['spip_syndic', 'syndic'], [
+            'spip_syndic',
+            'site',
+        ], ['spip_syndic_articles', 'syndic_article'], ['spip_types_documents', 'type_document']];
+    }
 }

ecrire/tests/Sql/Objets/IdTableObjetTest.php

Indentation +86 added lines, -86 removed lines

@@ -13,92 +13,92 @@
 
 class IdTableObjetTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('base/connect_sql.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('base/connect_sql.php', '', true);
+    }
 
-	#[DataProvider('providerConnectSqlIdTableObjet')]
-	public function testConnectSqlIdTableObjet($expected, ...$args): void {
-		$actual = id_table_objet(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerConnectSqlIdTableObjet')]
+    public function testConnectSqlIdTableObjet($expected, ...$args): void {
+        $actual = id_table_objet(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerConnectSqlIdTableObjet(): array {
-		return [[
-			0 => 'id_article',
-			1 => 'articles',
-		], [
-			0 => 'id_article',
-			1 => 'article',
-		], [
-			0 => 'id_article',
-			1 => 'spip_articles',
-		], [
-			0 => 'id_article',
-			1 => 'id_article',
-		], [
-			0 => 'id_rubrique',
-			1 => 'rubriques',
-		], [
-			0 => 'id_rubrique',
-			1 => 'spip_rubriques',
-		], [
-			0 => 'id_rubrique',
-			1 => 'id_rubrique',
-		], [
-			0 => 'id_mot',
-			1 => 'mots',
-		], [
-			0 => 'id_mot',
-			1 => 'spip_mots',
-		], [
-			0 => 'id_mot',
-			1 => 'id_mot',
-		], [
-			0 => 'id_groupe',
-			1 => 'groupes_mots',
-		], [
-			0 => 'id_groupe',
-			1 => 'spip_groupes_mots',
-		], [
-			0 => 'id_groupe',
-			1 => 'id_groupe',
-		], [
-			0 => 'id_groupe',
-			1 => 'groupes_mot',
-		], [
-			0 => 'id_syndic',
-			1 => 'syndic',
-		], [
-			0 => 'id_syndic',
-			1 => 'site',
-		], [
-			0 => 'id_syndic',
-			1 => 'spip_syndic',
-		], [
-			0 => 'id_syndic',
-			1 => 'id_syndic',
-		], [
-			0 => 'id_syndic_article',
-			1 => 'syndic_articles',
-		], [
-			0 => 'id_syndic_article',
-			1 => 'spip_syndic_articles',
-		], [
-			0 => 'id_syndic_article',
-			1 => 'id_syndic_article',
-		], [
-			0 => 'id_syndic_article',
-			1 => 'syndic_article',
-		], ['id_article', 'article'], ['id_auteur', 'auteur'], ['id_document', 'document'], ['id_document', 'doc'], [
-			'id_document',
-			'img',
-		], ['id_document', 'img'], ['id_forum', 'forum'], ['id_groupe', 'groupe_mots'], [
-			'id_groupe',
-			'groupe_mot',
-		], ['id_groupe', 'groupes_mots'], ['id_groupe', 'groupe'], ['id_mot', 'mot'], ['id_rubrique', 'rubrique'], [
-			'id_syndic',
-			'syndic',
-		], ['id_syndic', 'site'], ['id_syndic_article', 'syndic_article'], ['extension', 'type_document']];
-	}
+    public static function providerConnectSqlIdTableObjet(): array {
+        return [[
+            0 => 'id_article',
+            1 => 'articles',
+        ], [
+            0 => 'id_article',
+            1 => 'article',
+        ], [
+            0 => 'id_article',
+            1 => 'spip_articles',
+        ], [
+            0 => 'id_article',
+            1 => 'id_article',
+        ], [
+            0 => 'id_rubrique',
+            1 => 'rubriques',
+        ], [
+            0 => 'id_rubrique',
+            1 => 'spip_rubriques',
+        ], [
+            0 => 'id_rubrique',
+            1 => 'id_rubrique',
+        ], [
+            0 => 'id_mot',
+            1 => 'mots',
+        ], [
+            0 => 'id_mot',
+            1 => 'spip_mots',
+        ], [
+            0 => 'id_mot',
+            1 => 'id_mot',
+        ], [
+            0 => 'id_groupe',
+            1 => 'groupes_mots',
+        ], [
+            0 => 'id_groupe',
+            1 => 'spip_groupes_mots',
+        ], [
+            0 => 'id_groupe',
+            1 => 'id_groupe',
+        ], [
+            0 => 'id_groupe',
+            1 => 'groupes_mot',
+        ], [
+            0 => 'id_syndic',
+            1 => 'syndic',
+        ], [
+            0 => 'id_syndic',
+            1 => 'site',
+        ], [
+            0 => 'id_syndic',
+            1 => 'spip_syndic',
+        ], [
+            0 => 'id_syndic',
+            1 => 'id_syndic',
+        ], [
+            0 => 'id_syndic_article',
+            1 => 'syndic_articles',
+        ], [
+            0 => 'id_syndic_article',
+            1 => 'spip_syndic_articles',
+        ], [
+            0 => 'id_syndic_article',
+            1 => 'id_syndic_article',
+        ], [
+            0 => 'id_syndic_article',
+            1 => 'syndic_article',
+        ], ['id_article', 'article'], ['id_auteur', 'auteur'], ['id_document', 'document'], ['id_document', 'doc'], [
+            'id_document',
+            'img',
+        ], ['id_document', 'img'], ['id_forum', 'forum'], ['id_groupe', 'groupe_mots'], [
+            'id_groupe',
+            'groupe_mot',
+        ], ['id_groupe', 'groupes_mots'], ['id_groupe', 'groupe'], ['id_mot', 'mot'], ['id_rubrique', 'rubrique'], [
+            'id_syndic',
+            'syndic',
+        ], ['id_syndic', 'site'], ['id_syndic_article', 'syndic_article'], ['extension', 'type_document']];
+    }
 }

ecrire/tests/Sql/Objets/ObjetTypeTest.php

Indentation +95 added lines, -95 removed lines

@@ -13,101 +13,101 @@
 
 class ObjetTypeTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('base/connect_sql.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('base/connect_sql.php', '', true);
+    }
 
-	#[DataProvider('providerConnectSqlObjetType')]
-	public function testConnectSqlObjetType($expected, ...$args): void {
-		$actual = objet_type(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerConnectSqlObjetType')]
+    public function testConnectSqlObjetType($expected, ...$args): void {
+        $actual = objet_type(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerConnectSqlObjetType(): array {
-		return [[
-			0 => 'article',
-			1 => 'articles',
-		], [
-			0 => 'article',
-			1 => 'article',
-		], [
-			0 => 'article',
-			1 => 'spip_articles',
-		], [
-			0 => 'article',
-			1 => 'id_article',
-		], [
-			0 => 'rubrique',
-			1 => 'rubriques',
-		], [
-			0 => 'rubrique',
-			1 => 'spip_rubriques',
-		], [
-			0 => 'rubrique',
-			1 => 'id_rubrique',
-		], [
-			0 => 'mot',
-			1 => 'mots',
-		], [
-			0 => 'mot',
-			1 => 'spip_mots',
-		], [
-			0 => 'mot',
-			1 => 'id_mot',
-		], [
-			0 => 'groupe_mots',
-			1 => 'groupes_mots',
-		], [
-			0 => 'groupe_mots',
-			1 => 'spip_groupes_mots',
-		], [
-			0 => 'groupe_mots',
-			1 => 'id_groupe',
-		], [
-			0 => 'groupe_mots',
-			1 => 'groupes_mot',
-		], [
-			0 => 'site',
-			1 => 'syndic',
-		], [
-			0 => 'site',
-			1 => 'site',
-		], [
-			0 => 'site',
-			1 => 'spip_syndic',
-		], [
-			0 => 'site',
-			1 => 'id_syndic',
-		], [
-			0 => 'syndic_article',
-			1 => 'syndic_articles',
-		], [
-			0 => 'syndic_article',
-			1 => 'spip_syndic_articles',
-		], [
-			0 => 'syndic_article',
-			1 => 'id_syndic_article',
-		], [
-			0 => 'syndic_article',
-			1 => 'syndic_article',
-		], [
-			0 => 'site',
-			1 => 'racine-site',
-		], [
-			0 => 'mot',
-			1 => 'mot-cle',
-		], [
-			0 => 'truc_pas_connu',
-			1 => 'truc_pas_connu',
-		], [
-			0 => 'truc_pas_connu',
-			1 => 'truc_pas_connus',
-		], ['article', 'articles'], ['auteur', 'auteurs'], ['document', 'documents'], ['forum', 'forums'], [
-			'forum',
-			'forum',
-		], ['groupe_mots', 'groupes_mots'], ['mot', 'mots'], [
-			'rubrique',
-			'rubriques',
-		], ['site', 'syndic'], ['syndic_article', 'syndic_articles'], ['types_document', 'types_documents']];
-	}
+    public static function providerConnectSqlObjetType(): array {
+        return [[
+            0 => 'article',
+            1 => 'articles',
+        ], [
+            0 => 'article',
+            1 => 'article',
+        ], [
+            0 => 'article',
+            1 => 'spip_articles',
+        ], [
+            0 => 'article',
+            1 => 'id_article',
+        ], [
+            0 => 'rubrique',
+            1 => 'rubriques',
+        ], [
+            0 => 'rubrique',
+            1 => 'spip_rubriques',
+        ], [
+            0 => 'rubrique',
+            1 => 'id_rubrique',
+        ], [
+            0 => 'mot',
+            1 => 'mots',
+        ], [
+            0 => 'mot',
+            1 => 'spip_mots',
+        ], [
+            0 => 'mot',
+            1 => 'id_mot',
+        ], [
+            0 => 'groupe_mots',
+            1 => 'groupes_mots',
+        ], [
+            0 => 'groupe_mots',
+            1 => 'spip_groupes_mots',
+        ], [
+            0 => 'groupe_mots',
+            1 => 'id_groupe',
+        ], [
+            0 => 'groupe_mots',
+            1 => 'groupes_mot',
+        ], [
+            0 => 'site',
+            1 => 'syndic',
+        ], [
+            0 => 'site',
+            1 => 'site',
+        ], [
+            0 => 'site',
+            1 => 'spip_syndic',
+        ], [
+            0 => 'site',
+            1 => 'id_syndic',
+        ], [
+            0 => 'syndic_article',
+            1 => 'syndic_articles',
+        ], [
+            0 => 'syndic_article',
+            1 => 'spip_syndic_articles',
+        ], [
+            0 => 'syndic_article',
+            1 => 'id_syndic_article',
+        ], [
+            0 => 'syndic_article',
+            1 => 'syndic_article',
+        ], [
+            0 => 'site',
+            1 => 'racine-site',
+        ], [
+            0 => 'mot',
+            1 => 'mot-cle',
+        ], [
+            0 => 'truc_pas_connu',
+            1 => 'truc_pas_connu',
+        ], [
+            0 => 'truc_pas_connu',
+            1 => 'truc_pas_connus',
+        ], ['article', 'articles'], ['auteur', 'auteurs'], ['document', 'documents'], ['forum', 'forums'], [
+            'forum',
+            'forum',
+        ], ['groupe_mots', 'groupes_mots'], ['mot', 'mots'], [
+            'rubrique',
+            'rubriques',
+        ], ['site', 'syndic'], ['syndic_article', 'syndic_articles'], ['types_document', 'types_documents']];
+    }
 }

ecrire/tests/Sql/Objets/QueryEchappeTextesTest.php

Indentation +83 added lines, -83 removed lines

@@ -13,90 +13,90 @@
 
 class QueryEchappeTextesTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('base/connect_sql.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('base/connect_sql.php', '', true);
+    }
 
-	protected function setUp(): void {
-		query_echappe_textes('', 'uniqid');
-	}
+    protected function setUp(): void {
+        query_echappe_textes('', 'uniqid');
+    }
 
-	#[DataProvider('providerConnectSqlQueryEchappeTextes')]
-	public function testConnectSqlQueryEchappeTextes($expected, ...$args): void {
-		$actual = query_echappe_textes(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerConnectSqlQueryEchappeTextes')]
+    public function testConnectSqlQueryEchappeTextes($expected, ...$args): void {
+        $actual = query_echappe_textes(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerConnectSqlQueryEchappeTextes(): array {
-		$md5 = substr(md5('uniqid'), 0, 4);
-		return [
-			[
-				0 => ['%1$s', ["'guillemets simples'"]],
-				1 => "'guillemets simples'",
-			],
-			[
-				0 => ['%1$s', ['"guillemets doubles"']],
-				1 => '"guillemets doubles"',
-			],
-			[
-				0 => ['%1$s,%2$s', ["'guillemets simples 1/2'", "'guillemets simples 2/2'"]],
-				1 => "'guillemets simples 1/2','guillemets simples 2/2'",
-			],
-			[
-				0 => ['%1$s,%2$s', ['"guillemets doubles 1/2"', '"guillemets doubles 2/2"']],
-				1 => '"guillemets doubles 1/2","guillemets doubles 2/2"',
-			],
-			[
-				0 => ['%1$s', ["'guillemets simples \x02@#{$md5}#@\x02 avec un echappement'"]],
-				1 => "'guillemets simples \\' avec un echappement'",
-			],
-			[
-				0 => ['%1$s', ["\"guillemets doubles \x03@#{$md5}#@\x03 avec un echappement\""]],
-				1 => '"guillemets doubles \\" avec un echappement"',
-			],
-			[
-				0 => ['%1$s', ["'guillemets simples \x02@#{$md5}#@\x02\x03@#{$md5}#@\x03 avec deux echappements'"]],
-				1 => "'guillemets simples \\'\\\" avec deux echappements'",
-			],
-			[
-				0 => ['%1$s', ["\"guillemets doubles \x02@#{$md5}#@\x02\x03@#{$md5}#@\x03 avec deux echappements\""]],
-				1 => "\"guillemets doubles \\'\\\" avec deux echappements\"",
-			],
-			[
-				0 => ['%1$s', ["'guillemet double \" dans guillemets simples'"]],
-				1 => "'guillemet double \" dans guillemets simples'",
-			],
-			[
-				0 => ['%1$s', ["\"guillemet simple ' dans guillemets doubles\""]],
-				1 => "\"guillemet simple ' dans guillemets doubles\"",
-			],
-			// sortie de sqlitemanager firefox
-			// (description de table suite a import d'une table au format xml/phpmyadmin v5)
-			[
-				0 => ['%1$s INTEGER,%2$s VARCHAR', ['"id_objet"', '"objet"']],
-				1 => '"id_objet" INTEGER,"objet" VARCHAR',
-			],
-			[
-				0 => [
-					'UPDATE spip_truc SET html=%1$s WHERE id_truc=1',
-					["'''0'' style=''margin: 0;padding: 0;width: 100\x04@#{$md5}#@\x04;border: 0;height: auto;lin'"],
-				],
-				1 => "UPDATE spip_truc SET html='''0'' style=''margin: 0;padding: 0;width: 100%;border: 0;height: auto;lin' WHERE id_truc=1",
-			],
-			[
-				0 => [
-					'UPDATE spip_truc SET html=%1$s, texte=%2$s WHERE id_truc=1',
-					["'''0'' style=''margin: 0;padding: 0;width: 100\x04@#{$md5}#@\x04;border: 0;height: auto;lin'", "'toto'"],
-				],
-				1 => "UPDATE spip_truc SET html='''0'' style=''margin: 0;padding: 0;width: 100%;border: 0;height: auto;lin', texte='toto' WHERE id_truc=1",
-			],
-			[
-				0 => [
-					'UPDATE spip_truc SET texte=%1$s, html=%2$s WHERE id_truc=1',
-					["''", "'''0'' style=''margin: 0;padding: 0;width: 100\x04@#{$md5}#@\x04;border: 0;height: auto;lin'"],
-				],
-				1 => "UPDATE spip_truc SET texte='', html='''0'' style=''margin: 0;padding: 0;width: 100%;border: 0;height: auto;lin' WHERE id_truc=1",
-			],
-		];
-	}
+    public static function providerConnectSqlQueryEchappeTextes(): array {
+        $md5 = substr(md5('uniqid'), 0, 4);
+        return [
+            [
+                0 => ['%1$s', ["'guillemets simples'"]],
+                1 => "'guillemets simples'",
+            ],
+            [
+                0 => ['%1$s', ['"guillemets doubles"']],
+                1 => '"guillemets doubles"',
+            ],
+            [
+                0 => ['%1$s,%2$s', ["'guillemets simples 1/2'", "'guillemets simples 2/2'"]],
+                1 => "'guillemets simples 1/2','guillemets simples 2/2'",
+            ],
+            [
+                0 => ['%1$s,%2$s', ['"guillemets doubles 1/2"', '"guillemets doubles 2/2"']],
+                1 => '"guillemets doubles 1/2","guillemets doubles 2/2"',
+            ],
+            [
+                0 => ['%1$s', ["'guillemets simples \x02@#{$md5}#@\x02 avec un echappement'"]],
+                1 => "'guillemets simples \\' avec un echappement'",
+            ],
+            [
+                0 => ['%1$s', ["\"guillemets doubles \x03@#{$md5}#@\x03 avec un echappement\""]],
+                1 => '"guillemets doubles \\" avec un echappement"',
+            ],
+            [
+                0 => ['%1$s', ["'guillemets simples \x02@#{$md5}#@\x02\x03@#{$md5}#@\x03 avec deux echappements'"]],
+                1 => "'guillemets simples \\'\\\" avec deux echappements'",
+            ],
+            [
+                0 => ['%1$s', ["\"guillemets doubles \x02@#{$md5}#@\x02\x03@#{$md5}#@\x03 avec deux echappements\""]],
+                1 => "\"guillemets doubles \\'\\\" avec deux echappements\"",
+            ],
+            [
+                0 => ['%1$s', ["'guillemet double \" dans guillemets simples'"]],
+                1 => "'guillemet double \" dans guillemets simples'",
+            ],
+            [
+                0 => ['%1$s', ["\"guillemet simple ' dans guillemets doubles\""]],
+                1 => "\"guillemet simple ' dans guillemets doubles\"",
+            ],
+            // sortie de sqlitemanager firefox
+            // (description de table suite a import d'une table au format xml/phpmyadmin v5)
+            [
+                0 => ['%1$s INTEGER,%2$s VARCHAR', ['"id_objet"', '"objet"']],
+                1 => '"id_objet" INTEGER,"objet" VARCHAR',
+            ],
+            [
+                0 => [
+                    'UPDATE spip_truc SET html=%1$s WHERE id_truc=1',
+                    ["'''0'' style=''margin: 0;padding: 0;width: 100\x04@#{$md5}#@\x04;border: 0;height: auto;lin'"],
+                ],
+                1 => "UPDATE spip_truc SET html='''0'' style=''margin: 0;padding: 0;width: 100%;border: 0;height: auto;lin' WHERE id_truc=1",
+            ],
+            [
+                0 => [
+                    'UPDATE spip_truc SET html=%1$s, texte=%2$s WHERE id_truc=1',
+                    ["'''0'' style=''margin: 0;padding: 0;width: 100\x04@#{$md5}#@\x04;border: 0;height: auto;lin'", "'toto'"],
+                ],
+                1 => "UPDATE spip_truc SET html='''0'' style=''margin: 0;padding: 0;width: 100%;border: 0;height: auto;lin', texte='toto' WHERE id_truc=1",
+            ],
+            [
+                0 => [
+                    'UPDATE spip_truc SET texte=%1$s, html=%2$s WHERE id_truc=1',
+                    ["''", "'''0'' style=''margin: 0;padding: 0;width: 100\x04@#{$md5}#@\x04;border: 0;height: auto;lin'"],
+                ],
+                1 => "UPDATE spip_truc SET texte='', html='''0'' style=''margin: 0;padding: 0;width: 100%;border: 0;height: auto;lin' WHERE id_truc=1",
+            ],
+        ];
+    }
 }

ecrire/tests/Sql/SqlInSqliteTest.php

Indentation +169 added lines, -169 removed lines

@@ -9,186 +9,186 @@
 
 class SqlInSqliteTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('base/abstract_sql.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('base/abstract_sql.php', '', true);
+    }
 
-	protected function setUp(): void {
-		if ($this->getSqlType() !== 'sqlite3') {
-			$this->markTestSkipped('Needs a Sqlite database');
-		}
-	}
+    protected function setUp(): void {
+        if ($this->getSqlType() !== 'sqlite3') {
+            $this->markTestSkipped('Needs a Sqlite database');
+        }
+    }
 
-	#[DataProvider('providerSqliteSqliIn')]
-	public function testSqliteSqlIn($expected, ...$args): void {
-		$this->assertEquals($expected, sql_in(...$args));
-	}
+    #[DataProvider('providerSqliteSqliIn')]
+    public function testSqliteSqlIn($expected, ...$args): void {
+        $this->assertEquals($expected, sql_in(...$args));
+    }
 
-	public static function providerSqliteSqliIn(): array {
-		return [
-			0 =>
-			[
-				0 => '(id_rubrique  IN (1,2,3))',
-				1 => 'id_rubrique',
-				2 => '1,2,3',
-			],
-			1 =>
-			[
-				0 => '(id_rubrique  IN (1,2,3))',
-				1 => 'id_rubrique',
-				2 =>
-				[
-					0 => 1,
-					1 => 2,
-					2 => 3,
-				],
-			],
-			2 =>
-			[
-				0 => '(id_rubrique NOT IN (1,2,3))',
-				1 => 'id_rubrique',
-				2 => '1,2,3',
-				3 => 'NOT',
-			],
-			3 =>
-			[
-				0 => '(id_rubrique NOT IN (1,2,3))',
-				1 => 'id_rubrique',
-				2 =>
-				[
-					0 => 1,
-					1 => 2,
-					2 => 3,
-				],
-				3 => 'NOT',
-			],
-			4 =>
-			[
-				0 => '0=1',
-				1 => 'id_rubrique',
-				2 =>
-				[],
-			],
-			5 =>
-			[
-				0 => '(id_rubrique  IN (\'\',0,\'Un texte avec des <a href="http://spip.net">liens</a> [Article 1->art1] [spip->https://www.spip.net] https://www.spip.net\',\'Un texte avec des entit&eacute;s &amp;&lt;&gt;&quot;\',\'Un texte avec des entit&amp;eacute;s echap&amp;eacute; &amp;amp;&amp;lt;&amp;gt;&amp;quot;\',\'Un texte avec des entit&#233;s num&#233;riques &#38;&#60;&#62;&quot;\',\'Un texte avec des entit&amp;#233;s num&amp;#233;riques echap&amp;#233;es &amp;#38;&amp;#60;&amp;#62;&amp;quot;\',\'Un texte sans entites &<>"\'\'\',\'{{{Des raccourcis}}} {italique} {{gras}} <code>du code</code>\',\'Un modele <modeleinexistant|lien=[->https://www.spip.net]>\',\'Un texte avec des retour
+    public static function providerSqliteSqliIn(): array {
+        return [
+            0 =>
+            [
+                0 => '(id_rubrique  IN (1,2,3))',
+                1 => 'id_rubrique',
+                2 => '1,2,3',
+            ],
+            1 =>
+            [
+                0 => '(id_rubrique  IN (1,2,3))',
+                1 => 'id_rubrique',
+                2 =>
+                [
+                    0 => 1,
+                    1 => 2,
+                    2 => 3,
+                ],
+            ],
+            2 =>
+            [
+                0 => '(id_rubrique NOT IN (1,2,3))',
+                1 => 'id_rubrique',
+                2 => '1,2,3',
+                3 => 'NOT',
+            ],
+            3 =>
+            [
+                0 => '(id_rubrique NOT IN (1,2,3))',
+                1 => 'id_rubrique',
+                2 =>
+                [
+                    0 => 1,
+                    1 => 2,
+                    2 => 3,
+                ],
+                3 => 'NOT',
+            ],
+            4 =>
+            [
+                0 => '0=1',
+                1 => 'id_rubrique',
+                2 =>
+                [],
+            ],
+            5 =>
+            [
+                0 => '(id_rubrique  IN (\'\',0,\'Un texte avec des <a href="http://spip.net">liens</a> [Article 1->art1] [spip->https://www.spip.net] https://www.spip.net\',\'Un texte avec des entit&eacute;s &amp;&lt;&gt;&quot;\',\'Un texte avec des entit&amp;eacute;s echap&amp;eacute; &amp;amp;&amp;lt;&amp;gt;&amp;quot;\',\'Un texte avec des entit&#233;s num&#233;riques &#38;&#60;&#62;&quot;\',\'Un texte avec des entit&amp;#233;s num&amp;#233;riques echap&amp;#233;es &amp;#38;&amp;#60;&amp;#62;&amp;quot;\',\'Un texte sans entites &<>"\'\'\',\'{{{Des raccourcis}}} {italique} {{gras}} <code>du code</code>\',\'Un modele <modeleinexistant|lien=[->https://www.spip.net]>\',\'Un texte avec des retour
 a la ligne et meme des
 
 paragraphes\'))',
-				1 => 'id_rubrique',
-				2 =>
-				[
-					0 => '',
-					1 => '0',
-					2 => 'Un texte avec des <a href="http://spip.net">liens</a> [Article 1->art1] [spip->https://www.spip.net] https://www.spip.net',
-					3 => 'Un texte avec des entit&eacute;s &amp;&lt;&gt;&quot;',
-					4 => 'Un texte avec des entit&amp;eacute;s echap&amp;eacute; &amp;amp;&amp;lt;&amp;gt;&amp;quot;',
-					5 => 'Un texte avec des entit&#233;s num&#233;riques &#38;&#60;&#62;&quot;',
-					6 => 'Un texte avec des entit&amp;#233;s num&amp;#233;riques echap&amp;#233;es &amp;#38;&amp;#60;&amp;#62;&amp;quot;',
-					7 => 'Un texte sans entites &<>"\'',
-					8 => '{{{Des raccourcis}}} {italique} {{gras}} <code>du code</code>',
-					9 => 'Un modele <modeleinexistant|lien=[->https://www.spip.net]>',
-					10 => 'Un texte avec des retour
+                1 => 'id_rubrique',
+                2 =>
+                [
+                    0 => '',
+                    1 => '0',
+                    2 => 'Un texte avec des <a href="http://spip.net">liens</a> [Article 1->art1] [spip->https://www.spip.net] https://www.spip.net',
+                    3 => 'Un texte avec des entit&eacute;s &amp;&lt;&gt;&quot;',
+                    4 => 'Un texte avec des entit&amp;eacute;s echap&amp;eacute; &amp;amp;&amp;lt;&amp;gt;&amp;quot;',
+                    5 => 'Un texte avec des entit&#233;s num&#233;riques &#38;&#60;&#62;&quot;',
+                    6 => 'Un texte avec des entit&amp;#233;s num&amp;#233;riques echap&amp;#233;es &amp;#38;&amp;#60;&amp;#62;&amp;quot;',
+                    7 => 'Un texte sans entites &<>"\'',
+                    8 => '{{{Des raccourcis}}} {italique} {{gras}} <code>du code</code>',
+                    9 => 'Un modele <modeleinexistant|lien=[->https://www.spip.net]>',
+                    10 => 'Un texte avec des retour
 a la ligne et meme des
 
 paragraphes',
-				],
-			],
-			6 =>
-			[
-				0 => '(id_rubrique  IN (0,-1,1,2,3,4,5,6,7,10,20,30,50,100,1000,10000))',
-				1 => 'id_rubrique',
-				2 =>
-				[
-					0 => 0,
-					1 => -1,
-					2 => 1,
-					3 => 2,
-					4 => 3,
-					5 => 4,
-					6 => 5,
-					7 => 6,
-					8 => 7,
-					9 => 10,
-					10 => 20,
-					11 => 30,
-					12 => 50,
-					13 => 100,
-					14 => 1000,
-					15 => 10000,
-				],
-			],
-			7 =>
-			[
-				0 => '0=1',
-				1 => 'id_rubrique',
-				2 =>
-				[
-					0 =>
-					[],
-					1 =>
-					[
-						0 => '',
-						1 => '0',
-						2 => 'Un texte avec des <a href="http://spip.net">liens</a> [Article 1->art1] [spip->https://www.spip.net] https://www.spip.net',
-						3 => 'Un texte avec des entit&eacute;s &amp;&lt;&gt;&quot;',
-						4 => 'Un texte avec des entit&amp;eacute;s echap&amp;eacute; &amp;amp;&amp;lt;&amp;gt;&amp;quot;',
-						5 => 'Un texte avec des entit&#233;s num&#233;riques &#38;&#60;&#62;&quot;',
-						6 => 'Un texte avec des entit&amp;#233;s num&amp;#233;riques echap&amp;#233;es &amp;#38;&amp;#60;&amp;#62;&amp;quot;',
-						7 => 'Un texte sans entites &<>"\'',
-						8 => '{{{Des raccourcis}}} {italique} {{gras}} <code>du code</code>',
-						9 => 'Un modele <modeleinexistant|lien=[->https://www.spip.net]>',
-						10 => 'Un texte avec des retour
+                ],
+            ],
+            6 =>
+            [
+                0 => '(id_rubrique  IN (0,-1,1,2,3,4,5,6,7,10,20,30,50,100,1000,10000))',
+                1 => 'id_rubrique',
+                2 =>
+                [
+                    0 => 0,
+                    1 => -1,
+                    2 => 1,
+                    3 => 2,
+                    4 => 3,
+                    5 => 4,
+                    6 => 5,
+                    7 => 6,
+                    8 => 7,
+                    9 => 10,
+                    10 => 20,
+                    11 => 30,
+                    12 => 50,
+                    13 => 100,
+                    14 => 1000,
+                    15 => 10000,
+                ],
+            ],
+            7 =>
+            [
+                0 => '0=1',
+                1 => 'id_rubrique',
+                2 =>
+                [
+                    0 =>
+                    [],
+                    1 =>
+                    [
+                        0 => '',
+                        1 => '0',
+                        2 => 'Un texte avec des <a href="http://spip.net">liens</a> [Article 1->art1] [spip->https://www.spip.net] https://www.spip.net',
+                        3 => 'Un texte avec des entit&eacute;s &amp;&lt;&gt;&quot;',
+                        4 => 'Un texte avec des entit&amp;eacute;s echap&amp;eacute; &amp;amp;&amp;lt;&amp;gt;&amp;quot;',
+                        5 => 'Un texte avec des entit&#233;s num&#233;riques &#38;&#60;&#62;&quot;',
+                        6 => 'Un texte avec des entit&amp;#233;s num&amp;#233;riques echap&amp;#233;es &amp;#38;&amp;#60;&amp;#62;&amp;quot;',
+                        7 => 'Un texte sans entites &<>"\'',
+                        8 => '{{{Des raccourcis}}} {italique} {{gras}} <code>du code</code>',
+                        9 => 'Un modele <modeleinexistant|lien=[->https://www.spip.net]>',
+                        10 => 'Un texte avec des retour
 a la ligne et meme des
 
 paragraphes',
-					],
-					2 =>
-					[
-						0 => 0,
-						1 => -1,
-						2 => 1,
-						3 => 2,
-						4 => 3,
-						5 => 4,
-						6 => 5,
-						7 => 6,
-						8 => 7,
-						9 => 10,
-						10 => 20,
-						11 => 30,
-						12 => 50,
-						13 => 100,
-						14 => 1000,
-						15 => 10000,
-					],
-					3 =>
-					[
-						0 => true,
-						1 => false,
-					],
-				],
-			],
-			8 =>
-			[
-				0 => '(id_rubrique  IN (2))',
-				1 => 'id_rubrique',
-				2 => 2,
-			],
-			9 =>
-			[
-				0 => '(id_rubrique  IN (1,0))',
-				1 => 'id_rubrique',
-				2 =>
-				[
-					0 => true,
-					1 => false,
-				],
-			],
-		];
-	}
+                    ],
+                    2 =>
+                    [
+                        0 => 0,
+                        1 => -1,
+                        2 => 1,
+                        3 => 2,
+                        4 => 3,
+                        5 => 4,
+                        6 => 5,
+                        7 => 6,
+                        8 => 7,
+                        9 => 10,
+                        10 => 20,
+                        11 => 30,
+                        12 => 50,
+                        13 => 100,
+                        14 => 1000,
+                        15 => 10000,
+                    ],
+                    3 =>
+                    [
+                        0 => true,
+                        1 => false,
+                    ],
+                ],
+            ],
+            8 =>
+            [
+                0 => '(id_rubrique  IN (2))',
+                1 => 'id_rubrique',
+                2 => 2,
+            ],
+            9 =>
+            [
+                0 => '(id_rubrique  IN (1,0))',
+                1 => 'id_rubrique',
+                2 =>
+                [
+                    0 => true,
+                    1 => false,
+                ],
+            ],
+        ];
+    }
 
-	private function getSqlType(): string {
-		return $GLOBALS['connexions'][0]['type'] ?? '';
-	}
+    private function getSqlType(): string {
+        return $GLOBALS['connexions'][0]['type'] ?? '';
+    }
 }

ecrire/tests/Distant/UrlToAsciiTest.php

Indentation +36 added lines, -36 removed lines

@@ -13,42 +13,42 @@
 
 class UrlToAsciiTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('./inc/distant.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('./inc/distant.php', '', true);
+    }
 
-	#[DataProvider('providerDistantUrlToAscii')]
-	public function testDistantUrlToAscii($expected, ...$args): void {
-		$actual = url_to_ascii(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerDistantUrlToAscii')]
+    public function testDistantUrlToAscii($expected, ...$args): void {
+        $actual = url_to_ascii(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerDistantUrlToAscii(): array {
-		return [
-			0 => [
-				0 => 'http://www.spip.net/',
-				1 => 'http://www.spip.net/',
-			],
-			1 => [
-				0 => 'http://www.spip.net/fr_article879.html#BOUCLE-ARTICLES-',
-				1 => 'http://www.spip.net/fr_article879.html#BOUCLE-ARTICLES-',
-			],
-			2 => [
-				0 => 'http://user:pass@www.spip.net:80/fr_article879.html#BOUCLE-ARTICLES-',
-				1 => 'http://user:pass@www.spip.net:80/fr_article879.html#BOUCLE-ARTICLES-',
-			],
-			3 => [
-				0 => 'http://www.xn--spap-7pa.net/',
-				1 => 'http://www.spaïp.net/',
-			],
-			4 => [
-				0 => 'http://www.xn--spap-7pa.net/fr_article879.html#BOUCLE-ARTICLES-',
-				1 => 'http://www.spaïp.net/fr_article879.html#BOUCLE-ARTICLES-',
-			],
-			5 => [
-				0 => 'http://user:pass@www.xn--spap-7pa.net:80/fr_article879.html#BOUCLE-ARTICLES-',
-				1 => 'http://user:pass@www.spaïp.net:80/fr_article879.html#BOUCLE-ARTICLES-',
-			],
-		];
-	}
+    public static function providerDistantUrlToAscii(): array {
+        return [
+            0 => [
+                0 => 'http://www.spip.net/',
+                1 => 'http://www.spip.net/',
+            ],
+            1 => [
+                0 => 'http://www.spip.net/fr_article879.html#BOUCLE-ARTICLES-',
+                1 => 'http://www.spip.net/fr_article879.html#BOUCLE-ARTICLES-',
+            ],
+            2 => [
+                0 => 'http://user:pass@www.spip.net:80/fr_article879.html#BOUCLE-ARTICLES-',
+                1 => 'http://user:pass@www.spip.net:80/fr_article879.html#BOUCLE-ARTICLES-',
+            ],
+            3 => [
+                0 => 'http://www.xn--spap-7pa.net/',
+                1 => 'http://www.spaïp.net/',
+            ],
+            4 => [
+                0 => 'http://www.xn--spap-7pa.net/fr_article879.html#BOUCLE-ARTICLES-',
+                1 => 'http://www.spaïp.net/fr_article879.html#BOUCLE-ARTICLES-',
+            ],
+            5 => [
+                0 => 'http://user:pass@www.xn--spap-7pa.net:80/fr_article879.html#BOUCLE-ARTICLES-',
+                1 => 'http://user:pass@www.spaïp.net:80/fr_article879.html#BOUCLE-ARTICLES-',
+            ],
+        ];
+    }
 }

ecrire/tests/Distant/NeedProxyTest.php

Indentation +42 added lines, -42 removed lines

@@ -13,49 +13,49 @@
 
 class NeedProxyTest extends TestCase
 {
-	public static function setUpBeforeClass(): void {
-		find_in_path('./inc/distant.php', '', true);
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('./inc/distant.php', '', true);
+    }
 
-	#[DataProvider('providerDistantNeedProxy')]
-	public function testDistantNeedProxy($expected, ...$args): void {
-		$actual = need_proxy(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[DataProvider('providerDistantNeedProxy')]
+    public function testDistantNeedProxy($expected, ...$args): void {
+        $actual = need_proxy(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerDistantNeedProxy(): array {
-		return [
-			0 => [
-				0 => 'http://monproxy.example.org',
-				1 => 'sous.domaine.spip.net',
-				2 => 'http://monproxy.example.org',
-				3 => 'spip.net',
-			],
-			1 => [
-				0 => '',
-				1 => 'sous.domaine.spip.net',
-				2 => 'http://monproxy.example.org',
-				3 => '.spip.net',
-			],
-			2 => [
-				0 => '',
-				1 => 'sous.domaine.spip.net',
-				2 => 'http://monproxy.example.org',
-				3 => '.spip.net
+    public static function providerDistantNeedProxy(): array {
+        return [
+            0 => [
+                0 => 'http://monproxy.example.org',
+                1 => 'sous.domaine.spip.net',
+                2 => 'http://monproxy.example.org',
+                3 => 'spip.net',
+            ],
+            1 => [
+                0 => '',
+                1 => 'sous.domaine.spip.net',
+                2 => 'http://monproxy.example.org',
+                3 => '.spip.net',
+            ],
+            2 => [
+                0 => '',
+                1 => 'sous.domaine.spip.net',
+                2 => 'http://monproxy.example.org',
+                3 => '.spip.net
 .net',
-			],
-			3 => [
-				0 => '',
-				1 => 'sous.domaine.spip.net',
-				2 => 'http://monproxy.example.org',
-				3 => 'sous.domaine.spip.net',
-			],
-			4 => [
-				0 => 'http://monproxy.example.org',
-				1 => 'sous.domaine.spip.net',
-				2 => 'http://monproxy.example.org',
-				3 => '.sous.domaine.spip.net',
-			],
-		];
-	}
+            ],
+            3 => [
+                0 => '',
+                1 => 'sous.domaine.spip.net',
+                2 => 'http://monproxy.example.org',
+                3 => 'sous.domaine.spip.net',
+            ],
+            4 => [
+                0 => 'http://monproxy.example.org',
+                1 => 'sous.domaine.spip.net',
+                2 => 'http://monproxy.example.org',
+                3 => '.sous.domaine.spip.net',
+            ],
+        ];
+    }
 }