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 cee7028ba384e6a4196fe397288352dcda39d457..945235bd8c9549e90b320a8ff3d0c1107632946c 100644 (file)
--- 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 ed738c3773046a1739b138273131ad67c3ac76c3..ee6f94f237e83e0c09a66c760b6e476437b2c482 100644 (file)
--- 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 90477b81e742857ab84a945f55e505ea8af8b780..b767adb36ff2774ea8b208adcc670c5866de65fa 100755 (executable)
--- 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;