Inspection of "docs(changelog): retrait des entrées releasées" - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( f2008e...da65df )

by cam

created 2023-12-18 13:08 UTC

Status

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

@@ -11,116 +11,116 @@
 block discarded – undo
 
 class FormHiddenCase extends TestCase
 {
-	public const TYPE = '';
+    public const TYPE = '';
 
-	protected static ?int $id_rubrique;
+    protected static ?int $id_rubrique;
 
-	public static function setUpBeforeClass(): void {
-		find_in_path('inc/filtres.php', '', true);
-		self::backupUrls();
-		if (!static::TYPE) {
-			throw new RuntimeException('Subclass needs to define TYPE');
-		}
-		$GLOBALS['type_urls'] = static::TYPE;
-		$GLOBALS['profondeur_url'] = 0;
-		self::$id_rubrique = self::getIdRubrique();
-	}
+    public static function setUpBeforeClass(): void {
+        find_in_path('inc/filtres.php', '', true);
+        self::backupUrls();
+        if (!static::TYPE) {
+            throw new RuntimeException('Subclass needs to define TYPE');
+        }
+        $GLOBALS['type_urls'] = static::TYPE;
+        $GLOBALS['profondeur_url'] = 0;
+        self::$id_rubrique = self::getIdRubrique();
+    }
 
-	public static function setTearDownAfterClass(): void {
-		self::backupUrls(true);
-	}
+    public static function setTearDownAfterClass(): void {
+        self::backupUrls(true);
+    }
 
-	public static function backupUrls(bool $restore = false): void {
-		static $type = null;
-		static $profondeur_url = 0;
-		if ($restore) {
-			$GLOBALS['type_urls'] = $type;
-			$GLOBALS['profondeur_url'] = $profondeur_url;
-		} else {
-			$type = $GLOBALS['type_urls'] ?? null;
-			$profondeur_url = $GLOBALS['profondeur_url'] ?? 0;
-		}
-	}
+    public static function backupUrls(bool $restore = false): void {
+        static $type = null;
+        static $profondeur_url = 0;
+        if ($restore) {
+            $GLOBALS['type_urls'] = $type;
+            $GLOBALS['profondeur_url'] = $profondeur_url;
+        } else {
+            $type = $GLOBALS['type_urls'] ?? null;
+            $profondeur_url = $GLOBALS['profondeur_url'] ?? 0;
+        }
+    }
 
-	public function testHasRubrique(): void {
-		$id = self::$id_rubrique;
-		if (!$id) {
-			$this->markTestSkipped('Needs a published rubrique');
-		}
-		$this->assertNotNull($id);
-	}
+    public function testHasRubrique(): void {
+        $id = self::$id_rubrique;
+        if (!$id) {
+            $this->markTestSkipped('Needs a published rubrique');
+        }
+        $this->assertNotNull($id);
+    }
 
-	#[Depends('testHasRubrique')]
-	#[DataProvider('providerFormHiddenRubrique')]
-	public function testFormHiddenRubrique($expected, ...$args): void {
-		$id = self::$id_rubrique;
-		$expected = sprintf($expected, $id);
-		$args[0] = sprintf($args[0], $id);
-		$actual = form_hidden(...$args);
-		$this->assertSame($expected, $actual);
-	}
+    #[Depends('testHasRubrique')]
+    #[DataProvider('providerFormHiddenRubrique')]
+    public function testFormHiddenRubrique($expected, ...$args): void {
+        $id = self::$id_rubrique;
+        $expected = sprintf($expected, $id);
+        $args[0] = sprintf($args[0], $id);
+        $actual = form_hidden(...$args);
+        $this->assertSame($expected, $actual);
+    }
 
-	public static function providerFormHiddenRubrique(): array {
-		$id = '%s';
-		return [
-			0 =>
-			[
-				0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
+    public static function providerFormHiddenRubrique(): array {
+        $id = '%s';
+        return [
+            0 =>
+            [
+                0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './?rubrique' . $id,
-			],
-			1 =>
-			[
-				0 => '<input name="calendrier" value="1" type="hidden"
+                1 => './?rubrique' . $id,
+            ],
+            1 =>
+            [
+                0 => '<input name="calendrier" value="1" type="hidden"
 /><input name="id_rubrique" value="' . $id . '" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './?rubrique' . $id . '&calendrier=1',
-			],
-			2 =>
-			[
-				0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
+                1 => './?rubrique' . $id . '&calendrier=1',
+            ],
+            2 =>
+            [
+                0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './rubrique' . $id . '.html',
-			],
-			3 =>
-			[
-				0 => '<input name="calendrier" value="1" type="hidden"
+                1 => './rubrique' . $id . '.html',
+            ],
+            3 =>
+            [
+                0 => '<input name="calendrier" value="1" type="hidden"
 /><input name="id_rubrique" value="' . $id . '" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './rubrique' . $id . '.html?calendrier=1',
-			],
-			4 =>
-			[
-				0 => '<input name="calendrier" value="1" type="hidden"
+                1 => './rubrique' . $id . '.html?calendrier=1',
+            ],
+            4 =>
+            [
+                0 => '<input name="calendrier" value="1" type="hidden"
 /><input name="id_rubrique" value="' . $id . '" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './?rubrique' . $id . '&amp;calendrier=1',
-			],
-			5 =>
-			[
-				0 => '<input name="calendrier" value="1" type="hidden"
+                1 => './?rubrique' . $id . '&amp;calendrier=1',
+            ],
+            5 =>
+            [
+                0 => '<input name="calendrier" value="1" type="hidden"
 /><input name="toto" value="2" type="hidden"
 /><input name="id_rubrique" value="' . $id . '" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './rubrique' . $id . '.html?calendrier=1&amp;toto=2',
-			],
-		];
-	}
+                1 => './rubrique' . $id . '.html?calendrier=1&amp;toto=2',
+            ],
+        ];
+    }
 
-	protected static function getIdRubrique(): ?int {
-		include_spip('base/abstract_sql');
-		$id_rubrique = sql_getfetsel(
-			'id_rubrique',
-			'spip_rubriques',
-			['statut = ' . sql_quote('publie')],
-			limit: '0, 1',
-		);
-		return $id_rubrique ? (int) $id_rubrique : null;
-	}
+    protected static function getIdRubrique(): ?int {
+        include_spip('base/abstract_sql');
+        $id_rubrique = sql_getfetsel(
+            'id_rubrique',
+            'spip_rubriques',
+            ['statut = ' . sql_quote('publie')],
+            limit: '0, 1',
+        );
+        return $id_rubrique ? (int) $id_rubrique : null;
+    }
 }

Please login to merge, or discard this patch.

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

@@ -65,50 +65,50 @@  discard block
 block discarded – undo
 		return [
 			0 =>
 			[
-				0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
+				0 => '<input name="id_rubrique" value="'.$id.'" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './?rubrique' . $id,
+				1 => './?rubrique'.$id,
 			],
 			1 =>
 			[
 				0 => '<input name="calendrier" value="1" type="hidden"
-/><input name="id_rubrique" value="' . $id . '" type="hidden"
+/><input name="id_rubrique" value="' . $id.'" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './?rubrique' . $id . '&calendrier=1',
+				1 => './?rubrique'.$id.'&calendrier=1',
 			],
 			2 =>
 			[
-				0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
+				0 => '<input name="id_rubrique" value="'.$id.'" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './rubrique' . $id . '.html',
+				1 => './rubrique'.$id.'.html',
 			],
 			3 =>
 			[
 				0 => '<input name="calendrier" value="1" type="hidden"
-/><input name="id_rubrique" value="' . $id . '" type="hidden"
+/><input name="id_rubrique" value="' . $id.'" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './rubrique' . $id . '.html?calendrier=1',
+				1 => './rubrique'.$id.'.html?calendrier=1',
 			],
 			4 =>
 			[
 				0 => '<input name="calendrier" value="1" type="hidden"
-/><input name="id_rubrique" value="' . $id . '" type="hidden"
+/><input name="id_rubrique" value="' . $id.'" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './?rubrique' . $id . '&amp;calendrier=1',
+				1 => './?rubrique'.$id.'&amp;calendrier=1',
 			],
 			5 =>
 			[
 				0 => '<input name="calendrier" value="1" type="hidden"
 /><input name="toto" value="2" type="hidden"
-/><input name="id_rubrique" value="' . $id . '" type="hidden"
+/><input name="id_rubrique" value="' . $id.'" type="hidden"
 /><input name="page" value="rubrique" type="hidden"
 />',
-				1 => './rubrique' . $id . '.html?calendrier=1&amp;toto=2',
+				1 => './rubrique'.$id.'.html?calendrier=1&amp;toto=2',
 			],
 		];
 	}
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
 		$id_rubrique = sql_getfetsel(
 			'id_rubrique',
 			'spip_rubriques',
-			['statut = ' . sql_quote('publie')],
+			['statut = '.sql_quote('publie')],
 			limit: '0, 1',
 		);
 		return $id_rubrique ? (int) $id_rubrique : null;

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Form/FormHiddenPropresTest.php 1 patch

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

