From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 27 Mar 2018 07:04:59 +0000 (+0200)
Subject: Merge pull request #994 from mtmail/bugfix-when-calling-debug-printDebugArray
X-Git-Tag: v3.2.0~100
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d183cd3c7836e55fc9d82574c04b8e605f92d662?hp=329948e68522e9c48a4dbed327529632156233c6

Merge pull request #994 from mtmail/bugfix-when-calling-debug-printDebugArray

fix -undefined offset- error
---

diff --git a/settings/phrase_settings.php b/settings/phrase_settings.php
index cee7028b..945235bd 100644
--- a/settings/phrase_settings.php
+++ b/settings/phrase_settings.php
@@ -9,7 +9,7 @@ $aTagsBlacklist
     'place' => array('house', 'houses'),
    );
 
-// If a class is in the white list then all types will 
+// If a class is in the white list then all types will
 // be ignored except the ones given in the list.
 // Also use this list to exclude an entire class from
 // special phrases.
diff --git a/test/php/Nominatim/NominatimTest.php b/test/php/Nominatim/LibTest.php
similarity index 98%
rename from test/php/Nominatim/NominatimTest.php
rename to test/php/Nominatim/LibTest.php
index ed738c37..ee6f94f2 100644
--- a/test/php/Nominatim/NominatimTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -4,15 +4,8 @@ namespace Nominatim;
 
 require_once '../../lib/lib.php';
 
-class NominatimTest extends \PHPUnit_Framework_TestCase
+class LibTest extends \PHPUnit_Framework_TestCase
 {
-
-
-    protected function setUp()
-    {
-    }
-
-
     public function testGetClassTypesWithImportance()
     {
         $aClasses = getClassTypesWithImportance();
diff --git a/utils/importWikipedia.php b/utils/importWikipedia.php
index 90477b81..b767adb3 100755
--- a/utils/importWikipedia.php
+++ b/utils/importWikipedia.php
@@ -37,7 +37,7 @@ $sTestPageText = <<<EOD
 | coasters = 12
 | water_rides = 2
 | owner = [[Six Flags]]
-| general_manager = 
+| general_manager =
 | homepage = [http://www.sixflags.com/parks/greatadventure/ Six Flags Great Adventure]
 }}
 EOD;