spip / SPIP

ecrire/tests/Squelettes/Balise/SelfTest.php

Indentation +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@
 
 class SelfTest extends SquelettesTestCase
 {
-	public function testBaliseSelf(): never {
-		$this->assertEqualsCode('./', '#SELF');
-		$this->markTestIncomplete('More tests needed, but requires SPIP evolution with RequestInterface or so');
-	}
+    public function testBaliseSelf(): never {
+        $this->assertEqualsCode('./', '#SELF');
+        $this->markTestIncomplete('More tests needed, but requires SPIP evolution with RequestInterface or so');
+    }
 }

ecrire/tests/Squelettes/Balise/LesauteursTest.php

Indentation +10 added lines, -10 removed lines

@@ -9,19 +9,19 @@
 
 class LesauteursTest extends SquelettesTestCase
 {
-	public function testLesAuteursRenvoieQqc(): void {
-		$templating = Templating::fromString();
-		$result = $templating->render(
-			"<BOUCLE_a(ARTICLES){id_auteur>0}{0,1}>
+    public function testLesAuteursRenvoieQqc(): void {
+        $templating = Templating::fromString();
+        $result = $templating->render(
+            "<BOUCLE_a(ARTICLES){id_auteur>0}{0,1}>
 				[(#LESAUTEURS|?{OK,'LESAUTEURS a echoue'})]
 			</BOUCLE_a>
 				NA Ce test ne fonctionne que s'il existe un article ayant un auteur !
 			<//B_a>"
-		);
-		if ($this->isNa($result)) {
-			$this->markTestSkipped($result);
-		}
+        );
+        if ($this->isNa($result)) {
+            $this->markTestSkipped($result);
+        }
 
-		$this->assertOk($result);
-	}
+        $this->assertOk($result);
+    }
 }

ecrire/tests/Squelettes/Balise/InclureStatiqueTest.php

Indentation +48 added lines, -48 removed lines

@@ -9,65 +9,65 @@
 
 class InclureStatiqueTest extends SquelettesTestCase
 {
-	public function testInclureInlineNormal(): void {
-		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode('Hello World', '#INCLURE{fond=' . $dir . '/data/texte_hello_world}');
-		$this->assertEqualsCode('Hello World', '[(#INCLURE{fond=' . $dir . '/data/texte_hello_world})]');
-	}
+    public function testInclureInlineNormal(): void {
+        $dir = $this->relativePath(__DIR__);
+        $this->assertEqualsCode('Hello World', '#INCLURE{fond=' . $dir . '/data/texte_hello_world}');
+        $this->assertEqualsCode('Hello World', '[(#INCLURE{fond=' . $dir . '/data/texte_hello_world})]');
+    }
 
-	public function testInclureDouble(): void {
-		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode(
-			'Hello WorldHello World',
-			'#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
-				. '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
-		);
-		$this->assertEqualsCode(
-			'Hello WorldHello World',
-			'
+    public function testInclureDouble(): void {
+        $dir = $this->relativePath(__DIR__);
+        $this->assertEqualsCode(
+            'Hello WorldHello World',
+            '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
+                . '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
+        );
+        $this->assertEqualsCode(
+            'Hello WorldHello World',
+            '
 			#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
-				. '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
-		);
-	}
+                . '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
+        );
+    }
 
-	public function testInclureArray(): void {
-		$dir = $this->relativePath(__DIR__);
-		$array = '#LISTE{
+    public function testInclureArray(): void {
+        $dir = $this->relativePath(__DIR__);
+        $array = '#LISTE{
 			' . $dir . '/data/texte_hello_world,
 			' . $dir . '/data/texte_hello_world,
 			' . $dir . '/data/texte_hello_world}';
-		$this->assertEqualsCode('Hello WorldHello WorldHello World', "#INCLURE{fond={$array}}");
-	}
+        $this->assertEqualsCode('Hello WorldHello WorldHello World', "#INCLURE{fond={$array}}");
+    }
 
-	public function testInclureOldParam(): void {
-		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty})]');
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty})]');
-	}
+    public function testInclureOldParam(): void {
+        $dir = $this->relativePath(__DIR__);
+        $this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty})]');
+        $this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty})]');
+    }
 
-	public function testInclureNormalParam(): void {
-		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty})]');
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty})]');
-	}
+    public function testInclureNormalParam(): void {
+        $dir = $this->relativePath(__DIR__);
+        $this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty})]');
+        $this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty})]');
+    }
 