@@ -10,5 +10,5 @@
 block discarded – undo
 
 class FormHiddenPropresTest extends FormHiddenCase
 {
-	public const TYPE = 'propres';
+    public const TYPE = 'propres';
 }

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Form/FormHiddenPageTest.php 1 patch

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

@@ -6,5 +6,5 @@
 block discarded – undo
 
 class FormHiddenPageTest extends FormHiddenCase
 {
-	public const TYPE = 'page';
+    public const TYPE = 'page';
 }

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Form/FormHiddenPropresQsTest.php 1 patch

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

@@ -6,5 +6,5 @@
 block discarded – undo
 
 class FormHiddenPropresQsTest extends FormHiddenCase
 {
-	public const TYPE = 'propres_qs';
+    public const TYPE = 'propres_qs';
 }

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Form/FormHiddenLibresTest.php 1 patch

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

@@ -6,5 +6,5 @@
 block discarded – undo
 
 class FormHiddenLibresTest extends FormHiddenCase
 {
-	public const TYPE = 'libres';
+    public const TYPE = 'libres';
 }

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Date/DateIsoTest.php 1 patch

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

		@@ -13,34 +13,34 @@
		block discarded – undo
13	13
14	14	class DateIsoTest extends TestCase
15	15	{
16		- public static function setUpBeforeClass(): void {
17		- find_in_path('inc/filtres.php', '', true);
18		- }
19		-
20		- protected function setUp(): void {
21		- date_default_timezone_set('UTC');
22		- }
23		-
24		- #[DataProvider('providerDateIso')]
25		- public function testDateIso($expected, ...$args): void {
26		- $actual = date_iso(...$args);
27		- $this->assertSame($expected, $actual);
28		- }
29		-
30		- public static function providerDateIso(): array {
31		- return [
32		- '01-01-2010' => [
33		- 0 => gmdate('Y-m-d\TH:i:s\Z', mktime(2, 5, 30, 1, 1, 2010)),
34		- 1 => '2010-01-01 02:05:30',
35		- ],
36		- 'nc-01-2010' => [
37		- 0 => gmdate('Y-m-d\TH:i:s\Z', mktime(3, 6, 40, 1, 1, 2010)),
38		- 1 => '2010-01-00 03:06:40',
39		- ],
40		- 'nc-nc-2010' => [
41		- 0 => gmdate('Y-m-d\TH:i:s\Z', mktime(4, 7, 50, 1, 1, 2010)),
42		- 1 => '2010-00-00 04:07:50',
43		- ],
44		- ];
45		- }
	16	+ public static function setUpBeforeClass(): void {
	17	+ find_in_path('inc/filtres.php', '', true);
	18	+ }
	19	+
	20	+ protected function setUp(): void {
	21	+ date_default_timezone_set('UTC');
	22	+ }
	23	+
	24	+ #[DataProvider('providerDateIso')]
	25	+ public function testDateIso($expected, ...$args): void {
	26	+ $actual = date_iso(...$args);
	27	+ $this->assertSame($expected, $actual);
	28	+ }
	29	+
	30	+ public static function providerDateIso(): array {
	31	+ return [
	32	+ '01-01-2010' => [
	33	+ 0 => gmdate('Y-m-d\TH:i:s\Z', mktime(2, 5, 30, 1, 1, 2010)),
	34	+ 1 => '2010-01-01 02:05:30',
	35	+ ],
	36	+ 'nc-01-2010' => [
	37	+ 0 => gmdate('Y-m-d\TH:i:s\Z', mktime(3, 6, 40, 1, 1, 2010)),
	38	+ 1 => '2010-01-00 03:06:40',
	39	+ ],
	40	+ 'nc-nc-2010' => [
	41	+ 0 => gmdate('Y-m-d\TH:i:s\Z', mktime(4, 7, 50, 1, 1, 2010)),
	42	+ 1 => '2010-00-00 04:07:50',
	43	+ ],
	44	+ ];
	45	+ }
46	46	}

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Date/NormaliserDateTest.php 1 patch

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

		@@ -13,333 +13,333 @@
		block discarded – undo
