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 9db7557e1a12186eb80c30d900903899a2d41f1b..09860914af4830fb348dba8422d8d0262b0e2d59 100644 (file)
--- a/test/php/Nominatim/DebugTest.php
+++ b/test/php/Nominatim/DebugTest.php
@@ -2,19 +2,23 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-use Exception;
-
-require_once('../../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->getMock(Geocode::class, array('debugInfo'));
+        $this->oWithDebuginfo = $this->getMockBuilder(\GeococdeMock::class)
+                                    ->setMethods(array('debugInfo'))
+                                    ->getMock();

         $this->oWithDebuginfo->method('debugInfo')
                   ->willReturn(array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3'));
 
         $this->oWithDebuginfo->method('debugInfo')
                   ->willReturn(array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3'));
 

-        $this->oWithToString = $this->getMock(Geocode::class, array('__toString'));
+
+        $this->oWithToString = $this->getMockBuilder(\SomeMock::class)
+                                    ->setMethods(array('__toString'))
+                                    ->getMock();

         $this->oWithToString->method('__toString')->willReturn('me as string');
     }
 
         $this->oWithToString->method('__toString')->willReturn('me as string');
     }