From 9b1f025fb737338426b56aa654da7ca2edafd3c8 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Fri, 14 Mar 2014 23:06:46 +0100
Subject: [PATCH] PHPCS updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/insert_edit.lib.php                 |  6 +-
 libraries/navigation/NavigationTree.class.php |  5 +-
 .../auth/AuthenticationCookie.class.php       |  9 +-
 test/classes/PMA_Config_test.php              | 16 ++--
 .../rte/PMA_EVN_getDataFromRequest_test.php   | 17 ++++
 .../rte/PMA_EVN_getEditorForm_test.php        | 73 +++++++++++++-
 .../rte/PMA_EVN_getQueryFromRequest_test.php  | 19 +++-
 .../rte/PMA_RTN_getDataFromRequest_test.php   | 27 +++++-
 .../rte/PMA_RTN_getEditorForm_test.php        | 96 ++++++++++++++++++-
 9 files changed, 244 insertions(+), 24 deletions(-)

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 1e81b5ea61..b80eb071b1 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -1176,11 +1176,9 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
     // verify True_Type which does not contain the parentheses and length
     if ($column['True_Type'] === 'date') {
         $the_class .= ' datefield';
-    }            
-    else if ($column['True_Type'] === 'time') {
+    } else if ($column['True_Type'] === 'time') {
         $the_class .= ' timefield';
-    }
-    else if ($column['True_Type'] === 'datetime'
+    } else if ($column['True_Type'] === 'datetime'
         || $column['True_Type'] === 'timestamp'
     ) {
         $the_class .= ' datetimefield';
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 109146bd5f..4a867657eb 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -928,10 +928,11 @@ class PMA_NavigationTree
                         $args[] = urlencode($parent->real_name);
                     }
                     $link = vsprintf($node->links['icon'], $args);
-                    if($linkClass != '')
+                    if ($linkClass != '') {
                         $retval .= "<a class='$linkClass' href='$link'>{$node->icon}</a>";
-                    else
+                    } else {
                         $retval .= "<a href='$link'>{$node->icon}</a>";
+                    }
                 } else {
                     $retval .= "<u>{$node->icon}</u>";
                 }
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 9182fde597..d593c0c0d0 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -148,9 +148,12 @@ class AuthenticationCookie extends AuthenticationPlugin
         // Show error message
         if (! empty($conn_error)) {
             PMA_Message::rawError($conn_error)->display();
-        }
-        elseif (isset($_GET['session_expired']) && intval($_GET['session_expired'])==1) {
-            PMA_Message::rawError(__('Your session has expired. Please log in again.'))->display();
+        } elseif (isset($_GET['session_expired'])
+            && intval($_GET['session_expired']) == 1
+        ) {
+            PMA_Message::rawError(
+                __('Your session has expired. Please log in again.')
+            )->display();
         }
 
         echo "<noscript>\n";
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 899c814c3f..6d71ec1b1a 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -34,13 +34,13 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
      * @var PMA_Config
      */
     protected $object;
-    
+
     /**
      * @var object to test file permission
      */
     protected $permTestObj;
-    
-    
+
+
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -54,7 +54,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
         $GLOBALS['server'] = 0;
         $_SESSION['is_git_revision'] = true;
         $GLOBALS['PMA_Config'] = new PMA_Config(CONFIG_FILE);
-        
+
         //for testing file permissions
         $this->permTestObj = new PMA_Config("./config.sample.inc.php");
     }
@@ -967,14 +967,14 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
         $perms = @fileperms($this->object->getSource());
         //testing for permissions for no configration file
         $this->assertFalse(!($perms === false) && ($perms & 2));
-        
+
         //load file permissions for the current permissions file
         $perms = @fileperms($this->permTestObj->getSource());
-        //testing for permissions 
+        //testing for permissions
         $this->assertFalse(!($perms === false) && ($perms & 2));
-        
+
         //if the above assertion is false then applying further assertions
-        if(!($perms === false) && ($perms & 2)) {             
+        if (!($perms === false) && ($perms & 2)) {
             $this->assertFalse($this->permTestObj->get('PMA_IS_WINDOWS') == 0);
         }
     }
diff --git a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
index f35fea9a96..b55ac84340 100644
--- a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
@@ -11,9 +11,21 @@
  */
 require_once 'libraries/rte/rte_events.lib.php';
 