13	13
14	14	class NormaliserDateTest extends TestCase
15	15	{
16		- public static function setUpBeforeClass(): void {
17		- find_in_path('inc/filtres.php', '', true);
18		- }
	16	+ public static function setUpBeforeClass(): void {
	17	+ find_in_path('inc/filtres.php', '', true);
	18	+ }
19	19
20		- protected function setUp(): void {
21		- // Pour que le tests soit independant de la timezone du serveur
22		- date_default_timezone_set('Europe/Paris');
23		- }
	20	+ protected function setUp(): void {
	21	+ // Pour que le tests soit independant de la timezone du serveur
	22	+ date_default_timezone_set('Europe/Paris');
	23	+ }
24	24
25		- #[DataProvider('providerFiltresNormaliserDate')]
26		- public function testFiltresNormaliserDate($expected, ...$args): void {
27		- $actual = normaliser_date(...$args);
28		- $this->assertSame($expected, $actual);
29		- }
	25	+ #[DataProvider('providerFiltresNormaliserDate')]
	26	+ public function testFiltresNormaliserDate($expected, ...$args): void {
	27	+ $actual = normaliser_date(...$args);
	28	+ $this->assertSame($expected, $actual);
	29	+ }
30	30
31		- public static function providerFiltresNormaliserDate(): array {
32		- return [
33		- 0 => [
34		- 0 => '2001-01-01 12:33:44',
35		- 1 => '2001-00-00 12:33:44',
36		- 2 => true,
37		- ],
38		- 1 => [
39		- 0 => '2001-00-00 12:33:44',
40		- 1 => '2001-00-00 12:33:44',
41		- 2 => false,
42		- ],
43		- 2 => [
44		- 0 => '2001-03-01 09:12:57',
45		- 1 => '2001-03-00 09:12:57',
46		- 2 => true,
47		- ],
48		- 3 => [
49		- 0 => '2001-03-00 09:12:57',
50		- 1 => '2001-03-00 09:12:57',
51		- 2 => false,
52		- ],
53		- 4 => [
54		- 0 => '2001-03-01 14:12:33',
55		- 1 => '2001-02-29 14:12:33',
56		- 2 => true,
57		- ],
58		- 5 => [
59		- 0 => '2001-03-01 14:12:33',
60		- 1 => '2001-02-29 14:12:33',
61		- 2 => false,
62		- ],
63		- 6 => [
64		- 0 => '2001-07-05 18:25:24',
65		- 1 => '2001-07-05 18:25:24',
66		- 2 => true,
67		- ],
68		- 7 => [
69		- 0 => '2001-07-05 18:25:24',
70		- 1 => '2001-07-05 18:25:24',
71		- 2 => false,
72		- ],
73		- 8 => [
74		- 0 => '2001-01-01 00:00:00',
75		- 1 => '2001-01-01 00:00:00',
76		- 2 => true,
77		- ],
78		- 9 => [
79		- 0 => '2001-01-01 00:00:00',
80		- 1 => '2001-01-01 00:00:00',
81		- 2 => false,
82		- ],
83		- 10 => [
84		- 0 => '2001-12-31 23:59:59',
85		- 1 => '2001-12-31 23:59:59',
86		- 2 => true,
87		- ],
88		- 11 => [
89		- 0 => '2001-12-31 23:59:59',
90		- 1 => '2001-12-31 23:59:59',
91		- 2 => false,
92		- ],
93		- 12 => [
94		- 0 => '2001-03-01 14:12:33',
95		- 1 => '2001-03-01 14:12:33',
96		- 2 => true,
97		- ],
98		- 13 => [
99		- 0 => '2001-03-01 14:12:33',
100		- 1 => '2001-03-01 14:12:33',
101		- 2 => false,
102		- ],
103		- 14 => [
104		- 0 => '2004-02-29 14:12:33',
105		- 1 => '2004-02-29 14:12:33',
106		- 2 => true,
107		- ],
108		- 15 => [
109		- 0 => '2004-02-29 14:12:33',
110		- 1 => '2004-02-29 14:12:33',
111		- 2 => false,
112		- ],
113		- 16 => [
114		- 0 => '2012-03-20 12:00:00',
115		- 1 => '2012-03-20 12:00:00',
116		- 2 => true,
117		- ],
118		- 17 => [
119		- 0 => '2012-03-20 12:00:00',
120		- 1 => '2012-03-20 12:00:00',
121		- 2 => false,
122		- ],
123		- 18 => [
124		- 0 => '2012-09-20 12:00:00',
125		- 1 => '2012-09-20 12:00:00',
126		- 2 => true,
127		- ],
128		- 19 => [
129		- 0 => '2012-09-20 12:00:00',
130		- 1 => '2012-09-20 12:00:00',
131		- 2 => false,
132		- ],
133		- 20 => [
134		- 0 => '2012-12-22 12:00:00',
135		- 1 => '2012-12-22 12:00:00',
136		- 2 => true,
137		- ],
138		- 21 => [
139		- 0 => '2012-12-22 12:00:00',
140		- 1 => '2012-12-22 12:00:00',
141		- 2 => false,
142		- ],
143		- 22 => [
144		- 0 => '2001-07-05 00:00:00',
145		- 1 => '2001-07-05',
146		- 2 => true,
147		- ],
148		- 23 => [
149		- 0 => '2001-07-05 00:00:00',
150		- 1 => '2001-07-05',
151		- 2 => false,
152		- ],
153		- 24 => [
154		- 0 => '2001-01-01 00:00:00',
155		- 1 => '2001-01-01',
156		- 2 => true,
157		- ],
158		- 25 => [
159		- 0 => '2001-01-01 00:00:00',
160		- 1 => '2001-01-01',
161		- 2 => false,
162		- ],
163		- 26 => [
164		- 0 => '2001-12-31 00:00:00',
165		- 1 => '2001-12-31',
166		- 2 => true,
167		- ],
168		- 27 => [
169		- 0 => '2001-12-31 00:00:00',
170		- 1 => '2001-12-31',
171		- 2 => false,
172		- ],
173		- 28 => [
174		- 0 => '2012-09-21 00:00:00',
175		- 1 => '2012-09-21',
176		- 2 => true,
177		- ],
178		- 29 => [
179		- 0 => '2012-09-21 00:00:00',
180		- 1 => '2012-09-21',
181		- 2 => false,
182		- ],
183		- 30 => [
184		- 0 => '2012-12-22 00:00:00',
185		- 1 => '2012-12-22',
186		- 2 => true,
187		- ],
188		- 31 => [
189		- 0 => '2012-12-22 00:00:00',
190		- 1 => '2012-12-22',
191		- 2 => false,
192		- ],
193		- 32 => [
194		- 0 => '2001-07-05 00:00:00',
195		- 1 => '2001/07/05',
196		- 2 => true,
197		- ],
198		- 33 => [
199		- 0 => '2001-07-05 00:00:00',
200		- 1 => '2001/07/05',
201		- 2 => false,
202		- ],
203		- 34 => [
204		- 0 => '2001-01-01 00:00:00',
205		- 1 => '2001/01/01',
206		- 2 => true,
207		- ],
208		- 35 => [
209		- 0 => '2001-01-01 00:00:00',
210		- 1 => '2001/01/01',
211		- 2 => false,
212		- ],
213		- 36 => [
214		- 0 => '2001-12-31 00:00:00',
215		- 1 => '2001/12/31',
216		- 2 => true,
217		- ],
218		- 37 => [
219		- 0 => '2001-12-31 00:00:00',
220		- 1 => '2001/12/31',
221		- 2 => false,
222		- ],
223		- 38 => [
224		- 0 => '2001-03-01 00:00:00',
225		- 1 => '2001/03/01',
226		- 2 => true,
227		- ],
228		- 39 => [
229		- 0 => '2001-03-01 00:00:00',
230		- 1 => '2001/03/01',
231		- 2 => false,
232		- ],
233		- 40 => [
234		- 0 => '2004-02-29 00:00:00',
235		- 1 => '2004/02/29',
236		- 2 => true,
237		- ],
238		- 41 => [
239		- 0 => '2004-02-29 00:00:00',
240		- 1 => '2004/02/29',
241		- 2 => false,
242		- ],
243		- 42 => [
244		- 0 => '2012-03-22 00:00:00',
245		- 1 => '2012/03/22',
246		- 2 => true,
247		- ],
248		- 43 => [
249		- 0 => '2012-03-22 00:00:00',
250		- 1 => '2012/03/22',
251		- 2 => false,
252		- ],
253		- 44 => [
254		- 0 => '2012-12-22 00:00:00',
255		- 1 => '2012/12/22',
256		- 2 => true,
257		- ],
258		- 45 => [
259		- 0 => '2012-12-22 00:00:00',
260		- 1 => '2012/12/22',
261		- 2 => false,
262		- ],
263		- 46 => [
264		- 0 => '2001-05-07 00:00:00',
265		- 1 => '05/07/2001',
266		- 2 => true,
267		- ],
268		- 47 => [
269		- 0 => '2001-05-07 00:00:00',
270		- 1 => '05/07/2001',
271		- 2 => false,
272		- ],
273		- 48 => [
274		- 0 => '2001-01-01 00:00:00',
275		- 1 => '01/01/2001',
276		- 2 => true,
277		- ],
278		- 49 => [
279		- 0 => '2001-01-01 00:00:00',
280		- 1 => '01/01/2001',
281		- 2 => false,
282		- ],
283		- 50 => [
284		- 0 => '1970-01-01 01:00:00',
285		- 1 => '31/12/2001',
286		- 2 => true,
287		- ],
288		- 51 => [
289		- 0 => '1970-01-01 01:00:00',
290		- 1 => '31/12/2001',
291		- 2 => false,
292		- ],
293		- 52 => [
294		- 0 => '2001-01-03 00:00:00',
295		- 1 => '01/03/2001',
296		- 2 => true,
297		- ],
298		- 53 => [
299		- 0 => '2001-01-03 00:00:00',
300		- 1 => '01/03/2001',
301		- 2 => false,
302		- ],
303		- 54 => [
304		- 0 => '1970-01-01 01:00:00',
305		- 1 => '29/02/2004',
306		- 2 => true,
307		- ],
308		- 55 => [
309		- 0 => '1970-01-01 01:00:00',
310		- 1 => '29/02/2004',
311		- 2 => false,
312		- ],
313		- 56 => [
314		- 0 => '1970-01-01 01:00:00',
315		- 1 => '20/03/2012',
316		- 2 => true,
317		- ],
318		- 57 => [
319		- 0 => '1970-01-01 01:00:00',
320		- 1 => '20/03/2012',
321		- 2 => false,
322		- ],
323		- 58 => [
324		- 0 => '1970-01-01 01:00:00',
325		- 1 => '22/09/2012',
326		- 2 => true,
327		- ],
328		- 59 => [
329		- 0 => '1970-01-01 01:00:00',
330		- 1 => '22/09/2012',
331		- 2 => false,
332		- ],
333		- 60 => [
334		- 0 => '1970-01-01 01:00:00',
335		- 1 => '22/12/2012',
336		- 2 => true,
337		- ],
338		- 61 => [
339		- 0 => '1970-01-01 01:00:00',
340		- 1 => '22/12/2012',
341		- 2 => false,
342		- ],
343		- ];
344		- }
	31	+ public static function providerFiltresNormaliserDate(): array {
	32	+ return [
	33	+ 0 => [
	34	+ 0 => '2001-01-01 12:33:44',
	35	+ 1 => '2001-00-00 12:33:44',
	36	+ 2 => true,
	37	+ ],
	38	+ 1 => [
	39	+ 0 => '2001-00-00 12:33:44',
	40	+ 1 => '2001-00-00 12:33:44',
	41	+ 2 => false,
	42	+ ],
	43	+ 2 => [
	44	+ 0 => '2001-03-01 09:12:57',
	45	+ 1 => '2001-03-00 09:12:57',
	46	+ 2 => true,
	47	+ ],
	48	+ 3 => [
	49	+ 0 => '2001-03-00 09:12:57',
	50	+ 1 => '2001-03-00 09:12:57',
	51	+ 2 => false,
	52	+ ],
	53	+ 4 => [
	54	+ 0 => '2001-03-01 14:12:33',
	55	+ 1 => '2001-02-29 14:12:33',
	56	+ 2 => true,
	57	+ ],
	58	+ 5 => [
	59	+ 0 => '2001-03-01 14:12:33',
	60	+ 1 => '2001-02-29 14:12:33',
	61	+ 2 => false,
	62	+ ],
	63	+ 6 => [
	64	+ 0 => '2001-07-05 18:25:24',
	65	+ 1 => '2001-07-05 18:25:24',
	66	+ 2 => true,
	67	+ ],
	68	+ 7 => [
	69	+ 0 => '2001-07-05 18:25:24',
	70	+ 1 => '2001-07-05 18:25:24',
	71	+ 2 => false,
	72	+ ],
	73	+ 8 => [
	74	+ 0 => '2001-01-01 00:00:00',
	75	+ 1 => '2001-01-01 00:00:00',
	76	+ 2 => true,
	77	+ ],
	78	+ 9 => [
	79	+ 0 => '2001-01-01 00:00:00',
	80	+ 1 => '2001-01-01 00:00:00',
	81	+ 2 => false,
	82	+ ],
	83	+ 10 => [
	84	+ 0 => '2001-12-31 23:59:59',
	85	+ 1 => '2001-12-31 23:59:59',
	86	+ 2 => true,
	87	+ ],
	88	+ 11 => [
	89	+ 0 => '2001-12-31 23:59:59',
	90	+ 1 => '2001-12-31 23:59:59',
	91	+ 2 => false,
	92	+ ],
	93	+ 12 => [
	94	+ 0 => '2001-03-01 14:12:33',
	95	+ 1 => '2001-03-01 14:12:33',
	96	+ 2 => true,
	97	+ ],
	98	+ 13 => [
	99	+ 0 => '2001-03-01 14:12:33',
	100	+ 1 => '2001-03-01 14:12:33',
	101	+ 2 => false,
	102	+ ],
	103	+ 14 => [
	104	+ 0 => '2004-02-29 14:12:33',
	105	+ 1 => '2004-02-29 14:12:33',
	106	+ 2 => true,
	107	+ ],
	108	+ 15 => [
	109	+ 0 => '2004-02-29 14:12:33',
	110	+ 1 => '2004-02-29 14:12:33',
	111	+ 2 => false,
	112	+ ],
	113	+ 16 => [
	114	+ 0 => '2012-03-20 12:00:00',
	115	+ 1 => '2012-03-20 12:00:00',
	116	+ 2 => true,
	117	+ ],
	118	+ 17 => [
	119	+ 0 => '2012-03-20 12:00:00',
	120	+ 1 => '2012-03-20 12:00:00',
	121	+ 2 => false,
	122	+ ],
	123	+ 18 => [
	124	+ 0 => '2012-09-20 12:00:00',
	125	+ 1 => '2012-09-20 12:00:00',
	126	+ 2 => true,
	127	+ ],
	128	+ 19 => [
	129	+ 0 => '2012-09-20 12:00:00',
	130	+ 1 => '2012-09-20 12:00:00',
	131	+ 2 => false,
	132	+ ],
	133	+ 20 => [
	134	+ 0 => '2012-12-22 12:00:00',
	135	+ 1 => '2012-12-22 12:00:00',
	136	+ 2 => true,
	137	+ ],
	138	+ 21 => [
	139	+ 0 => '2012-12-22 12:00:00',
	140	+ 1 => '2012-12-22 12:00:00',
	141	+ 2 => false,
	142	+ ],
	143	+ 22 => [
	144	+ 0 => '2001-07-05 00:00:00',
	145	+ 1 => '2001-07-05',
	146	+ 2 => true,
	147	+ ],
	148	+ 23 => [
	149	+ 0 => '2001-07-05 00:00:00',
	150	+ 1 => '2001-07-05',
	151	+ 2 => false,
	152	+ ],
	153	+ 24 => [
	154	+ 0 => '2001-01-01 00:00:00',
	155	+ 1 => '2001-01-01',
	156	+ 2 => true,
	157	+ ],
	158	+ 25 => [
	159	+ 0 => '2001-01-01 00:00:00',
	160	+ 1 => '2001-01-01',
	161	+ 2 => false,
	162	+ ],
	163	+ 26 => [
	164	+ 0 => '2001-12-31 00:00:00',
	165	+ 1 => '2001-12-31',
	166	+ 2 => true,
	167	+ ],
	168	+ 27 => [
	169	+ 0 => '2001-12-31 00:00:00',
	170	+ 1 => '2001-12-31',
	171	+ 2 => false,
	172	+ ],
	173	+ 28 => [
	174	+ 0 => '2012-09-21 00:00:00',
	175	+ 1 => '2012-09-21',
	176	+ 2 => true,
	177	+ ],
	178	+ 29 => [
	179	+ 0 => '2012-09-21 00:00:00',
	180	+ 1 => '2012-09-21',
	181	+ 2 => false,
	182	+ ],
	183	+ 30 => [
	184	+ 0 => '2012-12-22 00:00:00',
	185	+ 1 => '2012-12-22',
	186	+ 2 => true,
	187	+ ],
	188	+ 31 => [
	189	+ 0 => '2012-12-22 00:00:00',
	190	+ 1 => '2012-12-22',
	191	+ 2 => false,
	192	+ ],
	193	+ 32 => [
	194	+ 0 => '2001-07-05 00:00:00',
	195	+ 1 => '2001/07/05',
	196	+ 2 => true,
	197	+ ],
	198	+ 33 => [
	199	+ 0 => '2001-07-05 00:00:00',
	200	+ 1 => '2001/07/05',
	201	+ 2 => false,
	202	+ ],
	203	+ 34 => [
	204	+ 0 => '2001-01-01 00:00:00',
	205	+ 1 => '2001/01/01',
	206	+ 2 => true,
	207	+ ],
	208	+ 35 => [
	209	+ 0 => '2001-01-01 00:00:00',
	210	+ 1 => '2001/01/01',
	211	+ 2 => false,
	212	+ ],
	213	+ 36 => [
	214	+ 0 => '2001-12-31 00:00:00',
	215	+ 1 => '2001/12/31',
	216	+ 2 => true,
	217	+ ],
	218	+ 37 => [
	219	+ 0 => '2001-12-31 00:00:00',
	220	+ 1 => '2001/12/31',
	221	+ 2 => false,
	222	+ ],
	223	+ 38 => [
	224	+ 0 => '2001-03-01 00:00:00',
	225	+ 1 => '2001/03/01',
	226	+ 2 => true,
	227	+ ],
	228	+ 39 => [
	229	+ 0 => '2001-03-01 00:00:00',
	230	+ 1 => '2001/03/01',
	231	+ 2 => false,
	232	+ ],
	233	+ 40 => [
	234	+ 0 => '2004-02-29 00:00:00',
	235	+ 1 => '2004/02/29',
	236	+ 2 => true,
	237	+ ],
	238	+ 41 => [
	239	+ 0 => '2004-02-29 00:00:00',
	240	+ 1 => '2004/02/29',
	241	+ 2 => false,
	242	+ ],
	243	+ 42 => [
	244	+ 0 => '2012-03-22 00:00:00',
	245	+ 1 => '2012/03/22',
	246	+ 2 => true,
	247	+ ],
	248	+ 43 => [
	249	+ 0 => '2012-03-22 00:00:00',
	250	+ 1 => '2012/03/22',
	251	+ 2 => false,
	252	+ ],
	253	+ 44 => [
	254	+ 0 => '2012-12-22 00:00:00',
	255	+ 1 => '2012/12/22',
	256	+ 2 => true,
	257	+ ],
	258	+ 45 => [
	259	+ 0 => '2012-12-22 00:00:00',
	260	+ 1 => '2012/12/22',
	261	+ 2 => false,
	262	+ ],
	263	+ 46 => [
	264	+ 0 => '2001-05-07 00:00:00',
	265	+ 1 => '05/07/2001',
	266	+ 2 => true,
	267	+ ],
	268	+ 47 => [
	269	+ 0 => '2001-05-07 00:00:00',
	270	+ 1 => '05/07/2001',
	271	+ 2 => false,
	272	+ ],
	273	+ 48 => [
	274	+ 0 => '2001-01-01 00:00:00',
	275	+ 1 => '01/01/2001',
	276	+ 2 => true,
	277	+ ],
	278	+ 49 => [
	279	+ 0 => '2001-01-01 00:00:00',
	280	+ 1 => '01/01/2001',
	281	+ 2 => false,
	282	+ ],
	283	+ 50 => [
	284	+ 0 => '1970-01-01 01:00:00',
	285	+ 1 => '31/12/2001',
	286	+ 2 => true,
	287	+ ],
	288	+ 51 => [
	289	+ 0 => '1970-01-01 01:00:00',
	290	+ 1 => '31/12/2001',
	291	+ 2 => false,
	292	+ ],
	293	+ 52 => [
	294	+ 0 => '2001-01-03 00:00:00',
	295	+ 1 => '01/03/2001',
	296	+ 2 => true,
	297	+ ],
	298	+ 53 => [
	299	+ 0 => '2001-01-03 00:00:00',
	300	+ 1 => '01/03/2001',
	301	+ 2 => false,
	302	+ ],
	303	+ 54 => [
	304	+ 0 => '1970-01-01 01:00:00',
	305	+ 1 => '29/02/2004',
	306	+ 2 => true,
	307	+ ],
	308	+ 55 => [
	309	+ 0 => '1970-01-01 01:00:00',
	310	+ 1 => '29/02/2004',
	311	+ 2 => false,
	312	+ ],
	313	+ 56 => [
	314	+ 0 => '1970-01-01 01:00:00',
	315	+ 1 => '20/03/2012',
	316	+ 2 => true,
	317	+ ],
	318	+ 57 => [
	319	+ 0 => '1970-01-01 01:00:00',
	320	+ 1 => '20/03/2012',
	321	+ 2 => false,
	322	+ ],
	323	+ 58 => [
	324	+ 0 => '1970-01-01 01:00:00',
	325	+ 1 => '22/09/2012',
	326	+ 2 => true,
	327	+ ],
	328	+ 59 => [
	329	+ 0 => '1970-01-01 01:00:00',
	330	+ 1 => '22/09/2012',
	331	+ 2 => false,
	332	+ ],
	333	+ 60 => [
	334	+ 0 => '1970-01-01 01:00:00',
	335	+ 1 => '22/12/2012',
	336	+ 2 => true,
	337	+ ],
	338	+ 61 => [
	339	+ 0 => '1970-01-01 01:00:00',
	340	+ 1 => '22/12/2012',
	341	+ 2 => false,
	342	+ ],
	343	+ ];
	344	+ }
345	345	}

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Date/AffdateTest.php 1 patch

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

		@@ -13,75 +13,75 @@
		block discarded – undo
