fix: Tests sous phpunit 10

tests/EssaisTest.php

-<?php
-
-declare(strict_types=1);
-
-/***************************************************************************\
- *  SPIP, Système de publication pour l'internet                           *
- *                                                                         *
- *  Copyright © avec tendresse depuis 2001                                 *
- *  Arnaud Martin, Antoine Pitrou, Philippe Rivière, Emmanuel Saint-James  *
- *                                                                         *
- *  Ce programme est un logiciel libre distribué sous licence GNU/GPL.     *
- *  Pour plus de détails voir le fichier COPYING.txt ou l'aide en ligne.   *
-\***************************************************************************/
-
-namespace Spip\Core\Tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * LegacyUnitPhpTest test - runs all the unit/ php tests and check the ouput is 'OK'
- */
-class EssaisTest extends TestCase
-{
-	protected static $pretest_function_launched = [];
-
-	protected static $posttest_function_tolaunch = [];
-
-	public static function tearDownAfterClass(): void
-	{
-		foreach (array_keys(self::$posttest_function_tolaunch) as $posttest_function) {
-			$posttest_function();
-		}
-	}
-
-	/**
-	 * @dataProvider providerEssais
-	 */
-	public function testEssai($test_function, $input, $output)
-	{
-		$namespace = '\\Spip\\Core\\Tests\\';
-		$pretest_function = $namespace . 'pre' . $test_function;
-		$posttest_function = $namespace . 'post' . $test_function;
-		$test_function = $namespace . $test_function;
-
-		if (function_exists($pretest_function) && empty(self::$pretest_function_launched[$pretest_function])) {
-			self::$pretest_function_launched[$pretest_function] = true;
-			$pretest_function();
-		}
-
-		$result = $test_function(...$input);
-
-		if (function_exists($posttest_function)) {
-			self::$posttest_function_tolaunch[$posttest_function] = true;
-		}
-
-		if (is_array($output) && ! empty($output[0]) && is_string($output[0]) && function_exists(
-			$output[0]
-		) && ! empty($output[1]) && isset($output[2])
-		) {
-			[$fmatch, $match_string, $output] = $output;
-			if ($fmatch === 'preg_match' && $output === true) {
-				$this->assertMatchesRegularExpression($match_string, $result);
-			} elseif ($fmatch === 'preg_match' && $output === false) {
-				$this->assertDoesNotMatchRegularExpression($match_string, $result);
-			} else {
-				$this->assertEquals($fmatch($match_string, $result), $output);
-			}
-		} elseif (is_float($output) && is_float($result)) {
-			$this->assertTrue(abs($output - $result) <= 1e-10 * abs($output));
-		} else {
-			$this->assertSame($output, $result);
-			$this->assertEquals($output, $result);
-		}
-	}
-
-	public static function providerEssais()
-	{
-		$dir_base = __DIR__ . '/essais';
-		$essais_files = glob("{{$dir_base}/*.php,{$dir_base}/*/*.php,{$dir_base}/*/*/*.php}", GLOB_BRACE);
-
-		include_once __DIR__ . '/bootstrap.php';
-		$tests = [];
-		foreach ($essais_files as $essai_file) {
-			include_once($essai_file);
-
-			$joli_file = substr($essai_file, strlen($dir_base) + 1, -4);
-
-			$function_base = str_replace('/', '_', $joli_file);
-			$essais_function = '\\Spip\\Core\\Tests\\essais_' . $function_base;
-			$test_function = 'test_' . $function_base;
-
-			$essais = $essais_function();
-			$i = 0;
-			foreach ($essais as $k => $essai) {
-				$output = array_shift($essai);
-				$input = $essai;
-				$key = $joli_file . '_' . str_pad($i, 2, 0, STR_PAD_LEFT);
-				if (! is_numeric($k)) {
-					$key .= "_{$k}";
-				}
-
-				$tests[$key] = [$test_function, $input, $output];
-				++$i;
-			}
-		}
-
-		return $tests;
-	}
-
-	protected function check_equality($val1, $val2)
-	{
-		if (is_array($val1) && is_array($val2)) {
-			return ! (is_countable(array_diff_assoc_recursive($val1, $val2)) ? count(
-				array_diff_assoc_recursive($val1, $val2)
-			) : 0) && ! (is_countable(
-				array_diff_assoc_recursive($val2, $val1)
-			) ? count(array_diff_assoc_recursive($val2, $val1)) : 0)
-			;
-		} elseif (is_array($val1) || is_array($val2)) {
-			return false;
-		} elseif (is_float($val1) || is_float($val2)) {
-			return abs($val1 - $val2) <= 1e-10 * abs($val1);
-		}
-		return $val1 === $val2;
-	}
-}

