From 3087ac1145f148adcfbb4abeb31bcc62d062b1bd Mon Sep 17 00:00:00 2001 From: mtmail Date: Fri, 13 Apr 2018 13:18:29 +0200 Subject: [PATCH] PHP code style: enforce long array initialisation (#1015) --- lib/cmd.php | 2 +- phpcs.xml | 2 + test/php/Nominatim/LibTest.php | 46 +++++++------- test/php/Nominatim/ParameterParserTest.php | 70 +++++++++++----------- website/lookup.php | 2 +- website/reverse.php | 2 +- 6 files changed, 63 insertions(+), 61 deletions(-) diff --git a/lib/cmd.php b/lib/cmd.php index 1edf5dfd..28d56f2e 100644 --- a/lib/cmd.php +++ b/lib/cmd.php @@ -134,7 +134,7 @@ function info($sMsg) echo date('Y-m-d H:i:s == ').$sMsg."\n"; } -$aWarnings = []; +$aWarnings = array(); function warn($sMsg) diff --git a/phpcs.xml b/phpcs.xml index 6b4abc39..09360731 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -126,6 +126,8 @@ 0 + + diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php index ee6f94f2..533188ad 100644 --- a/test/php/Nominatim/LibTest.php +++ b/test/php/Nominatim/LibTest.php @@ -70,9 +70,9 @@ class LibTest extends \PHPUnit_Framework_TestCase ); $this->assertEquals( array( - ['', 0, 2], - ['', 0.12558103905863, 1.9960534568565], - ['', 0.25066646712861, 1.984229402629] + array('', 0, 2), + array('', 0.12558103905863, 1.9960534568565), + array('', 0.25066646712861, 1.984229402629) ), array_splice($aPoints, 0, 3) ); @@ -96,9 +96,9 @@ class LibTest extends \PHPUnit_Framework_TestCase ); $this->assertEquals( array( - [10, 21], - [10.062790519529, 20.998026728428], - [10.125333233564, 20.992114701314] + array(10, 21), + array(10.062790519529, 20.998026728428), + array(10.125333233564, 20.992114701314) ), array_splice($aPoints, 0, 3) ); @@ -106,11 +106,11 @@ class LibTest extends \PHPUnit_Framework_TestCase // POLYGON $this->assertEquals( array( - ['30', '10'], - ['40', '40'], - ['20', '40'], - ['10', '20'], - ['30', '10'] + array('30', '10'), + array('40', '40'), + array('20', '40'), + array('10', '20'), + array('30', '10') ), geometryText2Points('POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))', $fRadius) ); @@ -118,10 +118,10 @@ class LibTest extends \PHPUnit_Framework_TestCase // MULTIPOLYGON $this->assertEquals( array( - ['30', '20'], // first polygon only - ['45', '40'], - ['10', '40'], - ['30', '20'], + array('30', '20'), // first polygon only + array('45', '40'), + array('10', '40'), + array('30', '20'), ), geometryText2Points('MULTIPOLYGON(((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))', $fRadius) ); @@ -190,15 +190,15 @@ class LibTest extends \PHPUnit_Framework_TestCase private function closestHouseNumberEvenOddOther($startnumber, $endnumber, $fraction, $aExpected) { - foreach (['even', 'odd', 'other'] as $itype) { + foreach (array('even', 'odd', 'other') as $itype) { $this->assertEquals( $aExpected[$itype], - closestHouseNumber([ + closestHouseNumber(array( 'startnumber' => $startnumber, 'endnumber' => $endnumber, 'fraction' => $fraction, 'interpolationtype' => $itype - ]), + )), "$startnumber => $endnumber, $fraction, $itype" ); } @@ -206,14 +206,14 @@ class LibTest extends \PHPUnit_Framework_TestCase public function testClosestHouseNumber() { - $this->closestHouseNumberEvenOddOther(50, 100, 0.5, ['even' => 76, 'odd' => 75, 'other' => 75]); + $this->closestHouseNumberEvenOddOther(50, 100, 0.5, array('even' => 76, 'odd' => 75, 'other' => 75)); // upper bound - $this->closestHouseNumberEvenOddOther(50, 100, 1.5, ['even' => 100, 'odd' => 100, 'other' => 100]); + $this->closestHouseNumberEvenOddOther(50, 100, 1.5, array('even' => 100, 'odd' => 100, 'other' => 100)); // lower bound - $this->closestHouseNumberEvenOddOther(50, 100, -0.5, ['even' => 50, 'odd' => 50, 'other' => 50]); + $this->closestHouseNumberEvenOddOther(50, 100, -0.5, array('even' => 50, 'odd' => 50, 'other' => 50)); // fraction 0 - $this->closestHouseNumberEvenOddOther(50, 100, 0, ['even' => 50, 'odd' => 51, 'other' => 50]); + $this->closestHouseNumberEvenOddOther(50, 100, 0, array('even' => 50, 'odd' => 51, 'other' => 50)); // start == end - $this->closestHouseNumberEvenOddOther(50, 50, 0.5, ['even' => 50, 'odd' => 50, 'other' => 50]); + $this->closestHouseNumberEvenOddOther(50, 50, 0.5, array('even' => 50, 'odd' => 50, 'other' => 50)); } } diff --git a/test/php/Nominatim/ParameterParserTest.php b/test/php/Nominatim/ParameterParserTest.php index 4265cffb..0cbc60c5 100644 --- a/test/php/Nominatim/ParameterParserTest.php +++ b/test/php/Nominatim/ParameterParserTest.php @@ -18,13 +18,13 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetBool() { - $oParams = new ParameterParser([ + $oParams = new ParameterParser(array( 'bool1' => '1', 'bool2' => '0', 'bool3' => 'true', 'bool4' => 'false', 'bool5' => '' - ]); + )); $this->assertSame(false, $oParams->getBool('non-exists')); $this->assertSame(true, $oParams->getBool('non-exists', true)); @@ -38,11 +38,11 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetInt() { - $oParams = new ParameterParser([ + $oParams = new ParameterParser(array( 'int1' => '5', 'int2' => '-1', 'int3' => 0 - ]); + )); $this->assertSame(false, $oParams->getInt('non-exists')); $this->assertSame(999, $oParams->getInt('non-exists', 999)); @@ -56,25 +56,25 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetIntWithNonNumber() { $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int4'"); - (new ParameterParser(['int4' => 'a']))->getInt('int4'); + (new ParameterParser(array('int4' => 'a')))->getInt('int4'); } public function testGetIntWithEmpytString() { $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int5'"); - (new ParameterParser(['int5' => '']))->getInt('int5'); + (new ParameterParser(array('int5' => '')))->getInt('int5'); } public function testGetFloat() { - $oParams = new ParameterParser([ + $oParams = new ParameterParser(array( 'float1' => '1.0', 'float2' => '-5', 'float3' => 0 - ]); + )); $this->assertSame(false, $oParams->getFloat('non-exists')); $this->assertSame(999, $oParams->getFloat('non-exists', 999)); @@ -86,30 +86,30 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetFloatWithEmptyString() { $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float4'"); - (new ParameterParser(['float4' => '']))->getFloat('float4'); + (new ParameterParser(array('float4' => '')))->getFloat('float4'); } public function testGetFloatWithTextString() { $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float5'"); - (new ParameterParser(['float5' => 'a']))->getFloat('float5'); + (new ParameterParser(array('float5' => 'a')))->getFloat('float5'); } public function testGetFloatWithInvalidNumber() { $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float6'"); - (new ParameterParser(['float6' => '-55.']))->getFloat('float6'); + (new ParameterParser(array('float6' => '-55.')))->getFloat('float6'); } public function testGetString() { - $oParams = new ParameterParser([ + $oParams = new ParameterParser(array( 'str1' => 'abc', 'str2' => '', 'str3' => '0' - ]); + )); $this->assertSame(false, $oParams->getString('non-exists')); $this->assertSame('default', $oParams->getString('non-exists', 'default')); @@ -121,41 +121,41 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetSet() { - $oParams = new ParameterParser([ + $oParams = new ParameterParser(array( 'val1' => 'foo', 'val2' => '', 'val3' => 0 - ]); + )); - $this->assertSame(false, $oParams->getSet('non-exists', ['foo', 'bar'])); - $this->assertSame('default', $oParams->getSet('non-exists', ['foo', 'bar'], 'default')); - $this->assertSame('foo', $oParams->getSet('val1', ['foo', 'bar'])); + $this->assertSame(false, $oParams->getSet('non-exists', array('foo', 'bar'))); + $this->assertSame('default', $oParams->getSet('non-exists', array('foo', 'bar'), 'default')); + $this->assertSame('foo', $oParams->getSet('val1', array('foo', 'bar'))); - $this->assertSame(false, $oParams->getSet('val2', ['foo', 'bar'])); - $this->assertSame(0, $oParams->getSet('val3', ['foo', 'bar'])); + $this->assertSame(false, $oParams->getSet('val2', array('foo', 'bar'))); + $this->assertSame(0, $oParams->getSet('val3', array('foo', 'bar'))); } public function testGetSetWithValueNotInSet() { $this->setExpectedException(Exception::class, "Parameter 'val4' must be one of: foo, bar"); - (new ParameterParser(['val4' => 'faz']))->getSet('val4', ['foo', 'bar']); + (new ParameterParser(array('val4' => 'faz')))->getSet('val4', array('foo', 'bar')); } public function testGetStringList() { - $oParams = new ParameterParser([ + $oParams = new ParameterParser(array( 'list1' => ',a,b,c,,c,d', 'list2' => 'a', 'list3' => '', 'list4' => '0' - ]); + )); $this->assertSame(false, $oParams->getStringList('non-exists')); - $this->assertSame(['a', 'b'], $oParams->getStringList('non-exists', ['a', 'b'])); - $this->assertSame(['a', 'b', 'c', 'c', 'd'], $oParams->getStringList('list1')); - $this->assertSame(['a'], $oParams->getStringList('list2')); + $this->assertSame(array('a', 'b'), $oParams->getStringList('non-exists', array('a', 'b'))); + $this->assertSame(array('a', 'b', 'c', 'c', 'd'), $oParams->getStringList('list1')); + $this->assertSame(array('a'), $oParams->getStringList('list2')); $this->assertSame(false, $oParams->getStringList('list3')); $this->assertSame(false, $oParams->getStringList('list4')); } @@ -163,8 +163,8 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetPreferredLanguages() { - $oParams = new ParameterParser(['accept-language' => '']); - $this->assertSame([ + $oParams = new ParameterParser(array('accept-language' => '')); + $this->assertSame(array( 'short_name:default' => 'short_name:default', 'name:default' => 'name:default', 'short_name' => 'short_name', @@ -174,10 +174,10 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase 'official_name' => 'official_name', 'ref' => 'ref', 'type' => 'type' - ], $oParams->getPreferredLanguages('default')); + ), $oParams->getPreferredLanguages('default')); - $oParams = new ParameterParser(['accept-language' => 'de,en']); - $this->assertSame([ + $oParams = new ParameterParser(array('accept-language' => 'de,en')); + $this->assertSame(array( 'short_name:de' => 'short_name:de', 'name:de' => 'name:de', 'short_name:en' => 'short_name:en', @@ -190,10 +190,10 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase 'official_name' => 'official_name', 'ref' => 'ref', 'type' => 'type' - ], $oParams->getPreferredLanguages('default')); + ), $oParams->getPreferredLanguages('default')); - $oParams = new ParameterParser(['accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3']); - $this->assertSame([ + $oParams = new ParameterParser(array('accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3')); + $this->assertSame(array( 'short_name:fr-ca' => 'short_name:fr-ca', 'name:fr-ca' => 'name:fr-ca', 'short_name:fr' => 'short_name:fr', @@ -212,6 +212,6 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase 'official_name' => 'official_name', 'ref' => 'ref', 'type' => 'type', - ], $oParams->getPreferredLanguages('default')); + ), $oParams->getPreferredLanguages('default')); } } diff --git a/website/lookup.php b/website/lookup.php index b9cc88f7..71c93715 100755 --- a/website/lookup.php +++ b/website/lookup.php @@ -63,7 +63,7 @@ $sQuery = join(',', $aCleanedQueryParts); // we initialize these to avoid warnings in our logfile $sViewBox = ''; $bShowPolygons = ''; -$aExcludePlaceIDs = []; +$aExcludePlaceIDs = array(); $sMoreURL = ''; include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php'); diff --git a/website/reverse.php b/website/reverse.php index 4ce5833f..3bcac2ce 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -62,7 +62,7 @@ if (isset($aPlace)) { $aPlace = array_merge($aPlace, $aOutlineResult); } } else { - $aPlace = []; + $aPlace = array(); } -- 2.39.5