13	13
14	14	class AffdateTest extends TestCase
15	15	{
16		- public static function setUpBeforeClass(): void {
17		- find_in_path('inc/filtres.php', '', true);
18		- }
	16	+ public static function setUpBeforeClass(): void {
	17	+ find_in_path('inc/filtres.php', '', true);
	18	+ }
19	19
20		- #[DataProvider('providerAffdateWithoutDay')]
21		- public function testAffdateWithoutDay($expected, $date, $lang): void {
22		- $GLOBALS['spip_lang'] = $lang;
23		- $actual = affdate($date);
24		- $this->assertEquals($expected, $actual);
25		- }
	20	+ #[DataProvider('providerAffdateWithoutDay')]
	21	+ public function testAffdateWithoutDay($expected, $date, $lang): void {
	22	+ $GLOBALS['spip_lang'] = $lang;
	23	+ $actual = affdate($date);
	24	+ $this->assertEquals($expected, $actual);
	25	+ }
26	26
27		- public static function providerAffdateWithoutDay(): array {
28		- return [
29		- 'ca-nc-01-2010' => [
30		- 'expected' => 'gener de 2010',
31		- 'date' => '2010-01-00 01:00:00',
32		- 'lang' => 'ca',
33		- ],
34		- 'de-nc-01-2010' => [
35		- 'expected' => 'Januar 2010',
36		- 'date' => '2010-01-00 01:00:00',
37		- 'lang' => 'de',
38		- ],
39		- 'en-nc-01-2010' => [
40		- 'expected' => 'January 2010',
41		- 'date' => '2010-01-00 01:00:00',
42		- 'lang' => 'en',
43		- ],
44		- 'es-nc-01-2010' => [
45		- 'expected' => 'enero de 2010',
46		- 'date' => '2010-01-00 01:00:00',
47		- 'lang' => 'es',
48		- ],
49		- 'fr-nc-01-2010' => [
50		- 'expected' => 'janvier 2010',
51		- 'date' => '2010-01-00 01:00:00',
52		- 'lang' => 'fr',
53		- ],
54		- 'it-nc-01-2010' => [
55		- 'expected' => 'Gennaio 2010',
56		- 'date' => '2010-01-00 01:00:00',
57		- 'lang' => 'it',
58		- ],
59		- 'nl-nc-01-2010' => [
60		- 'expected' => 'januari 2010',
61		- 'date' => '2010-01-00 01:00:00',
62		- 'lang' => 'nl',
63		- ],
64		- 'pl-nc-01-2010' => [
65		- 'expected' => 'Styczeń 2010',
66		- 'date' => '2010-01-00 01:00:00',
67		- 'lang' => 'pl',
68		- ],
69		- 'pt-nc-01-2010' => [
70		- 'expected' => 'Janeiro de 2010',
71		- 'date' => '2010-01-00 01:00:00',
72		- 'lang' => 'pt',
73		- ],
74		- ];
75		- }
	27	+ public static function providerAffdateWithoutDay(): array {
	28	+ return [
	29	+ 'ca-nc-01-2010' => [
	30	+ 'expected' => 'gener de 2010',
	31	+ 'date' => '2010-01-00 01:00:00',
	32	+ 'lang' => 'ca',
	33	+ ],
	34	+ 'de-nc-01-2010' => [
	35	+ 'expected' => 'Januar 2010',
	36	+ 'date' => '2010-01-00 01:00:00',
	37	+ 'lang' => 'de',
	38	+ ],
	39	+ 'en-nc-01-2010' => [
	40	+ 'expected' => 'January 2010',
	41	+ 'date' => '2010-01-00 01:00:00',
	42	+ 'lang' => 'en',
	43	+ ],
	44	+ 'es-nc-01-2010' => [
	45	+ 'expected' => 'enero de 2010',
	46	+ 'date' => '2010-01-00 01:00:00',
	47	+ 'lang' => 'es',
	48	+ ],
	49	+ 'fr-nc-01-2010' => [
	50	+ 'expected' => 'janvier 2010',
	51	+ 'date' => '2010-01-00 01:00:00',
	52	+ 'lang' => 'fr',
	53	+ ],
	54	+ 'it-nc-01-2010' => [
	55	+ 'expected' => 'Gennaio 2010',
	56	+ 'date' => '2010-01-00 01:00:00',
	57	+ 'lang' => 'it',
	58	+ ],
	59	+ 'nl-nc-01-2010' => [
	60	+ 'expected' => 'januari 2010',
	61	+ 'date' => '2010-01-00 01:00:00',
	62	+ 'lang' => 'nl',
	63	+ ],
	64	+ 'pl-nc-01-2010' => [
	65	+ 'expected' => 'Styczeń 2010',
	66	+ 'date' => '2010-01-00 01:00:00',
	67	+ 'lang' => 'pl',
	68	+ ],
	69	+ 'pt-nc-01-2010' => [
	70	+ 'expected' => 'Janeiro de 2010',
	71	+ 'date' => '2010-01-00 01:00:00',
	72	+ 'lang' => 'pt',
	73	+ ],
	74	+ ];
	75	+ }
76	76
77		- #[DataProvider('providerAWithoutDayAndMonth')]
78		- public function testAffdateWithoutDayAndMonth($lang): void {
79		- $GLOBALS['spip_lang'] = $lang;
80		- $this->assertEquals(2010, affdate('2010-00-00 01:00:00'));
81		- }
	77	+ #[DataProvider('providerAWithoutDayAndMonth')]
	78	+ public function testAffdateWithoutDayAndMonth($lang): void {
	79	+ $GLOBALS['spip_lang'] = $lang;
	80	+ $this->assertEquals(2010, affdate('2010-00-00 01:00:00'));
	81	+ }
82	82
83		- public static function providerAWithoutDayAndMonth(): array {
84		- $list = array_column(self::providerAffdateWithoutDay(), null, 'lang');
85		- return array_map(fn ($entry) => ['lang' => $entry['lang']], $list);
86		- }
	83	+ public static function providerAWithoutDayAndMonth(): array {
	84	+ $list = array_column(self::providerAffdateWithoutDay(), null, 'lang');
	85	+ return array_map(fn ($entry) => ['lang' => $entry['lang']], $list);
	86	+ }
87	87	}