-	public function testInclureArrayParam(): void {
-		$dir = $this->relativePath(__DIR__);
-		$array = '#LISTE{
+    public function testInclureArrayParam(): void {
+        $dir = $this->relativePath(__DIR__);
+        $array = '#LISTE{
 			' . $dir . '/data/balise_env_test,
 			' . $dir . '/data/texte_hello_world,
 			' . $dir . '/data/balise_env_test}';
-		$this->assertEqualsCode('KittyHello WorldKitty', "[(#INCLURE{fond={$array}, test=Kitty})]");
-		$this->assertEqualsCode('KittyHello WorldKitty', "[(#INCLURE{fond={$array}, test=Kitty})]");
-	}
+        $this->assertEqualsCode('KittyHello WorldKitty', "[(#INCLURE{fond={$array}, test=Kitty})]");
+        $this->assertEqualsCode('KittyHello WorldKitty', "[(#INCLURE{fond={$array}, test=Kitty})]");
+    }
 
-	/**
-	 * Un inclure manquant doit creer une erreur de compilation pour SPIP qui ne doivent pas s'afficher dans le public si
-	 * visiteur
-	 */
-	public function testInclureManquantGenereErreurCompilation(): void {
-		$templating = Templating::fromString();
-		$infos = $templating->rawRender('#CACHE{0}[(#INCLURE{fond=carabistouille/de/montignac/absente}|non)ok]');
-		$this->assertCount(1, $infos['erreurs']);
-	}
+    /**
+     * Un inclure manquant doit creer une erreur de compilation pour SPIP qui ne doivent pas s'afficher dans le public si
+     * visiteur
+     */
+    public function testInclureManquantGenereErreurCompilation(): void {
+        $templating = Templating::fromString();
+        $infos = $templating->rawRender('#CACHE{0}[(#INCLURE{fond=carabistouille/de/montignac/absente}|non)ok]');
+        $this->assertCount(1, $infos['erreurs']);
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -11,52 +11,52 @@
 {
 	public function testInclureInlineNormal(): void {
 		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode('Hello World', '#INCLURE{fond=' . $dir . '/data/texte_hello_world}');
-		$this->assertEqualsCode('Hello World', '[(#INCLURE{fond=' . $dir . '/data/texte_hello_world})]');
+		$this->assertEqualsCode('Hello World', '#INCLURE{fond='.$dir.'/data/texte_hello_world}');
+		$this->assertEqualsCode('Hello World', '[(#INCLURE{fond='.$dir.'/data/texte_hello_world})]');
 	}
 
 	public function testInclureDouble(): void {
 		$dir = $this->relativePath(__DIR__);
 		$this->assertEqualsCode(
 			'Hello WorldHello World',
-			'#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
-				. '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
+			'#INCLURE{fond='.$dir.'/data/texte_hello_world}'
+				. '#INCLURE{fond='.$dir.'/data/texte_hello_world}'
 		);
 		$this->assertEqualsCode(
 			'Hello WorldHello World',
 			'
-			#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
-				. '#INCLURE{fond=' . $dir . '/data/texte_hello_world}'
+			#INCLURE{fond=' . $dir.'/data/texte_hello_world}'
+				. '#INCLURE{fond='.$dir.'/data/texte_hello_world}'
 		);
 	}
 
 	public function testInclureArray(): void {
 		$dir = $this->relativePath(__DIR__);
 		$array = '#LISTE{
-			' . $dir . '/data/texte_hello_world,
-			' . $dir . '/data/texte_hello_world,
-			' . $dir . '/data/texte_hello_world}';
+			' . $dir.'/data/texte_hello_world,
+			' . $dir.'/data/texte_hello_world,
+			' . $dir.'/data/texte_hello_world}';
 		$this->assertEqualsCode('Hello WorldHello WorldHello World', "#INCLURE{fond={$array}}");
 	}
 
 	public function testInclureOldParam(): void {
 		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty})]');
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty})]');
+		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond='.$dir.'/data/balise_env_test}{test=Kitty})]');
+		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond='.$dir.'/data/balise_env_test}{test=Kitty})]');
 	}
 
 	public function testInclureNormalParam(): void {
 		$dir = $this->relativePath(__DIR__);
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty})]');
-		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty})]');
+		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond='.$dir.'/data/balise_env_test, test=Kitty})]');
+		$this->assertEqualsCode('Kitty', '[(#INCLURE{fond='.$dir.'/data/balise_env_test, test=Kitty})]');
 	}
 
 	public function testInclureArrayParam(): void {
 		$dir = $this->relativePath(__DIR__);
 		$array = '#LISTE{
-			' . $dir . '/data/balise_env_test,
-			' . $dir . '/data/texte_hello_world,
-			' . $dir . '/data/balise_env_test}';
+			' . $dir.'/data/balise_env_test,
+			' . $dir.'/data/texte_hello_world,
+			' . $dir.'/data/balise_env_test}';
 		$this->assertEqualsCode('KittyHello WorldKitty', "[(#INCLURE{fond={$array}, test=Kitty})]");
 		$this->assertEqualsCode('KittyHello WorldKitty', "[(#INCLURE{fond={$array}, test=Kitty})]");
 	}

