From 28074d27f4eeebf3cb315b90c274b157b10cded4 Mon Sep 17 00:00:00 2001 From: "Ann + J.M" Date: Wed, 21 May 2014 21:22:12 +0200 Subject: [PATCH] Code style fixes Signed-off-by: Ann + J.M --- test/libraries/PMA_Tracker_test.php | 50 ++++++++++--------- test/libraries/PMA_insert_edit_test.php | 10 ++-- .../PMA_tbl_columns_definition_form_test.php | 9 ++-- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/test/libraries/PMA_Tracker_test.php b/test/libraries/PMA_Tracker_test.php index 784be9f395..7bbe6b9d55 100644 --- a/test/libraries/PMA_Tracker_test.php +++ b/test/libraries/PMA_Tracker_test.php @@ -812,32 +812,36 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase */ public function getTrackedDataProvider() { - $fetchArrayReturn[0] = array( - "schema_sql" => "# log 20-03-2013 23:33:58 user1\nstat1" . - "# log 20-03-2013 23:39:58 user2\n", - "data_sql" => "# log ", - "schema_snapshot" => "dataschema", - "tracking" => "SELECT, DELETE" + $fetchArrayReturn = array( + array( + "schema_sql" => "# log 20-03-2013 23:33:58 user1\nstat1" . + "# log 20-03-2013 23:39:58 user2\n", + "data_sql" => "# log ", + "schema_snapshot" => "dataschema", + "tracking" => "SELECT, DELETE" + ) ); - $data[0] = array( - 'date_from' => '20-03-2013 23:33:58', - 'date_to' => '20-03-2013 23:39:58', - 'ddlog' => array( - array( - 'date' => '20-03-2013 23:33:58', - 'username' => 'user1', - 'statement' => "\nstat1" + $data = array( + array( + 'date_from' => '20-03-2013 23:33:58', + 'date_to' => '20-03-2013 23:39:58', + 'ddlog' => array( + array( + 'date' => '20-03-2013 23:33:58', + 'username' => 'user1', + 'statement' => "\nstat1" + ), + array( + 'date' => '20-03-2013 23:39:58', + 'username' => 'user2', + 'statement' => "" + ) ), - array( - 'date' => '20-03-2013 23:39:58', - 'username' => 'user2', - 'statement' => "" - ) - ), - 'dmlog' => array(), - "schema_snapshot" => "dataschema", - "tracking" => "SELECT, DELETE" + 'dmlog' => array(), + "schema_snapshot" => "dataschema", + "tracking" => "SELECT, DELETE" + ) ); $fetchArrayReturn[1] = array( diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index f03bff7c89..fa2de71ef0 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -745,7 +745,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testGetForeignLink() { - $column = array(); + $column = $titles = array(); $column['Field'] = 'f'; $titles['Browse'] = "'"; $GLOBALS['cfg']['ServerDefault'] = 2; @@ -2265,6 +2265,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testGetDisplayValueForForeignTableColumn() { + $map = array(); $map['f']['foreign_db'] = 'information_schema'; $map['f']['foreign_table'] = 'TABLES'; $map['f']['foreign_field'] = 'f'; @@ -2309,6 +2310,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase { $GLOBALS['cfg']['ServerDefault'] = 1; $_SESSION['tmpval']['relational_display'] = 'K'; + $map = array(); $map['f']['foreign_db'] = 'information_schema'; $map['f']['foreign_table'] = 'TABLES'; $map['f']['foreign_field'] = 'f'; @@ -2345,7 +2347,9 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase ); $GLOBALS['cfg']['ServerDefault'] = 1; $_REQUEST['where_clause'] = 1; - $transformation['transformation_options'] = "'','option ,, quoted',abd"; + $transformation = array( + 'transformation_options' => "'','option ,, quoted',abd" + ); $result = PMA_transformEditedValues( 'db', 'table', $transformation, $edited_values, 'Text_Plain_Preappend.class.php', 'c', array('a' => 'b') @@ -2364,7 +2368,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testGetQueryValuesForInsertAndUpdateInMultipleEdit() { - $multi_edit_columns_name[0] = 'fld'; + $multi_edit_columns_name = array('fld'); $result = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit( $multi_edit_columns_name, null, null, null, null, true, array(1), diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php index 686b57b93b..447a88eef6 100644 --- a/test/libraries/PMA_tbl_columns_definition_form_test.php +++ b/test/libraries/PMA_tbl_columns_definition_form_test.php @@ -961,9 +961,12 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase $colspec = array('attribute' => 'attr'); - $analyzed_sql[0]['create_table_fields'] = array( - 'f' => array( - 'default_current_timestamp' => true, + $analyzed_sql = array( + array( + 'create_table_fields' => array( + 'f' => array( + 'default_current_timestamp' => true, + ) ) );