From a5d35d6e84d5de5f6ae98d09a7863cf50a84f586 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 25 Aug 2018 14:57:31 +0200 Subject: [PATCH] use namespaces for PHPUnit classes This is mandatory for PHPUnit 6.x. Older versions provide a forward compatibility layer, so we should be good. Fixes #1150. --- test/php/Nominatim/DebugTest.php | 2 +- test/php/Nominatim/LibTest.php | 2 +- test/php/Nominatim/ParameterParserTest.php | 2 +- test/php/Nominatim/PhraseTest.php | 2 +- test/php/Nominatim/SearchContextTest.php | 2 +- test/php/Nominatim/StatusTest.php | 2 +- test/php/Nominatim/TokenListTest.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/php/Nominatim/DebugTest.php b/test/php/Nominatim/DebugTest.php index 6e0c25f3..9db7557e 100644 --- a/test/php/Nominatim/DebugTest.php +++ b/test/php/Nominatim/DebugTest.php @@ -6,7 +6,7 @@ use Exception; require_once('../../lib/DebugHtml.php'); -class DebugTest extends \PHPUnit_Framework_TestCase +class DebugTest extends \PHPUnit\Framework\TestCase { protected function setUp() { diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php index 55ae1aaa..322cc23e 100644 --- a/test/php/Nominatim/LibTest.php +++ b/test/php/Nominatim/LibTest.php @@ -5,7 +5,7 @@ namespace Nominatim; require_once '../../lib/lib.php'; require_once '../../lib/ClassTypes.php'; -class LibTest extends \PHPUnit_Framework_TestCase +class LibTest extends \PHPUnit\Framework\TestCase { public function testGetClassTypesWithImportance() { diff --git a/test/php/Nominatim/ParameterParserTest.php b/test/php/Nominatim/ParameterParserTest.php index 0cbc60c5..0e88d318 100644 --- a/test/php/Nominatim/ParameterParserTest.php +++ b/test/php/Nominatim/ParameterParserTest.php @@ -12,7 +12,7 @@ function userError($sError) throw new Exception($sError); } -class ParameterParserTest extends \PHPUnit_Framework_TestCase +class ParameterParserTest extends \PHPUnit\Framework\TestCase { diff --git a/test/php/Nominatim/PhraseTest.php b/test/php/Nominatim/PhraseTest.php index b5e6c1bf..35a8a804 100644 --- a/test/php/Nominatim/PhraseTest.php +++ b/test/php/Nominatim/PhraseTest.php @@ -4,7 +4,7 @@ namespace Nominatim; require_once '../../lib/Phrase.php'; -class PhraseTest extends \PHPUnit_Framework_TestCase +class PhraseTest extends \PHPUnit\Framework\TestCase { diff --git a/test/php/Nominatim/SearchContextTest.php b/test/php/Nominatim/SearchContextTest.php index db0b2dee..0a2131b9 100644 --- a/test/php/Nominatim/SearchContextTest.php +++ b/test/php/Nominatim/SearchContextTest.php @@ -6,7 +6,7 @@ namespace Nominatim; require_once '../../lib/SearchContext.php'; -class SearchContextTest extends \PHPUnit_Framework_TestCase +class SearchContextTest extends \PHPUnit\Framework\TestCase { private $oCtx; diff --git a/test/php/Nominatim/StatusTest.php b/test/php/Nominatim/StatusTest.php index 06823720..448940db 100644 --- a/test/php/Nominatim/StatusTest.php +++ b/test/php/Nominatim/StatusTest.php @@ -7,7 +7,7 @@ require_once('DB.php'); use Exception; -class StatusTest extends \PHPUnit_Framework_TestCase +class StatusTest extends \PHPUnit\Framework\TestCase { diff --git a/test/php/Nominatim/TokenListTest.php b/test/php/Nominatim/TokenListTest.php index 38f13e18..ad91dff1 100644 --- a/test/php/Nominatim/TokenListTest.php +++ b/test/php/Nominatim/TokenListTest.php @@ -8,7 +8,7 @@ require_once '../../lib/db.php'; require_once '../../lib/cmd.php'; require_once '../../lib/TokenList.php'; -class TokenTest extends \PHPUnit_Framework_TestCase +class TokenTest extends \PHPUnit\Framework\TestCase { protected function setUp() { -- 2.43.2