Please login to merge, or discard this patch.

ecrire/tests/Filtre/Date/RecupHeureTest.php 1 patch

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

		@@ -13,163 +13,163 @@
		block discarded – undo
13	13
14	14	class RecupHeureTest extends TestCase
15	15	{
16		- public static function setUpBeforeClass(): void {
17		- find_in_path('inc/filtres.php', '', true);
18		- }
	16	+ public static function setUpBeforeClass(): void {
	17	+ find_in_path('inc/filtres.php', '', true);
	18	+ }
19	19
20		- #[DataProvider('providerFiltresRecupHeure')]
21		- public function testFiltresRecupHeure($expected, ...$args): void {
22		- $actual = recup_heure(...$args);
23		- $this->assertSame($expected, $actual);
24		- }
	20	+ #[DataProvider('providerFiltresRecupHeure')]
	21	+ public function testFiltresRecupHeure($expected, ...$args): void {
	22	+ $actual = recup_heure(...$args);
	23	+ $this->assertSame($expected, $actual);
	24	+ }
25	25
26		- public static function providerFiltresRecupHeure(): array {
27		- return [
28		- // pas d’heure
29		- 'yyyy-mm-dd #1' => [
30		- 0 => [
31		- 0 => 0,
32		- 1 => 0,
33		- 2 => 0,
34		- ],
35		- 1 => '0000-00-00',
36		- ],
37		- 'yyyy-mm-dd #2' => [
38		- 0 => [
39		- 0 => 0,
40		- 1 => 0,
41		- 2 => 0,
42		- ],
43		- 1 => '0001-01-01',
44		- ],
45		- 'yyyy-mm-dd #3' => [
46		- 0 => [
47		- 0 => 0,
48		- 1 => 0,
49		- 2 => 0,
50		- ],
51		- 1 => '1970-01-01',
52		- ],
53		- 'yyyy-mm-dd #4' => [
54		- 0 => [
55		- 0 => 0,
56		- 1 => 0,
57		- 2 => 0,
58		- ],
59		- 1 => '2001-07-05',
60		- ],
61		- 'yyyy/mm/dd #1' => [
62		- 0 => [
63		- 0 => 0,
64		- 1 => 0,
65		- 2 => 0,
66		- ],
67		- 1 => '2001/07/05',
68		- ],
	26	+ public static function providerFiltresRecupHeure(): array {
	27	+ return [
	28	+ // pas d’heure
	29	+ 'yyyy-mm-dd #1' => [
	30	+ 0 => [
	31	+ 0 => 0,
	32	+ 1 => 0,
	33	+ 2 => 0,
	34	+ ],
	35	+ 1 => '0000-00-00',
	36	+ ],
	37	+ 'yyyy-mm-dd #2' => [
	38	+ 0 => [
	39	+ 0 => 0,
	40	+ 1 => 0,
	41	+ 2 => 0,
	42	+ ],
	43	+ 1 => '0001-01-01',
	44	+ ],
	45	+ 'yyyy-mm-dd #3' => [
	46	+ 0 => [
	47	+ 0 => 0,
	48	+ 1 => 0,
	49	+ 2 => 0,
	50	+ ],
	51	+ 1 => '1970-01-01',
	52	+ ],
	53	+ 'yyyy-mm-dd #4' => [
	54	+ 0 => [
	55	+ 0 => 0,
	56	+ 1 => 0,
	57	+ 2 => 0,
	58	+ ],
	59	+ 1 => '2001-07-05',
	60	+ ],
	61	+ 'yyyy/mm/dd #1' => [
	62	+ 0 => [
	63	+ 0 => 0,
	64	+ 1 => 0,
	65	+ 2 => 0,
	66	+ ],
	67	+ 1 => '2001/07/05',
	68	+ ],
69	69
70		- // date(-) + heures avec secondes
71		- 'yyyy-mm-dd hh:mm:ss #1' => [
72		- 0 => [
73		- 0 => '00',
74		- 1 => '00',
75		- 2 => '00',
76		- ],
77		- 1 => '2001-01-01 00:00:00',
78		- ],
79		- 'yyyy-mm-dd hh:mm:ss #2' => [
80		- 0 => [
81		- 0 => '23',
82		- 1 => '59',
83		- 2 => '59',
84		- ],
85		- 1 => '2001-12-31 23:59:59',
86		- ],
87		- 'yyyy-mm-dd hh:mm:ss #3' => [
88		- 0 => [
89		- 0 => '12',
90		- 1 => '33',
91		- 2 => '44',
92		- ],
93		- 1 => '2001-00-00 12:33:44',
94		- ],
95		- 'yyyy-mm-dd hh:mm:ss #4' => [
96		- 0 => [
97		- 0 => '09',
98		- 1 => '12',
99		- 2 => '57',
100		- ],
101		- 1 => '2001-03-00 09:12:57',
102		- ],
	70	+ // date(-) + heures avec secondes
	71	+ 'yyyy-mm-dd hh:mm:ss #1' => [
	72	+ 0 => [
	73	+ 0 => '00',
	74	+ 1 => '00',
	75	+ 2 => '00',
	76	+ ],
	77	+ 1 => '2001-01-01 00:00:00',
	78	+ ],
	79	+ 'yyyy-mm-dd hh:mm:ss #2' => [
	80	+ 0 => [
	81	+ 0 => '23',
	82	+ 1 => '59',
	83	+ 2 => '59',
	84	+ ],
	85	+ 1 => '2001-12-31 23:59:59',
	86	+ ],
	87	+ 'yyyy-mm-dd hh:mm:ss #3' => [
	88	+ 0 => [
	89	+ 0 => '12',
	90	+ 1 => '33',
	91	+ 2 => '44',
	92	+ ],
	93	+ 1 => '2001-00-00 12:33:44',
	94	+ ],
	95	+ 'yyyy-mm-dd hh:mm:ss #4' => [
	96	+ 0 => [
	97	+ 0 => '09',
	98	+ 1 => '12',
	99	+ 2 => '57',
	100	+ ],
	101	+ 1 => '2001-03-00 09:12:57',
	102	+ ],
103	103
104		- // date(/) + heures avec secondes
105		- 'yyyy/mm/dd hh:mm:ss #1' => [
106		- 0 => [
107		- 0 => '00',
108		- 1 => '00',
109		- 2 => '00',
110		- ],
111		- 1 => '2001/01/01 00:00:00',
112		- ],
113		- 'yyyy/mm/dd hh:mm:ss #2' => [
114		- 0 => [
115		- 0 => '23',
116		- 1 => '59',
117		- 2 => '59',
118		- ],
119		- 1 => '2001/12/31 23:59:59',
120		- ],
121		- 'yyyy/mm/dd hh:mm:ss #3' => [
122		- 0 => [
123		- 0 => '12',
124		- 1 => '33',
125		- 2 => '44',
126		- ],
127		- 1 => '2001/00/00 12:33:44',
128		- ],
129		- 'yyyy/mm/dd hh:mm:ss #4' => [
130		- 0 => [
131		- 0 => '09',
132		- 1 => '12',
133		- 2 => '57',
134		- ],
135		- 1 => '2001/03/00 09:12:57',
136		- ],
	104	+ // date(/) + heures avec secondes
	105	+ 'yyyy/mm/dd hh:mm:ss #1' => [
	106	+ 0 => [
	107	+ 0 => '00',
	108	+ 1 => '00',
	109	+ 2 => '00',
	110	+ ],
	111	+ 1 => '2001/01/01 00:00:00',
	112	+ ],
	113	+ 'yyyy/mm/dd hh:mm:ss #2' => [
	114	+ 0 => [
	115	+ 0 => '23',
	116	+ 1 => '59',
	117	+ 2 => '59',
	118	+ ],
	119	+ 1 => '2001/12/31 23:59:59',
	120	+ ],
	121	+ 'yyyy/mm/dd hh:mm:ss #3' => [
	122	+ 0 => [
	123	+ 0 => '12',
	124	+ 1 => '33',
	125	+ 2 => '44',
	126	+ ],
	127	+ 1 => '2001/00/00 12:33:44',
	128	+ ],
	129	+ 'yyyy/mm/dd hh:mm:ss #4' => [
	130	+ 0 => [
	131	+ 0 => '09',
	132	+ 1 => '12',
	133	+ 2 => '57',
	134	+ ],
	135	+ 1 => '2001/03/00 09:12:57',
	136	+ ],
137	137
138		- // date + heure sans seconde
139		- 'yyyy-mm-dd hh:mm' => [
140		- 0 => [
141		- 0 => '09',
142		- 1 => '12',
143		- 2 => 0,
144		- ],
145		- 1 => '2001-03-01 09:12',
146		- ],
147		- 'yyyy/mm/dd hh:mm' => [
148		- 0 => [
149		- 0 => '09',
150		- 1 => '59',
151		- 2 => 0,
152		- ],
153		- 1 => '2001/03/01 09:59',
154		- ],
	138	+ // date + heure sans seconde
	139	+ 'yyyy-mm-dd hh:mm' => [
	140	+ 0 => [
	141	+ 0 => '09',
	142	+ 1 => '12',
	143	+ 2 => 0,
	144	+ ],
	145	+ 1 => '2001-03-01 09:12',
	146	+ ],
	147	+ 'yyyy/mm/dd hh:mm' => [
	148	+ 0 => [
	149	+ 0 => '09',
	150	+ 1 => '59',
	151	+ 2 => 0,
	152	+ ],
	153	+ 1 => '2001/03/01 09:59',
	154	+ ],
155	155
156		- // seulement heures
157		- 'hh:mm:ss' => [
158		- 0 => [
159		- 0 => '09',
160		- 1 => '12',
161		- 2 => '38',
162		- ],
163		- 1 => '09:12:38',
164		- ],
165		- 'hh:mm' => [
166		- 0 => [
167		- 0 => '09',
168		- 1 => '59',
169		- 2 => 0,
170		- ],
171		- 1 => '09:59',
172		- ],
173		- ];
174		- }
	156	+ // seulement heures
	157	+ 'hh:mm:ss' => [
	158	+ 0 => [
	159	+ 0 => '09',
	160	+ 1 => '12',
	161	+ 2 => '38',
	162	+ ],
	163	+ 1 => '09:12:38',
	164	+ ],
	165	+ 'hh:mm' => [
	166	+ 0 => [
	167	+ 0 => '09',
	168	+ 1 => '59',
	169	+ 2 => 0,
	170	+ ],
	171	+ 1 => '09:59',
	172	+ ],
	173	+ ];
	174	+ }
175	175	}

