@@ -41,6 +41,6 @@ |
||
| 41 | 41 | * @depends testBaliseDetacheeInterne |
| 42 | 42 | */ |
| 43 | 43 | public function testBaliseDetacheeComplexe(): void { |
| 44 | - $this->assertOkSquelette(__DIR__ . '/data/balise_detachee.html'); |
|
| 44 | + $this->assertOkSquelette(__DIR__.'/data/balise_detachee.html'); |
|
| 45 | 45 | } |
| 46 | 46 | } |
@@ -11,52 +11,52 @@ |
||
| 11 | 11 | { |
| 12 | 12 | public function testInclureNormal(): void { |
| 13 | 13 | $dir = $this->relativePath(__DIR__); |
| 14 | - $this->assertEqualsCode('Hello World', '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>'); |
|
| 15 | - $this->assertEqualsCode('Hello World', '<INCLURE{fond=' . $dir . '/data/texte_hello_world}/>'); |
|
| 14 | + $this->assertEqualsCode('Hello World', '<INCLURE{fond='.$dir.'/data/texte_hello_world}>'); |
|
| 15 | + $this->assertEqualsCode('Hello World', '<INCLURE{fond='.$dir.'/data/texte_hello_world}/>'); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function testInclureDouble(): void { |
| 19 | 19 | $dir = $this->relativePath(__DIR__); |
| 20 | 20 | $this->assertEqualsCode( |
| 21 | 21 | 'Hello WorldHello World', |
| 22 | - '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' |
|
| 23 | - . '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' |
|
| 22 | + '<INCLURE{fond='.$dir.'/data/texte_hello_world}>' |
|
| 23 | + . '<INCLURE{fond='.$dir.'/data/texte_hello_world}>' |
|
| 24 | 24 | ); |
| 25 | 25 | $this->assertEqualsCode( |
| 26 | 26 | 'Hello WorldHello World', |
| 27 | 27 | ' |
| 28 | - <INCLURE{fond=' . $dir . '/data/texte_hello_world}>' |
|
| 29 | - . '<INCLURE{fond=' . $dir . '/data/texte_hello_world}>' |
|
| 28 | + <INCLURE{fond=' . $dir.'/data/texte_hello_world}>' |
|
| 29 | + . '<INCLURE{fond='.$dir.'/data/texte_hello_world}>' |
|
| 30 | 30 | ); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | public function testInclureArray(): void { |
| 34 | 34 | $dir = $this->relativePath(__DIR__); |
| 35 | 35 | $array = '#LISTE{ |
| 36 | - ' . $dir . '/data/texte_hello_world, |
|
| 37 | - ' . $dir . '/data/texte_hello_world, |
|
| 38 | - ' . $dir . '/data/texte_hello_world}'; |
|
| 36 | + ' . $dir.'/data/texte_hello_world, |
|
| 37 | + ' . $dir.'/data/texte_hello_world, |
|
| 38 | + ' . $dir.'/data/texte_hello_world}'; |
|
| 39 | 39 | $this->assertEqualsCode('Hello WorldHello WorldHello World', "<INCLURE{fond={$array}}>"); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function testInclureOldParam(): void { |
| 43 | 43 | $dir = $this->relativePath(__DIR__); |
| 44 | - $this->assertEqualsCode('Kitty', '<INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty}>'); |
|
| 45 | - $this->assertEqualsCode('Kitty', '<INCLURE{fond=' . $dir . '/data/balise_env_test}{test=Kitty}/>'); |
|
| 44 | + $this->assertEqualsCode('Kitty', '<INCLURE{fond='.$dir.'/data/balise_env_test}{test=Kitty}>'); |
|
| 45 | + $this->assertEqualsCode('Kitty', '<INCLURE{fond='.$dir.'/data/balise_env_test}{test=Kitty}/>'); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | public function testInclureNormalParam(): void { |
| 49 | 49 | $dir = $this->relativePath(__DIR__); |
| 50 | - $this->assertEqualsCode('Kitty', '<INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty}>'); |
|
| 51 | - $this->assertEqualsCode('Kitty', '<INCLURE{fond=' . $dir . '/data/balise_env_test, test=Kitty}/>'); |
|
| 50 | + $this->assertEqualsCode('Kitty', '<INCLURE{fond='.$dir.'/data/balise_env_test, test=Kitty}>'); |
|
| 51 | + $this->assertEqualsCode('Kitty', '<INCLURE{fond='.$dir.'/data/balise_env_test, test=Kitty}/>'); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | public function testInclureArrayParam(): void { |
| 55 | 55 | $dir = $this->relativePath(__DIR__); |
| 56 | 56 | $array = '#LISTE{ |
| 57 | - ' . $dir . '/data/balise_env_test, |
|
| 58 | - ' . $dir . '/data/texte_hello_world, |
|
| 59 | - ' . $dir . '/data/balise_env_test}'; |
|
| 57 | + ' . $dir.'/data/balise_env_test, |
|
| 58 | + ' . $dir.'/data/texte_hello_world, |
|
| 59 | + ' . $dir.'/data/balise_env_test}'; |
|
| 60 | 60 | $this->assertEqualsCode('KittyHello WorldKitty', "<INCLURE{fond={$array}, test=Kitty}>"); |
| 61 | 61 | $this->assertEqualsCode('KittyHello WorldKitty', "<INCLURE{fond={$array}, test=Kitty}/>"); |
| 62 | 62 | } |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | private static string $squelettes; |
| 15 | 15 | |
| 16 | 16 | public static function setUpBeforeClass(): void { |
| 17 | - self::$squelettes = self::relativePath(__DIR__ . '/data/squelettes'); |
|
| 17 | + self::$squelettes = self::relativePath(__DIR__.'/data/squelettes'); |
|
| 18 | 18 | $GLOBALS['dossier_squelettes'] = self::$squelettes; |
| 19 | 19 | $GLOBALS['delais'] = 3600; // See boostrap.php qui met delais = 0 (inhibe le cache) |
| 20 | 20 | include_spip('inc/invalideur'); |
| 21 | - purger_repertoire(_DIR_CACHE . 'calcul/', ['subdir' => true]); |
|
| 21 | + purger_repertoire(_DIR_CACHE.'calcul/', ['subdir' => true]); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public static function tearDownAfterClass(): void { |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function testVerifierPathMajInvalideurs(): void { |
| 34 | 34 | $this->assertEquals(self::$squelettes, $GLOBALS['dossier_squelettes'] ?? null); |
| 35 | - $this->assertTrue(file_exists(__DIR__ . '/data/squelettes/inc/maj_invalideurs.php')); |
|
| 35 | + $this->assertTrue(file_exists(__DIR__.'/data/squelettes/inc/maj_invalideurs.php')); |
|
| 36 | 36 | $this->assertNotFalse(find_in_path('inc/maj_invalideurs.php')); |
| 37 | 37 | $this->assertNotFalse(include_spip('inc/maj_invalideurs')); |
| 38 | 38 | $this->assertEquals('inc_maj_invalideurs', charger_fonction('maj_invalideurs', 'inc', true)); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | private function saltContext(): string { |
| 96 | - return (string) time() . ':' . uniqid(); |
|
| 96 | + return (string) time().':'.uniqid(); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | private function getErrors(): array { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | private function showErrors(): string { |
| 104 | - return "Errors:\n" . implode("\n", array_map(fn ($e) => "- $e", self::getErrors())); |
|
| 104 | + return "Errors:\n".implode("\n", array_map(fn ($e) => "- $e", self::getErrors())); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | private function resetErrors(): void { |
@@ -44,6 +44,6 @@ |
||
| 44 | 44 | * @link http://trac.rezo.net/trac/spip/ticket/1931 |
| 45 | 45 | */ |
| 46 | 46 | public function testBoucleVide(): void { |
| 47 | - $this->assertOkSquelette(__DIR__ . '/data/boucle_vide.html'); |
|
| 47 | + $this->assertOkSquelette(__DIR__.'/data/boucle_vide.html'); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -12,6 +12,6 @@ |
||
| 12 | 12 | * @link http://trac.rezo.net/trac/spip/ticket/764 |
| 13 | 13 | */ |
| 14 | 14 | public function testBoucleRecursiveSet(): void { |
| 15 | - $this->assertOkSquelette(__DIR__ . '/data/bug764.html'); |
|
| 15 | + $this->assertOkSquelette(__DIR__.'/data/bug764.html'); |
|
| 16 | 16 | } |
| 17 | 17 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | foreach ($essais as $k => $essai) { |
| 79 | 79 | $expected = array_shift($essai); |
| 80 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 80 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $GLOBALS['meta'] = $meta; |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | foreach ($essais as $k => $essai) { |
| 115 | 115 | $expected = array_shift($essai); |
| 116 | - $this->assertEquals($expected, ecrire_config(...$essai), "Echec {$k} : ecriture " . reset($essai)); |
|
| 116 | + $this->assertEquals($expected, ecrire_config(...$essai), "Echec {$k} : ecriture ".reset($essai)); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | $trouver_table = charger_fonction('trouver_table', 'base'); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | foreach ($essais as $k => $essai) { |
| 137 | 137 | $expected = array_shift($essai); |
| 138 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 138 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | foreach ($essais as $k => $essai) { |
| 155 | 155 | $expected = array_shift($essai); |
| 156 | - $this->assertEquals($expected, effacer_config(...$essai), "Echec {$k} : effacer " . reset($essai)); |
|
| 156 | + $this->assertEquals($expected, effacer_config(...$essai), "Echec {$k} : effacer ".reset($essai)); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | foreach ($essais as $k => $essai) { |
| 173 | 173 | $expected = array_shift($essai); |
| 174 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 174 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | $trouver_table = charger_fonction('trouver_table', 'base'); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | foreach ($essais as $k => $essai) { |
| 89 | 89 | $expected = array_shift($essai); |
| 90 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 90 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $GLOBALS['meta'] = $meta; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | foreach ($essais as $k => $essai) { |
| 127 | 127 | $expected = array_shift($essai); |
| 128 | - $this->assertEquals($expected, ecrire_config(...$essai), "Echec {$k} : ecriture " . reset($essai)); |
|
| 128 | + $this->assertEquals($expected, ecrire_config(...$essai), "Echec {$k} : ecriture ".reset($essai)); |
|
| 129 | 129 | } |
| 130 | 130 | } |
| 131 | 131 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | foreach ($essais as $k => $essai) { |
| 153 | 153 | $expected = array_shift($essai); |
| 154 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 154 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | foreach ($essais as $k => $essai) { |
| 183 | 183 | $expected = array_shift($essai); |
| 184 | - $this->assertEquals($expected, effacer_config(...$essai), "Echec {$k} : effacer " . reset($essai)); |
|
| 184 | + $this->assertEquals($expected, effacer_config(...$essai), "Echec {$k} : effacer ".reset($essai)); |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | foreach ($essais as $k => $essai) { |
| 203 | 203 | $expected = array_shift($essai); |
| 204 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 204 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | foreach ($essais as $k => $essai) { |
| 65 | 65 | $expected = array_shift($essai); |
| 66 | - $this->assertEquals($expected, expliquer_config(...$essai), "Echec {$k} : lecture " . end($essai)); |
|
| 66 | + $this->assertEquals($expected, expliquer_config(...$essai), "Echec {$k} : lecture ".end($essai)); |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | foreach ($essais as $k => $essai) { |
| 98 | 98 | $expected = array_shift($essai); |
| 99 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 99 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | $GLOBALS['meta'] = $meta; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | |
| 132 | 132 | foreach ($essais as $k => $essai) { |
| 133 | 133 | $expected = array_shift($essai); |
| 134 | - $this->assertEquals($expected, ecrire_config(...$essai), "Echec {$k} : ecriture " . reset($essai)); |
|
| 134 | + $this->assertEquals($expected, ecrire_config(...$essai), "Echec {$k} : ecriture ".reset($essai)); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | foreach ($essais as $k => $essai) { |
| 151 | 151 | $expected = array_shift($essai); |
| 152 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 152 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | foreach ($essais as $k => $essai) { |
| 170 | 170 | $expected = array_shift($essai); |
| 171 | - $this->assertEquals($expected, effacer_config(...$essai), "Echec {$k} : effacer " . reset($essai)); |
|
| 171 | + $this->assertEquals($expected, effacer_config(...$essai), "Echec {$k} : effacer ".reset($essai)); |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | foreach ($essais as $k => $essai) { |
| 189 | 189 | $expected = array_shift($essai); |
| 190 | - $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture " . reset($essai)); |
|
| 190 | + $this->assertEquals($expected, lire_config(...$essai), "Echec {$k} : lecture ".reset($essai)); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | } |
@@ -47,11 +47,11 @@ |
||
| 47 | 47 | if (!empty($infos['source'])) { |
| 48 | 48 | // on ajoute des infos supplementaires a celles retournees |
| 49 | 49 | $path = pathinfo($infos['source']); |
| 50 | - $infos['fond'] = $path['dirname'] . '/' . $path['filename']; // = $fond; |
|
| 50 | + $infos['fond'] = $path['dirname'].'/'.$path['filename']; // = $fond; |
|
| 51 | 51 | $infos['erreurs'] = $this->get_compilation_errors(); |
| 52 | 52 | } else { |
| 53 | 53 | // on a été interrompu par un minipres ? |
| 54 | - throw new \Exception('Calcul de ' . $this->fond . ' interrompue (minipres?)' . "\n\n" . $infos['texte']); |
|
| 54 | + throw new \Exception('Calcul de '.$this->fond.' interrompue (minipres?)'."\n\n".$infos['texte']); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | return $infos; |