fix PSR2 warnings in php tests

tests-php/Nominatim/NominatimTest.php

@@ -1,18 +1,19 @@
 <?php
 
 namespace Nominatim;
-require '../lib/lib.php';
 
+require '../lib/lib.php';
 
 class NominatimTest extends \PHPUnit_Framework_TestCase
 {
 
+
     protected function setUp()
     {
     }
 
 
-    public function test_getClassTypesWithImportance()
+    public function testGetClassTypesWithImportance()
     {
         $aClasses = getClassTypesWithImportance();
 
@@ -35,7 +36,7 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
     }
 
 
-    public function test_getResultDiameter()
+    public function testGetResultDiameter()
     {
         $aResult = array();
         $this->assertEquals(
@@ -57,14 +58,15 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
     }
 
 
-    public function test_addQuotes()
+    public function testAddQuotes()
     {
         // FIXME: not quoting existing quote signs is probably a bug
         $this->assertSame("'St. John's'", addQuotes("St. John's"));
         $this->assertSame("''", addQuotes(''));
     }
 
-    public function test_looksLikeLatLonPair()
+
+    public function testLooksLikeLatLonPair()
     {
         // no coordinates expected
         $this->assertNull(looksLikeLatLonPair(''));
@@ -116,18 +118,18 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals(40.446, $aRes['lat'], 'degrees decimal ' . $sQuery, 0.01);
             $this->assertEquals(-79.982, $aRes['lon'], 'degrees decimal ' . $sQuery, 0.01);
         }
-
     }
 
 
 
-    public function test_getWordSets()
+    public function testGetWordSets()
     {
-
         // given an array of arrays like
         // array( array('a','b'), array('c','d') )
         // returns a summary as string: '(a|b),(c|d)'
-        function serialize_sets($aSets)
+
+
+        function serializeSets($aSets)
         {
             $aParts = array();
             foreach ($aSets as $aSet) {
@@ -143,29 +145,29 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             '(a)',
-            serialize_sets( getWordSets(array("a"),0) )
+            serializeSets(getWordSets(array("a"), 0))
         );
 
         $this->assertEquals(
             '(a b),(a|b)',
-            serialize_sets( getWordSets(array('a','b'),0) )
+            serializeSets(getWordSets(array('a', 'b'), 0))
         );
 
         $this->assertEquals(
             '(a b c),(a|b c),(a|b|c),(a b|c)',
-            serialize_sets( getWordSets(array('a','b','c'),0) )
+            serializeSets(getWordSets(array('a', 'b', 'c'), 0))
         );
 
         $this->assertEquals(
             '(a b c d),(a|b c d),(a|b|c d),(a|b|c|d),(a|b c|d),(a b|c d),(a b|c|d),(a b c|d)',
-            serialize_sets( getWordSets(array('a','b','c','d'),0) )
+            serializeSets(getWordSets(array('a', 'b', 'c', 'd'), 0))
         );
 
 
         // Inverse
         $this->assertEquals(
             '(a b c),(c|a b),(c|b|a),(b c|a)',
-            serialize_sets( getInverseWordSets(array('a','b','c'),0) )
+            serializeSets(getInverseWordSets(array('a', 'b', 'c'), 0))
         );
 
 
@@ -190,10 +192,9 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
     }
 
 
-
+    public function testCreatePointsAroundCenter()
-    // you might say we're creating a circle
-    public function test_createPointsAroundCenter()
     {
+        // you might say we're creating a circle
         $aPoints = createPointsAroundCenter(0, 0, 2);
 
         $this->assertEquals(
@@ -210,12 +211,13 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    public function test_geometryText2Points()
+
+    public function testGeometryText2Points()
     {
         $fRadius = 1;
         // invalid value
         $this->assertEquals(
-            NULL,
+            null,
             geometryText2Points('', $fRadius)
         );
 
@@ -257,5 +259,4 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
             geometryText2Points('MULTIPOLYGON(((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))', $fRadius)
         );
     }
-
 }