ecrire/tests/Squelettes/Balise/EvalTest.php

Indentation +7 added lines, -7 removed lines

@@ -8,11 +8,11 @@
 
 class EvalTest extends SquelettesTestCase
 {
-	public function testBaliseEval(): void {
-		$this->assertEmptyCode("#EVAL{''}");
-		$this->assertOkCode('#EVAL{"\'ok\'"}');
-		$this->assertEqualsCode('1', '#EVAL{1}');
-		$this->assertEqualsCode(_DIR_CACHE, '#EVAL{_DIR_CACHE}');
-		$this->assertEqualsCode('20', '#EVAL{3*5+5}');
-	}
+    public function testBaliseEval(): void {
+        $this->assertEmptyCode("#EVAL{''}");
+        $this->assertOkCode('#EVAL{"\'ok\'"}');
+        $this->assertEqualsCode('1', '#EVAL{1}');
+        $this->assertEqualsCode(_DIR_CACHE, '#EVAL{_DIR_CACHE}');
+        $this->assertEqualsCode('20', '#EVAL{3*5+5}');
+    }
 }

ecrire/tests/Squelettes/Balise/BaliseGeneriqueTest.php

Indentation +51 added lines, -51 removed lines

@@ -9,65 +9,65 @@ 
 
 class BaliseGeneriqueTest extends SquelettesTestCase
 {
-	public function testBaliseInexistante(): void {
-		$this->assertEmptyCode('#JENEXISTEPAS');
-		$this->assertEmptyCode('[(#JENEXISTEPAS)]');
-		$this->assertEmptyCode('[avant(#JENEXISTEPAS)apres]');
+    public function testBaliseInexistante(): void {
+        $this->assertEmptyCode('#JENEXISTEPAS');
+        $this->assertEmptyCode('[(#JENEXISTEPAS)]');
+        $this->assertEmptyCode('[avant(#JENEXISTEPAS)apres]');
 
-		// ceux-ci sont plus etonnant mais c'est ce qui se passe effectivement
-		$this->assertEqualsCode('{rien}', '#JENEXISTEPAS{rien}');
-		$this->assertEqualsCode('{rien}', '[(#JENEXISTEPAS{rien})]');
-		$this->assertEqualsCode('avant{rien}apres', '[avant(#JENEXISTEPAS{rien})apres]');
-	}
+        // ceux-ci sont plus etonnant mais c'est ce qui se passe effectivement
+        $this->assertEqualsCode('{rien}', '#JENEXISTEPAS{rien}');
+        $this->assertEqualsCode('{rien}', '[(#JENEXISTEPAS{rien})]');
+        $this->assertEqualsCode('avant{rien}apres', '[avant(#JENEXISTEPAS{rien})apres]');
+    }
 
-	public function testBaliseDeclaree(): void {
-		$templating = Templating::fromString([
-			'fonctions' => '
+    public function testBaliseDeclaree(): void {
+        $templating = Templating::fromString([
+            'fonctions' => '
 				function balise_JEXISTE_dist($p){
 					$p->code = "\'ok\'";
 					return $p;
 				}
 			',
-		]);
-		$this->assertOkTemplate($templating, '#JEXISTE');
-		$this->assertOkTemplate($templating, '[(#JEXISTE)]');
-	}
+        ]);
+        $this->assertOkTemplate($templating, '#JEXISTE');
+        $this->assertOkTemplate($templating, '[(#JEXISTE)]');
+    }
 
-	public function testBaliseDeclareeAvantApres(): void {
-		$templating = Templating::fromString([
-			'fonctions' => '
+    public function testBaliseDeclareeAvantApres(): void {
+        $templating = Templating::fromString([
+            'fonctions' => '
 				function balise_JEXISTE_dist($p){
 					$p->code = "\'ok\'";
 					return $p;
 				}
 			',
-		]);
+        ]);
 
-		$this->assertEqualsTemplate('avantokapres', $templating, '[avant(#JEXISTE)apres]');
-		$this->assertEqualsTemplate('avant apres', $templating, '[avant(#JEXISTE|oui)apres]');
-		$this->assertEqualsTemplate('', $templating, '[avant(#JEXISTE|non)apres]');
-	}
+        $this->assertEqualsTemplate('avantokapres', $templating, '[avant(#JEXISTE)apres]');
+        $this->assertEqualsTemplate('avant apres', $templating, '[avant(#JEXISTE|oui)apres]');
+        $this->assertEqualsTemplate('', $templating, '[avant(#JEXISTE|non)apres]');
+    }
 
-	public function testBaliseDeclareeEtParams(): void {
-		$templating = Templating::fromString([
-			'fonctions' => '
+    public function testBaliseDeclareeEtParams(): void {
+        $templating = Templating::fromString([
+            'fonctions' => '
 				function balise_JEXISTE_dist($p){
 					$p->code = "\'ok\'";
 					return $p;
 				}
 			',
-		]);
+        ]);
 
-		$this->assertOkTemplate($templating, '#JEXISTE{param}');
-		$this->assertOkTemplate($templating, '#JEXISTE{param,param}');
-		$this->assertOkTemplate($templating, '#JEXISTE{#SELF,#SQUELETTE}');
-		$this->assertOkTemplate($templating, '#JEXISTE{#VAL{#SELF}}');
-		$this->assertOkTemplate($templating, '[(#JEXISTE{[(#VAL{[(#SELF)]})]})]');
-	}
+        $this->assertOkTemplate($templating, '#JEXISTE{param}');
+        $this->assertOkTemplate($templating, '#JEXISTE{param,param}');
+        $this->assertOkTemplate($templating, '#JEXISTE{#SELF,#SQUELETTE}');
+        $this->assertOkTemplate($templating, '#JEXISTE{#VAL{#SELF}}');
+        $this->assertOkTemplate($templating, '[(#JEXISTE{[(#VAL{[(#SELF)]})]})]');
+    }
 
-	public function testBaliseDeclareeEtParamsUtiles(): void {
-		$templating = Templating::fromString([
-			'fonctions' => '
+    public function testBaliseDeclareeEtParamsUtiles(): void {
+        $templating = Templating::fromString([
+            'fonctions' => '
 				function balise_ZEXISTE_dist($p){
 					if (!$p1 = interprete_argument_balise(1,$p))
 						$p1 = "\'\'";
@@ -78,17 +78,17 @@ 
 					return $p1;
 				}
 			',
-		]);
-		$this->assertEmptyTemplate($templating, '#ZEXISTE');
-		$this->assertOkTemplate($templating, '#ZEXISTE{ok}');
-		$this->assertEqualsTemplate('avantokapres', $templating, '[avant(#ZEXISTE{ok})apres]');
-		$this->assertEqualsTemplate('avant apres', $templating, '[avant(#ZEXISTE{ok}|oui)apres]');
-		$this->assertEmptyTemplate($templating, '[avant(#ZEXISTE{ok}|non)apres]');
-	}
+        ]);
+        $this->assertEmptyTemplate($templating, '#ZEXISTE');
+        $this->assertOkTemplate($templating, '#ZEXISTE{ok}');
+        $this->assertEqualsTemplate('avantokapres', $templating, '[avant(#ZEXISTE{ok})apres]');
+        $this->assertEqualsTemplate('avant apres', $templating, '[avant(#ZEXISTE{ok}|oui)apres]');
+        $this->assertEmptyTemplate($templating, '[avant(#ZEXISTE{ok}|non)apres]');
+    }
 
-	public function testBaliseSurchargee(): void {
-		$templating = Templating::fromString([
-			'fonctions' => '
+    public function testBaliseSurchargee(): void {
+        $templating = Templating::fromString([
+            'fonctions' => '
 				function balise_REXISTE_dist($p){
 					$p->code = "\'oups\'";
 					return $p;
@@ -104,9 +104,9 @@ 
 					return $p1;
 				}
 			',
-		]);
+        ]);
 
-		$this->assertEmptyTemplate($templating, '#REXISTE');
-		$this->assertOkTemplate($templating, '#REXISTE{ok}');
-	}
+        $this->assertEmptyTemplate($templating, '#REXISTE');
+        $this->assertOkTemplate($templating, '#REXISTE{ok}');
+    }
 }