Please login to merge, or discard this patch.

		@@ -11,116 +11,116 @@
		block discarded – undo
11	11
12	12	class FormHiddenCase extends TestCase
13	13	{
14		- public const TYPE = '';
	14	+ public const TYPE = '';
15	15
16		- protected static ?int $id_rubrique;
	16	+ protected static ?int $id_rubrique;
17	17
18		- public static function setUpBeforeClass(): void {
19		- find_in_path('inc/filtres.php', '', true);
20		- self::backupUrls();
21		- if (!static::TYPE) {
22		- throw new RuntimeException('Subclass needs to define TYPE');
23		- }
24		- $GLOBALS['type_urls'] = static::TYPE;
25		- $GLOBALS['profondeur_url'] = 0;
26		- self::$id_rubrique = self::getIdRubrique();
27		- }
	18	+ public static function setUpBeforeClass(): void {
	19	+ find_in_path('inc/filtres.php', '', true);
	20	+ self::backupUrls();
	21	+ if (!static::TYPE) {
	22	+ throw new RuntimeException('Subclass needs to define TYPE');
	23	+ }
	24	+ $GLOBALS['type_urls'] = static::TYPE;
	25	+ $GLOBALS['profondeur_url'] = 0;
	26	+ self::$id_rubrique = self::getIdRubrique();
	27	+ }
28	28
29		- public static function setTearDownAfterClass(): void {
30		- self::backupUrls(true);
31		- }
	29	+ public static function setTearDownAfterClass(): void {
	30	+ self::backupUrls(true);
	31	+ }
32	32
33		- public static function backupUrls(bool $restore = false): void {
34		- static $type = null;
35		- static $profondeur_url = 0;
36		- if ($restore) {
37		- $GLOBALS['type_urls'] = $type;
38		- $GLOBALS['profondeur_url'] = $profondeur_url;
39		- } else {
40		- $type = $GLOBALS['type_urls'] ?? null;
41		- $profondeur_url = $GLOBALS['profondeur_url'] ?? 0;
42		- }
43		- }
	33	+ public static function backupUrls(bool $restore = false): void {
	34	+ static $type = null;
	35	+ static $profondeur_url = 0;
	36	+ if ($restore) {
	37	+ $GLOBALS['type_urls'] = $type;
	38	+ $GLOBALS['profondeur_url'] = $profondeur_url;
	39	+ } else {
	40	+ $type = $GLOBALS['type_urls'] ?? null;
	41	+ $profondeur_url = $GLOBALS['profondeur_url'] ?? 0;
	42	+ }
	43	+ }
44	44
45		- public function testHasRubrique(): void {
46		- $id = self::$id_rubrique;
47		- if (!$id) {
48		- $this->markTestSkipped('Needs a published rubrique');
49		- }
50		- $this->assertNotNull($id);
51		- }
	45	+ public function testHasRubrique(): void {
	46	+ $id = self::$id_rubrique;
	47	+ if (!$id) {
	48	+ $this->markTestSkipped('Needs a published rubrique');
	49	+ }
	50	+ $this->assertNotNull($id);
	51	+ }
52	52
53		- #[Depends('testHasRubrique')]
54		- #[DataProvider('providerFormHiddenRubrique')]
55		- public function testFormHiddenRubrique($expected, ...$args): void {
56		- $id = self::$id_rubrique;
57		- $expected = sprintf($expected, $id);
58		- $args[0] = sprintf($args[0], $id);
59		- $actual = form_hidden(...$args);
60		- $this->assertSame($expected, $actual);
61		- }
	53	+ #[Depends('testHasRubrique')]
	54	+ #[DataProvider('providerFormHiddenRubrique')]
	55	+ public function testFormHiddenRubrique($expected, ...$args): void {
	56	+ $id = self::$id_rubrique;
	57	+ $expected = sprintf($expected, $id);
	58	+ $args[0] = sprintf($args[0], $id);
	59	+ $actual = form_hidden(...$args);
	60	+ $this->assertSame($expected, $actual);
	61	+ }
62	62
63		- public static function providerFormHiddenRubrique(): array {
64		- $id = '%s';
65		- return [
66		- 0 =>
67		- [
68		- 0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
	63	+ public static function providerFormHiddenRubrique(): array {
	64	+ $id = '%s';
	65	+ return [
	66	+ 0 =>
	67	+ [
	68	+ 0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
69	69	/><input name="page" value="rubrique" type="hidden"
70	70	/>',
71		- 1 => './?rubrique' . $id,
72		- ],
73		- 1 =>
74		- [
75		- 0 => '<input name="calendrier" value="1" type="hidden"
	71	+ 1 => './?rubrique' . $id,
	72	+ ],
	73	+ 1 =>
	74	+ [
	75	+ 0 => '<input name="calendrier" value="1" type="hidden"
76	76	/><input name="id_rubrique" value="' . $id . '" type="hidden"
77	77	/><input name="page" value="rubrique" type="hidden"
78	78	/>',
79		- 1 => './?rubrique' . $id . '&calendrier=1',
80		- ],
81		- 2 =>
82		- [
83		- 0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
	79	+ 1 => './?rubrique' . $id . '&calendrier=1',
	80	+ ],
	81	+ 2 =>
	82	+ [
	83	+ 0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
84	84	/><input name="page" value="rubrique" type="hidden"
85	85	/>',
86		- 1 => './rubrique' . $id . '.html',
87		- ],
88		- 3 =>
89		- [
90		- 0 => '<input name="calendrier" value="1" type="hidden"
	86	+ 1 => './rubrique' . $id . '.html',
	87	+ ],
	88	+ 3 =>
	89	+ [
	90	+ 0 => '<input name="calendrier" value="1" type="hidden"
91	91	/><input name="id_rubrique" value="' . $id . '" type="hidden"
92	92	/><input name="page" value="rubrique" type="hidden"
93	93	/>',
94		- 1 => './rubrique' . $id . '.html?calendrier=1',
95		- ],
96		- 4 =>
97		- [
98		- 0 => '<input name="calendrier" value="1" type="hidden"
	94	+ 1 => './rubrique' . $id . '.html?calendrier=1',
	95	+ ],
	96	+ 4 =>
	97	+ [
	98	+ 0 => '<input name="calendrier" value="1" type="hidden"
99	99	/><input name="id_rubrique" value="' . $id . '" type="hidden"
100	100	/><input name="page" value="rubrique" type="hidden"
101	101	/>',
102		- 1 => './?rubrique' . $id . '&calendrier=1',
103		- ],
104		- 5 =>
105		- [
106		- 0 => '<input name="calendrier" value="1" type="hidden"
	102	+ 1 => './?rubrique' . $id . '&calendrier=1',
	103	+ ],
	104	+ 5 =>
	105	+ [
	106	+ 0 => '<input name="calendrier" value="1" type="hidden"
107	107	/><input name="toto" value="2" type="hidden"
108	108	/><input name="id_rubrique" value="' . $id . '" type="hidden"
109	109	/><input name="page" value="rubrique" type="hidden"
110	110	/>',
111		- 1 => './rubrique' . $id . '.html?calendrier=1&toto=2',
112		- ],
113		- ];
114		- }
	111	+ 1 => './rubrique' . $id . '.html?calendrier=1&toto=2',
	112	+ ],
	113	+ ];
	114	+ }
115	115
116		- protected static function getIdRubrique(): ?int {
117		- include_spip('base/abstract_sql');
118		- $id_rubrique = sql_getfetsel(
119		- 'id_rubrique',
120		- 'spip_rubriques',
121		- ['statut = ' . sql_quote('publie')],
122		- limit: '0, 1',
123		- );
124		- return $id_rubrique ? (int) $id_rubrique : null;
125		- }
	116	+ protected static function getIdRubrique(): ?int {
	117	+ include_spip('base/abstract_sql');
	118	+ $id_rubrique = sql_getfetsel(
	119	+ 'id_rubrique',
	120	+ 'spip_rubriques',
	121	+ ['statut = ' . sql_quote('publie')],
	122	+ limit: '0, 1',
	123	+ );
	124	+ return $id_rubrique ? (int) $id_rubrique : null;
	125	+ }
126	126	}

		@@ -65,50 +65,50 @@ discard block
		block discarded – undo