tests/Filtre/AntispamTest.php

@@ -17,17 +17,10 @@ class AntispamTest extends TestCase
 		find_in_path('inc/filtres.php', '', true);
 	}
 
-	/**
-	 * @dataProvider providerFiltresAntispam
-	 */
-	public function testFiltresAntispam($expected, ...$args): void
+	public function testFiltresAntispam(): void
 	{
-		$actual = antispam(...$args);
-		$this->assertSame($expected, $actual);
+		$actual = antispam('email@domain.tld');
+		$this->assertNotContains('@', $actual);
 	}
 
-	public static function providerFiltresAntispam(): array
-	{
-		return [];
-	}
 }

tests/Filtre/Form/FormHiddenCase.php

@@ -43,7 +43,7 @@ class FormHiddenCase extends TestCase
 		}
 	}
 
-	protected function getIdRubrique(): ?int {
+	protected static function getIdRubrique(): ?int {
 		include_spip('base/abstract_sql');
 		$id_rubrique = sql_getfetsel(
 			'id_rubrique',
@@ -74,7 +74,7 @@ class FormHiddenCase extends TestCase
 
 	public static function providerFormHiddenRubrique(): array
 	{
-		$id = $this->getIdRubrique();
+		$id = self::getIdRubrique();
 		return [
 			0 =>
 			[

tests/Filtre/TextebrutTest.php

-<?php
-
-declare(strict_types=1);
-
-/**
- * Test unitaire de la fonction textebrut du fichier inc/filtres.php
- */
-
-namespace Spip\Core\Tests\Filtre;
-
-use PHPUnit\Framework\TestCase;
-
-class TextebrutTest extends TestCase
-{
-	public static function setUpBeforeClass(): void
-	{
-		find_in_path('inc/filtres.php', '', true);
-	}
-
-	/**
-	 * @dataProvider providerFiltresTextebrut
-	 */
-	public function testFiltresTextebrut($expected, ...$args): void
-	{
-		$actual = textebrut(...$args);
-		$this->assertSame($expected, $actual);
-	}
-
-	public static function providerFiltresTextebrut(): array
-	{
-		// TODO
-		$essais = [];
-		return $essais;
-	}
-}

tests/LegacyUnitHtmlTest.php

@@ -22,7 +22,7 @@ use PHPUnit\Framework\TestCase;
 class LegacyUnitHtmlTest extends TestCase
 {
 	/**
-	 * @dataProvider legacyHtmlfileNameProvider
+	 * @dataProvider providerLegacyHtmlfileName
 	 */
 	public function testLegacyUnitHtml($inFname, $output)
 	{
@@ -30,7 +30,7 @@ class LegacyUnitHtmlTest extends TestCase
 		$this->assertEquals($output, $result);
 	}
 
-	public function legacyHtmlfileNameProvider()
+	public static function providerLegacyHtmlfileName()
 	{
 		require_once(__DIR__ . '/legacy/test.inc');
 

tests/LegacyUnitPhpTest.php

@@ -22,7 +22,7 @@ use PHPUnit\Framework\TestCase;
 class LegacyUnitPhpTest extends TestCase
 {
 	/**
-	 * @dataProvider legacyPhpfileNameProvider
+	 * @dataProvider providerLegacyPhpfileName
 	 */
 	public function testLegacyUnitPHP($inFname, $output)
 	{
@@ -34,7 +34,7 @@ class LegacyUnitPhpTest extends TestCase
 		}
 	}
 
-	public function legacyPhpfileNameProvider()
+	public static function providerLegacyPhpfileName()
 	{
 		require_once(__DIR__ . '/legacy/test.inc');