gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Camel case some variables

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-05-16 00:24:08 +02:00
parent 54127bd425
commit d57de68ae4
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
8 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/classes/Gis/GisGeometryCollectionTest.php
View File

@ -292,11 +292,11 @@ class GisGeometryCollectionTest extends TestCase
/**
* Test for prepareRowAsSvg
*
* @param string $spatial string to parse
* @param string $label field label
* @param string $line_color line color
* @param array $scale_data scaling parameters
* @param string $output expected output
* @param string $spatial string to parse
* @param string $label field label
* @param string $lineColor line color
* @param array $scaleData scaling parameters
* @param string $output expected output
*
* @return void
*
@ -305,15 +305,15 @@ class GisGeometryCollectionTest extends TestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data,
$lineColor,
$scaleData,
$output
) {
$string = $this->object->prepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data
$lineColor,
$scaleData
);
$this->assertEquals(1, preg_match($output, $string));
// assertMatchesRegularExpression added in 9.1
@ -322,8 +322,8 @@ class GisGeometryCollectionTest extends TestCase
$this->object->prepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data
$lineColor,
$scaleData
)
);
}

18
test/classes/Gis/GisLineStringTest.php
View File

@ -286,11 +286,11 @@ class GisLineStringTest extends GisGeomTestCase
/**
* test case for prepareRowAsSvg() method
*
* @param string $spatial GIS LINESTRING object
* @param string $label label for the GIS LINESTRING object
* @param string $line_color color for the GIS LINESTRING object
* @param array $scale_data array containing data related to scaling
* @param string $output expected output
* @param string $spatial GIS LINESTRING object
* @param string $label label for the GIS LINESTRING object
* @param string $lineColor color for the GIS LINESTRING object
* @param array $scaleData array containing data related to scaling
* @param string $output expected output
*
* @return void
*
@ -299,15 +299,15 @@ class GisLineStringTest extends GisGeomTestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data,
$lineColor,
$scaleData,
$output
) {
$string = $this->object->prepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data
$lineColor,
$scaleData
);
$this->assertEquals(1, preg_match($output, $string));
}

18
test/classes/Gis/GisMultiLineStringTest.php
View File

@ -370,11 +370,11 @@ class GisMultiLineStringTest extends GisGeomTestCase
/**
* test case for prepareRowAsSvg() method
*
* @param string $spatial GIS MULTILINESTRING object
* @param string $label label for the GIS MULTILINESTRING object
* @param string $line_color color for the GIS MULTILINESTRING object
* @param array $scale_data array containing data related to scaling
* @param string $output expected output
* @param string $spatial GIS MULTILINESTRING object
* @param string $label label for the GIS MULTILINESTRING object
* @param string $lineColor color for the GIS MULTILINESTRING object
* @param array $scaleData array containing data related to scaling
* @param string $output expected output
*
* @return void
*
@ -383,15 +383,15 @@ class GisMultiLineStringTest extends GisGeomTestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data,
$lineColor,
$scaleData,
$output
) {
$string = $this->object->prepareRowAsSvg(
$spatial,
$label,
$line_color,
$scale_data
$lineColor,
$scaleData
);
$this->assertEquals(1, preg_match($output, $string));
}

18
test/classes/Gis/GisMultiPointTest.php
View File

@ -289,11 +289,11 @@ class GisMultiPointTest extends GisGeomTestCase
/**
* test case for prepareRowAsSvg() method
*
* @param string $spatial GIS MULTIPOINT object
* @param string $label label for the GIS MULTIPOINT object
* @param string $point_color color for the GIS MULTIPOINT object
* @param array $scale_data array containing data related to scaling
* @param string $output expected output
* @param string $spatial GIS MULTIPOINT object
* @param string $label label for the GIS MULTIPOINT object
* @param string $pointColor color for the GIS MULTIPOINT object
* @param array $scaleData array containing data related to scaling
* @param string $output expected output
*
* @return void
*
@ -302,15 +302,15 @@ class GisMultiPointTest extends GisGeomTestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$point_color,
$scale_data,
$pointColor,
$scaleData,
$output
) {
$string = $this->object->prepareRowAsSvg(
$spatial,
$label,
$point_color,
$scale_data
$pointColor,
$scaleData
);
$this->assertEquals(1, preg_match($output, $string));
}

18
test/classes/Gis/GisMultiPolygonTest.php
View File

@ -457,11 +457,11 @@ class GisMultiPolygonTest extends GisGeomTestCase
/**
* test case for prepareRowAsSvg() method
*
* @param string $spatial GIS MULTIPOLYGON object
* @param string $label label for the GIS MULTIPOLYGON object
* @param string $fill_color color for the GIS MULTIPOLYGON object
* @param array $scale_data array containing data related to scaling
* @param string $output expected output
* @param string $spatial GIS MULTIPOLYGON object
* @param string $label label for the GIS MULTIPOLYGON object
* @param string $fillColor color for the GIS MULTIPOLYGON object
* @param array $scaleData array containing data related to scaling
* @param string $output expected output
*
* @return void
*
@ -470,15 +470,15 @@ class GisMultiPolygonTest extends GisGeomTestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$fill_color,
$scale_data,
$fillColor,
$scaleData,
$output
) {
$string = $this->object->prepareRowAsSvg(
$spatial,
$label,
$fill_color,
$scale_data
$fillColor,
$scaleData
);
$this->assertEquals(1, preg_match($output, $string));
}

18
test/classes/Gis/GisPointTest.php
View File

@ -300,11 +300,11 @@ class GisPointTest extends GisGeomTestCase
/**
* test case for prepareRowAsSvg() method
*
* @param string $spatial GIS POINT object
* @param string $label label for the GIS POINT object
* @param string $point_color color for the GIS POINT object
* @param array $scale_data array containing data related to scaling
* @param string $output expected output
* @param string $spatial GIS POINT object
* @param string $label label for the GIS POINT object
* @param string $pointColor color for the GIS POINT object
* @param array $scaleData array containing data related to scaling
* @param string $output expected output
*
* @return void
*
@ -313,8 +313,8 @@ class GisPointTest extends GisGeomTestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$point_color,
$scale_data,
$pointColor,
$scaleData,
$output
) {
$this->assertEquals(
@ -322,8 +322,8 @@ class GisPointTest extends GisGeomTestCase
$this->object->prepareRowAsSvg(
$spatial,
$label,
$point_color,
$scale_data
$pointColor,
$scaleData
)
);
}

18
test/classes/Gis/GisPolygonTest.php
View File

@ -544,11 +544,11 @@ class GisPolygonTest extends GisGeomTestCase
/**
* test case for prepareRowAsSvg() method
*
* @param string $spatial GIS POLYGON object
* @param string $label label for the GIS POLYGON object
* @param string $fill_color color for the GIS POLYGON object
* @param array $scale_data array containing data related to scaling
* @param string $output expected output
* @param string $spatial GIS POLYGON object
* @param string $label label for the GIS POLYGON object
* @param string $fillColor color for the GIS POLYGON object
* @param array $scaleData array containing data related to scaling
* @param string $output expected output
*
* @return void
*
@ -557,15 +557,15 @@ class GisPolygonTest extends GisGeomTestCase
public function testPrepareRowAsSvg(
$spatial,
$label,
$fill_color,
$scale_data,
$fillColor,
$scaleData,
$output
) {
$string = $this->object->prepareRowAsSvg(
$spatial,
$label,
$fill_color,
$scale_data
$fillColor,
$scaleData
);
$this->assertEquals(1, preg_match($output, $string));
}

32
test/classes/ImportTest.php
View File

@ -498,14 +498,14 @@ class ImportTest extends TestCase
->disableOriginalConstructor()
->getMock();
$update_query = 'UPDATE `table_1` '
$updateQuery = 'UPDATE `table_1` '
. 'SET `id` = 20 '
. 'WHERE `id` > 10';
$simulated_update_query = 'SELECT `id` FROM `table_1` WHERE `id` > 10 AND (`id` <> 20)';
$simulatedUpdateQuery = 'SELECT `id` FROM `table_1` WHERE `id` > 10 AND (`id` <> 20)';
$delete_query = 'DELETE FROM `table_1` '
$deleteQuery = 'DELETE FROM `table_1` '
. 'WHERE `id` > 10';
$simulated_delete_query = 'SELECT * FROM `table_1` WHERE `id` > 10';
$simulatedDeleteQuery = 'SELECT * FROM `table_1` WHERE `id` > 10';
$dbi->expects($this->any())
->method('numRows')
@ -519,33 +519,33 @@ class ImportTest extends TestCase
$dbi->expects($this->at(1))
->method('tryQuery')
->with($simulated_update_query)
->with($simulatedUpdateQuery)
->will($this->returnValue([]));
$dbi->expects($this->at(4))
->method('tryQuery')
->with($simulated_delete_query)
->with($simulatedDeleteQuery)
->will($this->returnValue([]));
$GLOBALS['dbi'] = $dbi;
$this->simulatedQueryTest($update_query, $simulated_update_query);
$this->simulatedQueryTest($delete_query, $simulated_delete_query);
$this->simulatedQueryTest($updateQuery, $simulatedUpdateQuery);
$this->simulatedQueryTest($deleteQuery, $simulatedDeleteQuery);
}
/**
* Tests simulated UPDATE/DELETE query.
*
* @param string $sql_query SQL query
* @param string $simulated_query Simulated query
* @param string $sqlQuery SQL query
* @param string $simulatedQuery Simulated query
*
* @return void
*/
public function simulatedQueryTest($sql_query, $simulated_query)
public function simulatedQueryTest($sqlQuery, $simulatedQuery)
{
$parser = new Parser($sql_query);
$parser = new Parser($sqlQuery);
$analyzed_sql_results = [
'query' => $sql_query,
'query' => $sqlQuery,
'parser' => $parser,
'statement' => $parser->statements[0],
];
@ -555,7 +555,7 @@ class ImportTest extends TestCase
// URL to matched rows.
$_url_params = [
'db' => 'PMA',
'sql_query' => $simulated_query,
'sql_query' => $simulatedQuery,
];
$matched_rows_url = Url::getFromRoute('/sql', $_url_params);
@ -636,11 +636,11 @@ class ImportTest extends TestCase
$GLOBALS['dbi'] = $dbi;
$sql_query = 'UPDATE `table_1` AS t1, `table_2` t2 '
$sqlQuery = 'UPDATE `table_1` AS t1, `table_2` t2 '
. 'SET `table_1`.`id` = `table_2`.`id` '
. 'WHERE 1';
$this->assertEquals(true, $this->import->checkIfRollbackPossible($sql_query));
$this->assertEquals(true, $this->import->checkIfRollbackPossible($sqlQuery));
}
/**