65	65	return [
66	66	0 =>
67	67	[
68		- 0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
	68	+ 0 => '<input name="id_rubrique" value="'.$id.'" type="hidden"
69	69	/><input name="page" value="rubrique" type="hidden"
70	70	/>',
71		- 1 => './?rubrique' . $id,
	71	+ 1 => './?rubrique'.$id,
72	72	],
73	73	1 =>
74	74	[
75	75	0 => '<input name="calendrier" value="1" type="hidden"
76		-/><input name="id_rubrique" value="' . $id . '" type="hidden"
	76	+/><input name="id_rubrique" value="' . $id.'" type="hidden"
77	77	/><input name="page" value="rubrique" type="hidden"
78	78	/>',
79		- 1 => './?rubrique' . $id . '&calendrier=1',
	79	+ 1 => './?rubrique'.$id.'&calendrier=1',
80	80	],
81	81	2 =>
82	82	[
83		- 0 => '<input name="id_rubrique" value="' . $id . '" type="hidden"
	83	+ 0 => '<input name="id_rubrique" value="'.$id.'" type="hidden"
84	84	/><input name="page" value="rubrique" type="hidden"
85	85	/>',
86		- 1 => './rubrique' . $id . '.html',
	86	+ 1 => './rubrique'.$id.'.html',
87	87	],
88	88	3 =>
89	89	[
90	90	0 => '<input name="calendrier" value="1" type="hidden"
91		-/><input name="id_rubrique" value="' . $id . '" type="hidden"
	91	+/><input name="id_rubrique" value="' . $id.'" type="hidden"
92	92	/><input name="page" value="rubrique" type="hidden"
93	93	/>',
94		- 1 => './rubrique' . $id . '.html?calendrier=1',
	94	+ 1 => './rubrique'.$id.'.html?calendrier=1',
95	95	],
96	96	4 =>
97	97	[
98	98	0 => '<input name="calendrier" value="1" type="hidden"
99		-/><input name="id_rubrique" value="' . $id . '" type="hidden"
	99	+/><input name="id_rubrique" value="' . $id.'" type="hidden"
100	100	/><input name="page" value="rubrique" type="hidden"
101	101	/>',
102		- 1 => './?rubrique' . $id . '&calendrier=1',
	102	+ 1 => './?rubrique'.$id.'&calendrier=1',
103	103	],
104	104	5 =>
105	105	[
106	106	0 => '<input name="calendrier" value="1" type="hidden"
107	107	/><input name="toto" value="2" type="hidden"
108		-/><input name="id_rubrique" value="' . $id . '" type="hidden"
	108	+/><input name="id_rubrique" value="' . $id.'" type="hidden"
109	109	/><input name="page" value="rubrique" type="hidden"
110	110	/>',
111		- 1 => './rubrique' . $id . '.html?calendrier=1&toto=2',
	111	+ 1 => './rubrique'.$id.'.html?calendrier=1&toto=2',
112	112	],
113	113	];
114	114	}
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	$id_rubrique = sql_getfetsel(
119	119	'id_rubrique',
120	120	'spip_rubriques',
121		- ['statut = ' . sql_quote('publie')],
	121	+ ['statut = '.sql_quote('publie')],
122	122	limit: '0, 1',
123	123	);
124	124	return $id_rubrique ? (int) $id_rubrique : null;

		@@ -10,5 +10,5 @@
		block discarded – undo
10	10
11	11	class FormHiddenPropresTest extends FormHiddenCase
12	12	{
13		- public const TYPE = 'propres';
	13	+ public const TYPE = 'propres';
14	14	}

		@@ -6,5 +6,5 @@
		block discarded – undo
6	6
7	7	class FormHiddenPageTest extends FormHiddenCase
8	8	{
9		- public const TYPE = 'page';
	9	+ public const TYPE = 'page';
10	10	}

		@@ -6,5 +6,5 @@
		block discarded – undo
6	6
7	7	class FormHiddenPropresQsTest extends FormHiddenCase
8	8	{
9		- public const TYPE = 'propres_qs';
	9	+ public const TYPE = 'propres_qs';
10	10	}

		@@ -6,5 +6,5 @@
		block discarded – undo
6	6
7	7	class FormHiddenLibresTest extends FormHiddenCase
8	8	{
9		- public const TYPE = 'libres';
	9	+ public const TYPE = 'libres';
10	10	}

spip / SPIP

Push — master ( f2008e...da65df )

Status

Category

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

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

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

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

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

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

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

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

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

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