Merge remote-tracking branch 'origin/master'

phpmyadmin · Jun 11, 2013 · a03a359 · a03a359
2 parents b7fb315 + 22e0b6a
commit a03a359
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 16 deletions.
diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php
@@ -257,7 +257,9 @@ public function exportData($db, $table, $crlf, $error_url, $sql_query)
             $schema_insert = '';
             for ($i = 0; $i < $fields_cnt; $i++) {
                 if ($csv_enclosed == '') {
-                    $schema_insert .= stripslashes($GLOBALS['dbi']->fieldName($result, $i));
+                    $schema_insert .= stripslashes(
+                        $GLOBALS['dbi']->fieldName($result, $i)
+                    );
                 } else {
                     $schema_insert .= $csv_enclosed
                         . str_replace(
@@ -344,4 +346,4 @@ public function exportData($db, $table, $crlf, $error_url, $sql_query)
         return true;
     }
 }
-?>
+?>
diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php
@@ -152,7 +152,9 @@ public function doImport(&$sql_data = array())
             $sql_modes[] = 'NO_AUTO_VALUE_ON_ZERO';
         }
         if (count($sql_modes) > 0) {
-            $GLOBALS['dbi']->tryQuery('SET SQL_MODE="' . implode(',', $sql_modes) . '"');
+            $GLOBALS['dbi']->tryQuery(
+                'SET SQL_MODE="' . implode(',', $sql_modes) . '"'
+            );
         }
         unset($sql_modes);
 
@@ -437,4 +439,4 @@ public function doImport(&$sql_data = array())
         PMA_importRunQuery('', substr($buffer, 0, $len), false, $sql_data);
         PMA_importRunQuery('', '', false, $sql_data);
     }
-}
+}
diff --git a/libraries/tbl_views.lib.php b/libraries/tbl_views.lib.php
@@ -27,7 +27,9 @@ function PMA_getColumnMap($sql_query, $view_columns)
 
     if ($real_source_result !== false) {
 
-        $real_source_fields_meta = $GLOBALS['dbi']->getFieldsMeta($real_source_result);
+        $real_source_fields_meta = $GLOBALS['dbi']->getFieldsMeta(
+            $real_source_result
+        );
 
         if (count($real_source_fields_meta) > 0) {
 

diff --git a/tbl_addfield.php b/tbl_addfield.php
@@ -59,7 +59,9 @@
     // on this db.
     $GLOBALS['dbi']->selectDb($db)
         or PMA_Util::mysqlDie(
-            $GLOBALS['dbi']->getError(), 'USE ' . PMA_Util::backquote($db), '', $err_url
+            $GLOBALS['dbi']->getError(),
+            'USE ' . PMA_Util::backquote($db), '',
+            $err_url
         );
     $sql_query    = 'ALTER TABLE ' .
         PMA_Util::backquote($table) . ' ' . $sql_statement . ';';

diff --git a/test/classes/PMA_Index_test.php b/test/classes/PMA_Index_test.php
@@ -35,7 +35,7 @@ public function setup()
         $this->_params['Index_comment'] = "PMA_Index_comment";
         $this->_params['Non_unique'] = "PMA_Non_unique";
         $this->_params['Packed'] = "PMA_Packed";
-        
+
         //test add columns
         $column1 = array("Column_name"=>"column1","Seq_in_index"=>"index1",
                          "Collation"=>"Collation1","Cardinality"=>"Cardinality1",
@@ -94,7 +94,7 @@ public function testConstructor()
             'INDEX',
             $index->getChoice()
         );
-        
+
     }
 
     /**
@@ -141,16 +141,16 @@ public function testIsUniquer()
     public function testAddColumns()
     {
         $index = new PMA_Index();
-        $index->addColumns($this->_params['columns']);       
-        $this->assertTrue($index->hasColumn("column1"));       
-        $this->assertTrue($index->hasColumn("column2"));       
+        $index->addColumns($this->_params['columns']);
+        $this->assertTrue($index->hasColumn("column1"));
+        $this->assertTrue($index->hasColumn("column2"));
         $this->assertTrue($index->hasColumn("column3"));
         $this->assertEquals(
             3,
             $index->getColumnCount()
         );
     }
- 
+
     /**
      * Test for get Name & set Name
      *
@@ -165,17 +165,17 @@ public function testName()
             $index->getName()
         );
     }
-       
+
     /**
      * Test for PMA_Index_Column
      *
      * @return void
      */
-    public function testPMA_Index_Column()
+    public function testColumns()
     {
         $index = new PMA_Index();
         $index->addColumns($this->_params['columns']);
-        
+
         $index_columns = $index->getColumns();
         $index_column = $index_columns['column1'];
         $this->assertEquals(

diff --git a/test/classes/PMA_Types_MySQL_test.php b/test/classes/PMA_Types_MySQL_test.php
@@ -38,7 +38,7 @@ protected function setUp()
     /**
      * Test for getTypeDescription
      *
-     * @param string $type   The data type to get a description.
+     * @param string $type The data type to get a description.
      *
      * @return void
      *

diff --git a/test/libraries/core/PMA_securePath_test.php b/test/libraries/core/PMA_securePath_test.php
@@ -9,8 +9,18 @@
 
 require_once 'libraries/core.lib.php';
 
+/**
+ * Test for securing path.
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_SecurePath extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for replacing dots.
+     *
+     * @return void
+     */
     public function testReplaceDots()
     {
         $this->assertEquals(

diff --git a/themes.php b/themes.php
@@ -1,6 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
+ * Displays list of themes.
  *
  * @package PhpMyAdmin
  */

diff --git a/transformation_overview.php b/transformation_overview.php
@@ -1,6 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
+ * Lists available transformation plugins
  *
  * @package PhpMyAdmin
  */

diff --git a/view_operations.php b/view_operations.php
@@ -1,6 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
+ * View manipulations
  *
  * @package PhpMyAdmin
  */