ecrire/tests/Squelettes/Balise/DossierSqueletteTest.php

Indentation +6 added lines, -6 removed lines

@@ -10,10 +10,10 @@
 
 class DossierSqueletteTest extends SquelettesTestCase
 {
-	public function testBaliseDossierSquelette(): void {
-		$loader = new StringLoader();
-		$templating = new Templating($loader);
-		$expected = dirname($loader->getSourceFile('#DOSSIER_SQUELETTE'));
-		$this->assertEqualsTemplate($expected, $templating, "#DOSSIER_SQUELETTE");
-	}
+    public function testBaliseDossierSquelette(): void {
+        $loader = new StringLoader();
+        $templating = new Templating($loader);
+        $expected = dirname($loader->getSourceFile('#DOSSIER_SQUELETTE'));
+        $this->assertEqualsTemplate($expected, $templating, "#DOSSIER_SQUELETTE");
+    }
 }

ecrire/tests/Squelettes/Balise/ConfigTest.php

Indentation +189 added lines, -189 removed lines

@@ -9,182 +9,182 @@ 
 
 class ConfigTest extends SquelettesTestCase
 {
-	public function testConfigNomAbsent(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{pasla}|non)ok]');
-	}
-
-	public function testConfigNomAbsentAvecDefaut(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{pasla,defaut}|=={defaut}|oui)ok]');
-	}
-
-	public function testConfigChaine(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{chaine}|=={une chaine}|oui)ok]');
-		$this->assertOkTemplate($templating, '[(#CONFIG{chaine,defaut}|=={une chaine}|oui)ok]');
-	}
-
-	public function testConfigValeurZero(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{zero}|=={0}|oui)ok]');
-		$this->assertOkTemplate($templating, '[(#CONFIG{zero,defaut}|=={0}|oui)ok]');
-	}
-
-	public function testConfigChaineZero(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, "[(#CONFIG{zeroc}|=={'0'}|oui)ok]");
-		$this->assertOkTemplate($templating, "[(#CONFIG{zeroc,defaut}|=={'0'}|oui)ok]");
-	}
-
-	public function testArrayAssoc(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, "[(#CONFIG{assoc,'',''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
-		$this->assertOkTemplate($templating, "[(#CONFIG{assoc,defaut,''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
-	}
-
-	public function testArraySerialize(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate(
-			$templating,
-			'[(#CONFIG{serie}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
-		);
-		$this->assertOkTemplate(
-			$templating,
-			'[(#CONFIG{serie,defaut}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
-		);
-	}
-
-	public function testMetaConfigNomAbsent(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/meta/pasla}|non)ok]');
-	}
-
-	public function testMetaConfigNomAbsentAvecDefaut(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/meta/pasla,defaut}|=={defaut}|oui)ok]');
-	}
-
-	public function testMetaConfigChaine(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/meta/chaine}|=={une chaine}|oui)ok]');
-		$this->assertOkTemplate($templating, '[(#CONFIG{/meta/chaine,defaut}|=={une chaine}|oui)ok]');
-	}
-
-	public function testMetaConfigValeurZero(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/meta/zero}|=={0}|oui)ok]');
-		$this->assertOkTemplate($templating, '[(#CONFIG{/meta/zero,defaut}|=={0}|oui)ok]');
-	}
-
-	public function testMetaConfigChaineZero(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, "[(#CONFIG{/meta/zeroc}|=={'0'}|oui)ok]");
-		$this->assertOkTemplate($templating, "[(#CONFIG{/meta/zeroc,defaut}|=={'0'}|oui)ok]");
-	}
-
-	public function testMetaArrayAssoc(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate($templating, "[(#CONFIG{/meta/assoc,'',''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
-		$this->assertOkTemplate(
-			$templating,
-			"[(#CONFIG{/meta/assoc,defaut,''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]"
-		);
-	}
-
-	public function testMetaArraySerialize(): void {
-		$templating = $this->getTemplating();
-		$this->assertOkTemplate(
-			$templating,
-			'[(#CONFIG{/meta/serie}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
-		);
-		$this->assertOkTemplate(
-			$templating,
-			'[(#CONFIG{/meta/serie,defaut}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
-		);
-	}
-
-	public function testAutreTableConfigNomAbsent(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/toto/tpasla}|non)ok]');
-	}
-
-	public function testAutreTableConfigNomAbsentAvecDefaut(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/toto/tpasla,defaut}|=={defaut}|oui)ok]');
-	}
-
-	public function testAutreTableConfigChaine(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/toto/tchaine}|=={une chaine}|oui)ok]');
-		$this->assertOkTemplate($templating, '[(#CONFIG{/toto/tchaine,defaut}|=={une chaine}|oui)ok]');
-	}
-
-	public function testAutreTableConfigValeurZero(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate($templating, '[(#CONFIG{/toto/tzero}|=={0}|oui)ok]');
-		$this->assertOkTemplate($templating, '[(#CONFIG{/toto/tzero,defaut}|=={0}|oui)ok]');
-	}
-
-	public function testAutreTableConfigChaineZero(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate($templating, "[(#CONFIG{/toto/tzeroc}|=={'0'}|oui)ok]");
-		$this->assertOkTemplate($templating, "[(#CONFIG{/toto/tzeroc,defaut}|=={'0'}|oui)ok]");
-	}
-
-	public function testAutreTableArrayAssoc(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate($templating, "[(#CONFIG{/toto/tassoc,'',''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
-		$this->assertOkTemplate(
-			$templating,
-			"[(#CONFIG{/toto/tassoc,defaut,''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]"
-		);
-	}
-
-	public function testAutreTableArraySerialize(): void {
-		$templating = $this->getTemplatingOtherTable();
-		$this->assertOkTemplate(
-			$templating,
-			'[(#CONFIG{/toto/tserie}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
-		);
-		$this->assertOkTemplate(
-			$templating,
-			'[(#CONFIG{/toto/tserie,defaut}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
-		);
-	}
-
-	private function getFakeMetaData(): array {
-		$assoc = [
-			'one' => 'element 1',
-			'two' => 'element 2',
-		];
-		return [
-			'zero' => 0,
-			'zeroc' => '0',
-			'chaine' => 'une chaine',
-			'assoc' => $assoc,
-			'serie' => serialize($assoc),
-		];
-	}
-
-	private function getFakeMetaDataT(): array {
-		$assoc = [
-			'one' => 'element 1',
-			'two' => 'element 2',
-		];
-		return [
-			'tzero' => 0,
-			'tzeroc' => '0',
-			'tchaine' => 'une chaine',
-			'tassoc' => $assoc,
-			'tserie' => serialize($assoc),
-		];
-	}
-
-	private function getTemplating(): Templating {
-		$fake = var_export($this->getFakeMetaData(), true);
-		return Templating::fromString([
-			'fonctions' => "
+    public function testConfigNomAbsent(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{pasla}|non)ok]');
+    }
+
+    public function testConfigNomAbsentAvecDefaut(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{pasla,defaut}|=={defaut}|oui)ok]');
+    }
+
+    public function testConfigChaine(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{chaine}|=={une chaine}|oui)ok]');
+        $this->assertOkTemplate($templating, '[(#CONFIG{chaine,defaut}|=={une chaine}|oui)ok]');
+    }
+
+    public function testConfigValeurZero(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{zero}|=={0}|oui)ok]');
+        $this->assertOkTemplate($templating, '[(#CONFIG{zero,defaut}|=={0}|oui)ok]');
+    }
+
+    public function testConfigChaineZero(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, "[(#CONFIG{zeroc}|=={'0'}|oui)ok]");
+        $this->assertOkTemplate($templating, "[(#CONFIG{zeroc,defaut}|=={'0'}|oui)ok]");
+    }
+
+    public function testArrayAssoc(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, "[(#CONFIG{assoc,'',''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
+        $this->assertOkTemplate($templating, "[(#CONFIG{assoc,defaut,''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
+    }
+
+    public function testArraySerialize(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate(
+            $templating,
+            '[(#CONFIG{serie}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
+        );
+        $this->assertOkTemplate(
+            $templating,
+            '[(#CONFIG{serie,defaut}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
+        );
+    }
+
+    public function testMetaConfigNomAbsent(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/meta/pasla}|non)ok]');
+    }
+
+    public function testMetaConfigNomAbsentAvecDefaut(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/meta/pasla,defaut}|=={defaut}|oui)ok]');
+    }
+
+    public function testMetaConfigChaine(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/meta/chaine}|=={une chaine}|oui)ok]');
+        $this->assertOkTemplate($templating, '[(#CONFIG{/meta/chaine,defaut}|=={une chaine}|oui)ok]');
+    }
+
+    public function testMetaConfigValeurZero(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/meta/zero}|=={0}|oui)ok]');
+        $this->assertOkTemplate($templating, '[(#CONFIG{/meta/zero,defaut}|=={0}|oui)ok]');
+    }
+
+    public function testMetaConfigChaineZero(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, "[(#CONFIG{/meta/zeroc}|=={'0'}|oui)ok]");
+        $this->assertOkTemplate($templating, "[(#CONFIG{/meta/zeroc,defaut}|=={'0'}|oui)ok]");
+    }
+
+    public function testMetaArrayAssoc(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate($templating, "[(#CONFIG{/meta/assoc,'',''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
+        $this->assertOkTemplate(
+            $templating,
+            "[(#CONFIG{/meta/assoc,defaut,''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]"
+        );
+    }
+
+    public function testMetaArraySerialize(): void {
+        $templating = $this->getTemplating();
+        $this->assertOkTemplate(
+            $templating,
+            '[(#CONFIG{/meta/serie}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
+        );
+        $this->assertOkTemplate(
+            $templating,
+            '[(#CONFIG{/meta/serie,defaut}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
+        );
+    }
+
+    public function testAutreTableConfigNomAbsent(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/toto/tpasla}|non)ok]');
+    }
+
+    public function testAutreTableConfigNomAbsentAvecDefaut(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/toto/tpasla,defaut}|=={defaut}|oui)ok]');
+    }
+
+    public function testAutreTableConfigChaine(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/toto/tchaine}|=={une chaine}|oui)ok]');
+        $this->assertOkTemplate($templating, '[(#CONFIG{/toto/tchaine,defaut}|=={une chaine}|oui)ok]');
+    }
+
+    public function testAutreTableConfigValeurZero(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate($templating, '[(#CONFIG{/toto/tzero}|=={0}|oui)ok]');
+        $this->assertOkTemplate($templating, '[(#CONFIG{/toto/tzero,defaut}|=={0}|oui)ok]');
+    }
+
+    public function testAutreTableConfigChaineZero(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate($templating, "[(#CONFIG{/toto/tzeroc}|=={'0'}|oui)ok]");
+        $this->assertOkTemplate($templating, "[(#CONFIG{/toto/tzeroc,defaut}|=={'0'}|oui)ok]");
+    }
+
+    public function testAutreTableArrayAssoc(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate($templating, "[(#CONFIG{/toto/tassoc,'',''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]");
+        $this->assertOkTemplate(
+            $templating,
+            "[(#CONFIG{/toto/tassoc,defaut,''}|=={#ARRAY{one,element 1,two,element 2}}|oui)ok]"
+        );
+    }
+
+    public function testAutreTableArraySerialize(): void {
+        $templating = $this->getTemplatingOtherTable();
+        $this->assertOkTemplate(
+            $templating,
+            '[(#CONFIG{/toto/tserie}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
+        );
+        $this->assertOkTemplate(
+            $templating,
+            '[(#CONFIG{/toto/tserie,defaut}|=={a:2:{s:3:"one";s:9:"element 1";s:3:"two";s:9:"element 2";}}oui)ok]'
+        );
+    }
+
+    private function getFakeMetaData(): array {
+        $assoc = [
+            'one' => 'element 1',
+            'two' => 'element 2',
+        ];
+        return [
+            'zero' => 0,
+            'zeroc' => '0',
+            'chaine' => 'une chaine',
+            'assoc' => $assoc,
+            'serie' => serialize($assoc),
+        ];
+    }
+
+    private function getFakeMetaDataT(): array {
+        $assoc = [
+            'one' => 'element 1',
+            'two' => 'element 2',
+        ];
+        return [
+            'tzero' => 0,
+            'tzeroc' => '0',
+            'tchaine' => 'une chaine',
+            'tassoc' => $assoc,
+            'tserie' => serialize($assoc),
+        ];
+    }
+
+    private function getTemplating(): Templating {
+        $fake = var_export($this->getFakeMetaData(), true);
+        return Templating::fromString([
+            'fonctions' => "
 				function test_meta(\$raz = 0) {
 					static \$meta = [];
 					if (!\$meta) {
@@ -196,15 +196,15 @@ 
 					}
 				}
 			",
-			'avant_code' => '[(#VAL|test_meta)]',
-			'apres_code' => '[(#VAL{1}|test_meta)]',
-		]);
-	}
-
-	private function getTemplatingOtherTable(): Templating {
-		$fake = var_export($this->getFakeMetaDataT(), true);
-		return Templating::fromString([
-			'fonctions' => "
+            'avant_code' => '[(#VAL|test_meta)]',
+            'apres_code' => '[(#VAL{1}|test_meta)]',
+        ]);
+    }
+
+    private function getTemplatingOtherTable(): Templating {
+        $fake = var_export($this->getFakeMetaDataT(), true);
+        return Templating::fromString([
+            'fonctions' => "
 				function test_meta_toto(\$raz = 0) {
 					\$GLOBALS['toto'] = {$fake};
 					if (\$raz) {
@@ -212,8 +212,8 @@ 
 					}
 				}
 			",
-			'avant_code' => '[(#VAL|test_meta_toto)]',
-			'apres_code' => '[(#VAL{1}|test_meta_toto)]',
-		]);
-	}
+            'avant_code' => '[(#VAL|test_meta_toto)]',
+            'apres_code' => '[(#VAL{1}|test_meta_toto)]',
+        ]);
+    }
 }

