Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2021-04-21 04:35:21 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2021-04-21 04:35:21 +0300
commit8d0c2a339c6ba1f95726c50664610627c71ebaff (patch)
tree0e96ff406dc14d560639e50ed330e30ce31b07ce /test/classes
parenta8f63ca458ab798059b4a4759d896e99a852f53b (diff)
Move both operands of an assignment to the same line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'test/classes')
-rw-r--r--test/classes/Controllers/Database/StructureControllerTest.php6
-rw-r--r--test/classes/FileListingTest.php9
-rw-r--r--test/classes/IpAllowDenyTest.php18
-rw-r--r--test/classes/Plugins/Export/ExportHtmlwordTest.php6
-rw-r--r--test/classes/Server/PrivilegesTest.php29
5 files changed, 26 insertions, 42 deletions
diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
index d6303323bd..6ba8d46d6c 100644
--- a/test/classes/Controllers/Database/StructureControllerTest.php
+++ b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -184,8 +184,7 @@ class StructureControllerTest extends AbstractTestCase
);
$currentTable['ENGINE'] = 'InnoDB';
- [$currentTable, , , $sumSize]
- = $method->invokeArgs($controller, [$currentTable, 10]);
+ [$currentTable, , , $sumSize] = $method->invokeArgs($controller, [$currentTable, 10]);
$this->assertTrue(
$currentTable['COUNTED']
);
@@ -195,8 +194,7 @@ class StructureControllerTest extends AbstractTestCase
);
$currentTable['ENGINE'] = 'MYISAM';
- [$currentTable, , , $sumSize]
- = $method->invokeArgs($controller, [$currentTable, 10]);
+ [$currentTable, , , $sumSize] = $method->invokeArgs($controller, [$currentTable, 10]);
$this->assertFalse(
$currentTable['COUNTED']
);
diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php
index 9581357df1..e285552573 100644
--- a/test/classes/FileListingTest.php
+++ b/test/classes/FileListingTest.php
@@ -47,8 +47,7 @@ class FileListingTest extends AbstractTestCase
$this->assertFalse($this->fileListing->getFileSelectOptions('nonexistent directory'));
- $expectedHtmlWithoutActive =
- ' <option value="one.txt">' . "\n"
+ $expectedHtmlWithoutActive = ' <option value="one.txt">' . "\n"
. ' one.txt' . "\n"
. ' </option>' . "\n"
. ' <option value="two.md">' . "\n"
@@ -60,8 +59,7 @@ class FileListingTest extends AbstractTestCase
$this->fileListing->getFileSelectOptions($fixturesDir)
);
- $expectedHtmlWithActive =
- ' <option value="one.txt">' . "\n"
+ $expectedHtmlWithActive = ' <option value="one.txt">' . "\n"
. ' one.txt' . "\n"
. ' </option>' . "\n"
. ' <option value="two.md" selected="selected">' . "\n"
@@ -73,8 +71,7 @@ class FileListingTest extends AbstractTestCase
$this->fileListing->getFileSelectOptions($fixturesDir, '', 'two.md')
);
- $expectedFilteredHtml =
- ' <option value="one.txt">' . "\n"
+ $expectedFilteredHtml = ' <option value="one.txt">' . "\n"
. ' one.txt' . "\n"
. ' </option>' . "\n";
diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php
index 050ba4a234..b10de4d536 100644
--- a/test/classes/IpAllowDenyTest.php
+++ b/test/classes/IpAllowDenyTest.php
@@ -24,19 +24,13 @@ class IpAllowDenyTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['cfg']['Server']['user'] = 'pma_username';
- $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
- = 'allow % 255.255.255.0/4';
- $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
- = 'allow % from 255.255.2.0/4';
- $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
- = 'allow % from 2001:4998:c:a0d:0000:0000:4998:1020';
- $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
- = 'allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]';
- $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
- = 'allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24';
+ $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'allow % 255.255.255.0/4';
+ $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'allow % from 255.255.2.0/4';
+ $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'allow % from 2001:4998:c:a0d:0000:0000:4998:1020';
+ $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]';
+ $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24';
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'deny % 255.255.0.0/8';
- $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
- = 'deny % from 255.255.0.0/8';
+ $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = 'deny % from 255.255.0.0/8';
$this->ipAllowDeny = new IpAllowDeny();
}
diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php
index 9197c821f0..68c8223461 100644
--- a/test/classes/Plugins/Export/ExportHtmlwordTest.php
+++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php
@@ -218,8 +218,7 @@ class ExportHtmlwordTest extends AbstractTestCase
$this->object->exportHeader();
$result = ob_get_clean();
- $expected
- = '<html xmlns:o="urn:schemas-microsoft-com:office:office"
+ $expected = '<html xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:x="urn:schemas-microsoft-com:office:word"
xmlns="http://www.w3.org/TR/REC-html40">
@@ -244,8 +243,7 @@ class ExportHtmlwordTest extends AbstractTestCase
$this->object->exportHeader();
$result = ob_get_clean();
- $expected
- = '<html xmlns:o="urn:schemas-microsoft-com:office:office"
+ $expected = '<html xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:x="urn:schemas-microsoft-com:office:word"
xmlns="http://www.w3.org/TR/REC-html40">
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
index f0b3e26306..2be7c19b12 100644
--- a/test/classes/Server/PrivilegesTest.php
+++ b/test/classes/Server/PrivilegesTest.php
@@ -466,8 +466,7 @@ class PrivilegesTest extends AbstractTestCase
$username = 'PMA_username';
$hostname = 'PMA_hostname';
- [$title, $export]
- = $this->serverPrivileges->getListForExportUserDefinition($username, $hostname);
+ [$title, $export] = $this->serverPrivileges->getListForExportUserDefinition($username, $hostname);
//validate 1: $export
$this->assertStringContainsString(
@@ -626,14 +625,13 @@ class PrivilegesTest extends AbstractTestCase
$_POST['createdb-3'] = true;
$_POST['Grant_priv'] = 'Y';
$_POST['max_questions'] = 1000;
- [$message, $sql_query]
- = $this->serverPrivileges->getMessageAndSqlQueryForPrivilegesRevoke(
- $dbname,
- $tablename,
- $username,
- $hostname,
- ''
- );
+ [$message, $sql_query] = $this->serverPrivileges->getMessageAndSqlQueryForPrivilegesRevoke(
+ $dbname,
+ $tablename,
+ $username,
+ $hostname,
+ ''
+ );
$this->assertEquals(
"You have revoked the privileges for 'pma_username'@'pma_hostname'.",
@@ -1026,12 +1024,11 @@ class PrivilegesTest extends AbstractTestCase
$sql_query,,,
$alter_real_sql_query,
$alter_sql_query,
- ]
- = $this->serverPrivileges->getSqlQueriesForDisplayAndAddUser(
- $username,
- $hostname,
- $password
- );
+ ] = $this->serverPrivileges->getSqlQueriesForDisplayAndAddUser(
+ $username,
+ $hostname,
+ $password
+ );
//validate 1: $create_user_real
$this->assertEquals(