Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / php / Nominatim / DebugTest.php

diff --git a/test/php/Nominatim/DebugTest.php b/test/php/Nominatim/DebugTest.php
index 7ef1dba336836be7f6f6626a75f36943e6edb472..84e8f215586a7ee28ad536b7c5dcea51a83820b5 100644 (file)
--- a/test/php/Nominatim/DebugTest.php
+++ b/test/php/Nominatim/DebugTest.php
@@ -1,13 +1,21 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/DebugHtml.php');
+require_once(CONST_LibDir.'/DebugHtml.php');

 
 class DebugTest extends \PHPUnit\Framework\TestCase
 {
 
 
 class DebugTest extends \PHPUnit\Framework\TestCase
 {
 

-    protected function setUp()
+    protected function setUp(): void

     {
         $this->oWithDebuginfo = $this->getMockBuilder(\GeococdeMock::class)
                                     ->setMethods(array('debugInfo'))
     {
         $this->oWithDebuginfo = $this->getMockBuilder(\GeococdeMock::class)
                                     ->setMethods(array('debugInfo'))


@@ -29,14 +37,14 @@ class DebugTest extends \PHPUnit\Framework\TestCase
 <pre><b>Var1:</b>  <i>True</i></pre>
 <pre><b>Var2:</b>  <i>False</i></pre>
 <pre><b>Var3:</b>  0</pre>
 <pre><b>Var1:</b>  <i>True</i></pre>
 <pre><b>Var2:</b>  <i>False</i></pre>
 <pre><b>Var3:</b>  0</pre>

-<pre><b>Var4:</b>  'String'</pre>
-<pre><b>Var5:</b>  0 => 'one'
-       1 => 'two'
-       2 => 'three'</pre>
-<pre><b>Var6:</b>  'key' => 'value'
-       'key2' => 'value2'</pre>
+<pre><b>Var4:</b>  &#039;String&#039;</pre>
+<pre><b>Var5:</b>  0 => &#039;one&#039;
+       1 => &#039;two&#039;
+       2 => &#039;three&#039;</pre>
+<pre><b>Var6:</b>  &#039;key&#039; => &#039;value&#039;
+       &#039;key2&#039; => &#039;value2&#039;</pre>

 <pre><b>Var7:</b>  me as string</pre>
 <pre><b>Var7:</b>  me as string</pre>

-<pre><b>Var8:</b>  'value', 'value2'</pre>
+<pre><b>Var8:</b>  &#039;value&#039;, &#039;value2&#039;</pre>

 
 EOT
         );
 
 EOT
         );


@@ -56,10 +64,10 @@ EOT
     public function testDebugArray()
     {
         $this->expectOutputString(<<<EOT
     public function testDebugArray()
     {
         $this->expectOutputString(<<<EOT

-<pre><b>Arr0:</b>  'null'</pre>
-<pre><b>Arr1:</b>  'key1' => 'val1'
-       'key2' => 'val2'
-       'key3' => 'val3'</pre>
+<pre><b>Arr0:</b>  &#039;null&#039;</pre>
+<pre><b>Arr1:</b>  &#039;key1&#039; => &#039;val1&#039;
+       &#039;key2&#039; => &#039;val2&#039;
+       &#039;key3&#039; => &#039;val3&#039;</pre>

 
 EOT
         );
 
 EOT
         );


@@ -85,12 +93,12 @@ EOT
     <th><small>1</small></th>
   </tr>
   <tr>
     <th><small>1</small></th>
   </tr>
   <tr>

-    <td><pre>'one'</pre></td>
-    <td><pre>'two'</pre></td>
+    <td><pre>&#039;one&#039;</pre></td>
+    <td><pre>&#039;two&#039;</pre></td>

   </tr>
   <tr>
   </tr>
   <tr>

-    <td><pre>'three'</pre></td>
-    <td><pre>'four'</pre></td>
+    <td><pre>&#039;three&#039;</pre></td>
+    <td><pre>&#039;four&#039;</pre></td>

   </tr>
 </table>
 <b>Table4:</b>
   </tr>
 </table>
 <b>Table4:</b>


@@ -101,9 +109,9 @@ EOT
     <th><small>key3</small></th>
   </tr>
   <tr>
     <th><small>key3</small></th>
   </tr>
   <tr>

-    <td><pre>'val1'</pre></td>
-    <td><pre>'val2'</pre></td>
-    <td><pre>'val3'</pre></td>
+    <td><pre>&#039;val1&#039;</pre></td>
+    <td><pre>&#039;val2&#039;</pre></td>
+    <td><pre>&#039;val3&#039;</pre></td>

   </tr>
 </table>
 
   </tr>
 </table>
 


@@ -139,18 +147,18 @@ EOT
   </tr>
   <tr>
     <td><pre>group1</pre></td>
   </tr>
   <tr>
     <td><pre>group1</pre></td>

-    <td><pre>'val1'</pre></td>
-    <td><pre>'val2'</pre></td>
+    <td><pre>&#039;val1&#039;</pre></td>
+    <td><pre>&#039;val2&#039;</pre></td>

   </tr>
   <tr>
     <td><pre>group1</pre></td>
   </tr>
   <tr>
     <td><pre>group1</pre></td>

-    <td><pre>'one'</pre></td>
-    <td><pre>'two'</pre></td>
+    <td><pre>&#039;one&#039;</pre></td>
+    <td><pre>&#039;two&#039;</pre></td>

   </tr>
   <tr>
     <td><pre>group2</pre></td>
   </tr>
   <tr>
     <td><pre>group2</pre></td>

-    <td><pre>'val1'</pre></td>
-    <td><pre>'val2'</pre></td>
+    <td><pre>&#039;val1&#039;</pre></td>
+    <td><pre>&#039;val2&#039;</pre></td>

   </tr>
 </table>
 <b>Table4:</b>
   </tr>
 </table>
 <b>Table4:</b>


@@ -163,15 +171,15 @@ EOT
   </tr>
   <tr>
     <td><pre>group1</pre></td>
   </tr>
   <tr>
     <td><pre>group1</pre></td>

-    <td><pre>'val1'</pre></td>
-    <td><pre>'val2'</pre></td>
-    <td><pre>'val3'</pre></td>
+    <td><pre>&#039;val1&#039;</pre></td>
+    <td><pre>&#039;val2&#039;</pre></td>
+    <td><pre>&#039;val3&#039;</pre></td>

   </tr>
   <tr>
     <td><pre>group1</pre></td>
   </tr>
   <tr>
     <td><pre>group1</pre></td>

-    <td><pre>'val1'</pre></td>
-    <td><pre>'val2'</pre></td>
-    <td><pre>'val3'</pre></td>
+    <td><pre>&#039;val1&#039;</pre></td>
+    <td><pre>&#039;val2&#039;</pre></td>
+    <td><pre>&#039;val3&#039;</pre></td>

   </tr>
 </table>
 
   </tr>
 </table>