Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/SearchContextTest.php b/test/php/Nominatim/SearchContextTest.php
index 0a2131b92dd930ed1a3f05bfc5262b46ee713394..1b3462971039f345762c3fa2897df617e8b3a983 100644 (file)
--- a/test/php/Nominatim/SearchContextTest.php
+++ b/test/php/Nominatim/SearchContextTest.php
@@ -2,16 +2,14 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-@define('CONST_BasePath', '../../');
-
-require_once '../../lib/SearchContext.php';
+require_once(CONST_LibDir.'/SearchContext.php');

 
 class SearchContextTest extends \PHPUnit\Framework\TestCase
 {
     private $oCtx;
 
 
 
 class SearchContextTest extends \PHPUnit\Framework\TestCase
 {
     private $oCtx;
 
 

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

     {
         $this->oCtx = new SearchContext();
     }
     {
         $this->oCtx = new SearchContext();
     }