+/**
+ * Test for fetching event data from HTTP request
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_EVN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
 {
     /**
+     * Test for PMA_EVN_getDataFromRequest
+     *
+     * @param array $in  Input
+     * @param array $out Expected output
+     *
+     * @return void
+     *
      * @dataProvider provider
      */
     public function testgetDataFromRequest_empty($in, $out)
@@ -29,6 +41,11 @@ class PMA_EVN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($out, PMA_EVN_getDataFromRequest());
     }
 
+    /**
+     * Data provider for testgetDataFromRequest_empty
+     *
+     * @return array
+     */
     public function provider()
     {
         return array(
diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
index 3d3e9692f7..006f53d6e6 100644
--- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
+
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/Util.class.php';
@@ -13,8 +14,18 @@ require_once 'libraries/Util.class.php';
  */
 require_once 'libraries/rte/rte_events.lib.php';
 
+/**
+ * Test for generating event editor
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setUp()
     {
         $GLOBALS['tear_down']['server'] = false;
@@ -24,6 +35,11 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * Tear down
+     *
+     * @return void
+     */
     public function tearDown()
     {
         if ($GLOBALS['tear_down']['server']) {
@@ -33,15 +49,32 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_EVN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @dataProvider provider_add
      */
     public function testgetEditorForm_add($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_EVN_setGlobals();
-        $this->assertTag($matcher, PMA_EVN_getEditorForm('add', 'change', $data), '', false);
+        $this->assertTag(
+            $matcher,
+            PMA_EVN_getEditorForm('add', 'change', $data),
+            '',
+            false
+        );
     }
 
+    /**
+     * Data provider for testgetEditorForm_add
+     *
+     * @return array
+     */
     public function provider_add()
     {
         $data = array(
@@ -201,15 +234,32 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_EVN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @dataProvider provider_edit
      */
     public function testgetEditorForm_edit($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_EVN_setGlobals();
-        $this->assertTag($matcher, PMA_EVN_getEditorForm('edit', 'change', $data), '', false);
+        $this->assertTag(
+            $matcher,
+            PMA_EVN_getEditorForm('edit', 'change', $data),
+            '',
+            false
+        );
     }
 
+    /**
+     * Data provider for testgetEditorForm_edit
+     *
+     * @return array
+     */
     public function provider_edit()
     {
         $data = array(
@@ -369,15 +419,32 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_EVN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @dataProvider provider_ajax
      */
     public function testgetEditorForm_ajax($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = true;
         PMA_EVN_setGlobals();
-        $this->assertTag($matcher, PMA_EVN_getEditorForm('edit', 'change', $data), '', false);
+        $this->assertTag(
+            $matcher,
+            PMA_EVN_getEditorForm('edit', 'change', $data),
+            '',
+            false
+        );
     }
 
+    /**
+     * Data provider for testgetEditorForm_ajax
+     *
+     * @return array
+     */
     public function provider_ajax()
     {
         $data = array(
diff --git a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
index 612fbb4c07..b3181850a3 100644
--- a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
@@ -21,10 +21,22 @@ require_once 'libraries/php-gettext/gettext.inc';
  */
 require_once 'libraries/rte/rte_events.lib.php';
 
-
+/**
+ * Test for generating CREATE EVENT query from HTTP request
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_EVN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
 {
     /**
+     * Test for PMA_EVN_getQueryFromRequest
+     *
+     * @param array  $request Request
+     * @param string $query   Query
+     * @param array  $num_err Error number
+     *
+     * @return void
+     *
      * @dataProvider provider
      */
     public function testgetQueryFromRequest($request, $query, $num_err)
@@ -41,6 +53,11 @@ class PMA_EVN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($num_err, count($errors));
     }
 
+    /**
+     * Data provider for testgetQueryFromRequest
+     *
+     * @return array
+     */
     public function provider()
     {
         return array(
diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
index 23dd366800..fbd5683fc2 100644
--- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
@@ -15,8 +15,18 @@ require_once './libraries/Types.class.php';
  */
 require_once 'libraries/rte/rte_routines.lib.php';
 
+/**
+ * Test for fetching routine data from HTTP request
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setUp()
     {
         global $cfg;
@@ -27,6 +37,13 @@ class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getDataFromRequest
+     *
+     * @param array $in  Input
+     * @param array $out Expected output
+     *
+     * @return void
+     *
      * @dataProvider provider
      */
     public function testgetDataFromRequest($in, $out)
@@ -43,6 +60,11 @@ class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($out, PMA_RTN_getDataFromRequest());
     }
 
+    /**
+     * Data provider for testgetDataFromRequest
+     *
+     * @return array
+     */
     public function provider()
     {
         return array(
@@ -161,7 +183,10 @@ class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
                     'item_original_type'        => 'FUNCTION',
                     'item_param_dir'            => array(0 => '', 1 => ''),
                     'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => '<s>XSS</s>', 1 => 'TEXT'),
+                    'item_param_type'           => array(
+                        0 => '<s>XSS</s>',
+                        1 => 'TEXT'
+                    ),
                     'item_param_length'         => array(0 => '10,10', 1 => ''),
                     'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
                     'item_param_opts_text'      => array(0 => '', 1 => 'utf8'),
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 79dc3ca187..3f6b8cc2d0 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
+
 $GLOBALS['server'] = 0;
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
@@ -19,8 +20,18 @@ require_once 'libraries/mysql_charsets.inc.php';
  */
 require_once 'libraries/rte/rte_routines.lib.php';
 
+/**
+ * Test for generating routine editor
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setUp()
     {
         global $cfg;
@@ -44,6 +55,14 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getParameterRow
+     *
+     * @param array $data    Data for routine
+     * @param mixed $index   Index
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @depends testgetParameterRow_empty
      * @dataProvider provider_row
      */
@@ -54,6 +73,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         $this->assertTag($matcher, PMA_RTN_getParameterRow($data, $index), false);
     }
 
+    /**
+     * Data provider for testgetParameterRow
+     *
+     * @return array
+     */
     public function provider_row()
     {
         $data = array(
@@ -147,6 +171,13 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getParameterRow
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @depends testgetParameterRow
      * @dataProvider provider_row_ajax
      */
@@ -157,6 +188,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         $this->assertTag($matcher, PMA_RTN_getParameterRow($data), false);
     }
 
+    /**
+     * Data provider for testgetParameterRow_ajax
+     *
+     * @return array
+     */
     public function provider_row_ajax()
     {
         $data = array(
@@ -244,6 +280,13 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @depends testgetParameterRow_ajax
      * @dataProvider provider_editor_1
      */
@@ -254,6 +297,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         $this->assertTag($matcher, PMA_RTN_getEditorForm('add', '', $data), false);
     }
 
+    /**
+     * Data provider for testgetEditorForm_1
+     *
+     * @return array
+     */
     public function provider_editor_1()
     {
         $data = array(
@@ -434,6 +482,13 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @depends testgetParameterRow_ajax
      * @dataProvider provider_editor_2
      */
@@ -444,6 +499,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         $this->assertTag($matcher, PMA_RTN_getEditorForm('edit', 'change', $data), false);
     }
 
+    /**
+     * Data provider for testgetEditorForm_2
+     *
+     * @return array
+     */
     public function provider_editor_2()
     {
         $data = array(
@@ -625,6 +685,13 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @depends testgetParameterRow_ajax
      * @dataProvider provider_editor_3
      */
@@ -632,9 +699,18 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     {
         $GLOBALS['is_ajax_request'] = true;
         PMA_RTN_setGlobals();
-        $this->assertTag($matcher, PMA_RTN_getEditorForm('edit', 'remove', $data), false);
+        $this->assertTag(
+            $matcher,
+            PMA_RTN_getEditorForm('edit', 'remove', $data),
+            false
+        );
     }
 
+    /**
+     * Data provider for testgetEditorForm_3
+     *
+     * @return array
+     */
     public function provider_editor_3()
     {
         $data = array(
@@ -813,6 +889,13 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for PMA_RTN_getEditorForm
+     *
+     * @param array $data    Data for routine
+     * @param array $matcher Matcher
+     *
+     * @return void
+     *
      * @depends testgetParameterRow_ajax
      * @dataProvider provider_editor_4
      */
@@ -820,9 +903,18 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
-        $this->assertTag($matcher, PMA_RTN_getEditorForm('edit', 'change', $data), false);
+        $this->assertTag(
+            $matcher,
+            PMA_RTN_getEditorForm('edit', 'change', $data),
+            false
+        );
     }
 
+    /**
+     * Data provider for testgetEditorForm_4
+     *
+     * @return array
+     */
     public function provider_editor_4()
     {
         $data = array(