ecrire/tests/Squelettes/Balise/NotesTest.php

Indentation +31 added lines, -31 removed lines

@@ -8,43 +8,43 @@
 
 class NotesTest extends SquelettesTestCase
 {
-	protected function setUp(): void {
-		$this->viderNotes();
-	}
-
-	public function testNotesEnVrac(): void {
-		$this->assertOkSquelette(__DIR__ . '/data/notes.html');
-	}
-
-	/**
-	 * Ce bloc est en premier, et contient des notes separees par un MODELE; il ne doit pas "sauter" de compteur_notes
-	 * (nb2-2)
-	 */
-	public function testNoteNonSupprimeeSiBaliseModele(): void {
-		$this->assertOkCode(
-			"[(#VAL{\[\[note1\]\]<img1>\[\[note2\]\]'}
+    protected function setUp(): void {
+        $this->viderNotes();
+    }
+
+    public function testNotesEnVrac(): void {
+        $this->assertOkSquelette(__DIR__ . '/data/notes.html');
+    }
+
+    /**
+     * Ce bloc est en premier, et contient des notes separees par un MODELE; il ne doit pas "sauter" de compteur_notes
+     * (nb2-2)
+     */
+    public function testNoteNonSupprimeeSiBaliseModele(): void {
+        $this->assertOkCode(
+            "[(#VAL{\[\[note1\]\]<img1>\[\[note2\]\]'}
 				|propre
 				|match{'nb.-1'}
 				|?{#VAL{'Le compteur_notes a change a cause du modele. Résultat: '#NOTES}, OK})]"
-		);
-	}
-
-	/**
-	 * Ce bloc teste le bug introduit en http://trac.rezo.net/trac/spip/changeset/8847 et corrige en
-	 * http://trac.rezo.net/trac/spip/changeset/8872
-	 */
-	public function testNoteNonSupprimeeSiInclureInline(): void {
-		$dir = $this->relativePath(__DIR__);
-		$this->assertOkCode("
+        );
+    }
+
+    /**
+     * Ce bloc teste le bug introduit en http://trac.rezo.net/trac/spip/changeset/8847 et corrige en
+     * http://trac.rezo.net/trac/spip/changeset/8872
+     */
+    public function testNoteNonSupprimeeSiInclureInline(): void {
+        $dir = $this->relativePath(__DIR__);
+        $this->assertOkCode("
 			[(#VAL{'\[\[Ma note\]\]'}|propre|?)]
 			[(#INCLURE{fond={$dir}/data/inclure_vide})]
 			[(#NOTES|match{Ma note}|?{'OK','Une note mangee par INCLURE'})]
 		");
-	}
+    }
 
-	private function viderNotes(): void {
-		// attention a cette globale qui pourrait changer dans le temps
-		$notes = charger_fonction('notes', 'inc');
-		$notes('', 'reset_all');
-	}
+    private function viderNotes(): void {
+        // attention a cette globale qui pourrait changer dans le temps
+        $notes = charger_fonction('notes', 'inc');
+        $notes('', 'reset_all');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	}
 
 	public function testNotesEnVrac(): void {
-		$this->assertOkSquelette(__DIR__ . '/data/notes.html');
+		$this->assertOkSquelette(__DIR__.'/data/notes.html');
 	}
 
 	/**

ecrire/tests/Squelettes/Balise/data/squelettes/formulaires/test_dyn_lang.php

Indentation +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 function formulaires_test_dyn_lang_charger_dist($lang_skel) {
-	return [
-		'message_ok' => $lang_skel === $GLOBALS['spip_lang'] ? 'OK' : "NOK : La langue dans le squelette appelant est {$lang_skel} mais la langue dans charger() est " . $GLOBALS['spip_lang'],
-	];
+    return [
+        'message_ok' => $lang_skel === $GLOBALS['spip_lang'] ? 'OK' : "NOK : La langue dans le squelette appelant est {$lang_skel} mais la langue dans charger() est " . $GLOBALS['spip_lang'],
+    ];
 }

Spacing +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
 
 function formulaires_test_dyn_lang_charger_dist($lang_skel) {
 	return [
-		'message_ok' => $lang_skel === $GLOBALS['spip_lang'] ? 'OK' : "NOK : La langue dans le squelette appelant est {$lang_skel} mais la langue dans charger() est " . $GLOBALS['spip_lang'],
+		'message_ok' => $lang_skel === $GLOBALS['spip_lang'] ? 'OK' : "NOK : La langue dans le squelette appelant est {$lang_skel} mais la langue dans charger() est ".$GLOBALS['spip_lang'],
 	];
 }