diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 2c53895410..8a0d88a854 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -37,7 +37,7 @@ class InsertEdit
      *
      * @return array $form_params array of insert/edit form parameters
      */
-    public static function getFormParametersForInsertForm($db, $table, $where_clauses,
+    public function getFormParametersForInsertForm($db, $table, $where_clauses,
         array $where_clause_array, $err_url
     ) {
         $_form_params = array(
@@ -65,7 +65,7 @@ class InsertEdit
      *
      * @return array whereClauseArray array of where clauses
      */
-    public static function getWhereClauseArray($where_clause)
+    public function getWhereClauseArray($where_clause)
     {
         if (!isset($where_clause)) {
             return array();
@@ -87,7 +87,7 @@ class InsertEdit
      *
      * @return array $where_clauses, $result, $rows
      */
-    public static function analyzeWhereClauses(
+    public function analyzeWhereClauses(
         array $where_clause_array, $table, $db
     ) {
         $rows               = array();
@@ -108,7 +108,7 @@ class InsertEdit
             $rows[$key_id]   = $GLOBALS['dbi']->fetchAssoc($result[$key_id]);
 
             $where_clauses[$key_id] = str_replace('\\', '\\\\', $where_clause);
-            $has_unique_condition   = self::showEmptyResultMessageOrSetUniqueCondition(
+            $has_unique_condition = $this->showEmptyResultMessageOrSetUniqueCondition(
                 $rows, $key_id, $where_clause_array, $local_query, $result
             );
             if ($has_unique_condition) {
@@ -129,7 +129,7 @@ class InsertEdit
      *
      * @return boolean $has_unique_condition
      */
-    public static function showEmptyResultMessageOrSetUniqueCondition(array $rows, $key_id,
+    public function showEmptyResultMessageOrSetUniqueCondition(array $rows, $key_id,
         array $where_clause_array, $local_query, array $result
     ) {
         $has_unique_condition = false;
@@ -177,7 +177,7 @@ class InsertEdit
      *
      * @return array                containing $result and $rows arrays
      */
-    public static function loadFirstRow($table, $db)
+    public function loadFirstRow($table, $db)
     {
         $result = $GLOBALS['dbi']->query(
             'SELECT * FROM ' . Util::backquote($db)
@@ -198,7 +198,7 @@ class InsertEdit
      *
      * @return array Add some url parameters to $url_params array and return it
      */
-    public static function urlParamsInEditMode(array $url_params, array $where_clause_array, $where_clause)
+    public function urlParamsInEditMode(array $url_params, array $where_clause_array, $where_clause)
     {
         if (isset($where_clause)) {
             foreach ($where_clause_array as $where_clause) {
@@ -220,7 +220,7 @@ class InsertEdit
      *
      * @return string an HTML snippet
      */
-    public static function showTypeOrFunction($which, array $url_params, $is_show)
+    public function showTypeOrFunction($which, array $url_params, $is_show)
     {
         $params = array();
 
@@ -243,13 +243,13 @@ class InsertEdit
         if (! $is_show) {
             return ' : <a href="tbl_change.php'
                 . Url::getCommon($this_url_params) . '">'
-                . self::showTypeOrFunctionLabel($which)
+                . $this->showTypeOrFunctionLabel($which)
                 . '</a>';
         }
         return '<th><a href="tbl_change.php'
             . Url::getCommon($this_url_params)
             . '" title="' . __('Hide') . '">'
-            . self::showTypeOrFunctionLabel($which)
+            . $this->showTypeOrFunctionLabel($which)
             . '</a></th>';
     }
 
@@ -260,7 +260,7 @@ class InsertEdit
      *
      * @return string an HTML snippet
      */
-    public static function showTypeOrFunctionLabel($which)
+    public function showTypeOrFunctionLabel($which)
     {
         switch($which) {
         case 'function':
@@ -281,29 +281,29 @@ class InsertEdit
       *
       * @return array                   description of column in given table
       */
-    public static function analyzeTableColumnsArray(array $column, array $comments_map, $timestamp_seen)
+    public function analyzeTableColumnsArray(array $column, array $comments_map, $timestamp_seen)
     {
         $column['Field_html']    = htmlspecialchars($column['Field']);
         $column['Field_md5']     = md5($column['Field']);
         // True_Type contains only the type (stops at first bracket)
         $column['True_Type']     = preg_replace('@\(.*@s', '', $column['Type']);
         $column['len'] = preg_match('@float|double@', $column['Type']) ? 100 : -1;
-        $column['Field_title']   = self::getColumnTitle($column, $comments_map);
-        $column['is_binary']     = self::isColumn(
+        $column['Field_title']   = $this->getColumnTitle($column, $comments_map);
+        $column['is_binary']     = $this->isColumn(
             $column,
             array('binary', 'varbinary')
         );
-        $column['is_blob']       = self::isColumn(
+        $column['is_blob']       = $this->isColumn(
             $column,
             array('blob', 'tinyblob', 'mediumblob', 'longblob')
         );
-        $column['is_char']       = self::isColumn(
+        $column['is_char']       = $this->isColumn(
             $column,
             array('char', 'varchar')
         );
 
         list($column['pma_type'], $column['wrap'], $column['first_timestamp'])
-            = self::getEnumSetAndTimestampColumns($column, $timestamp_seen);
+            = $this->getEnumSetAndTimestampColumns($column, $timestamp_seen);
 
         return $column;
     }
@@ -316,7 +316,7 @@ class InsertEdit
       *
       * @return string              column title
       */
-    public static function getColumnTitle(array $column, array $comments_map)
+    public function getColumnTitle(array $column, array $comments_map)
     {
         if (isset($comments_map[$column['Field']])) {
             return '<span style="border-bottom: 1px dashed black;" title="'
@@ -337,7 +337,7 @@ class InsertEdit
       *
       * @return boolean whether the column's type if one of the $types
       */
-    public static function isColumn(array $column, array $types)
+    public function isColumn(array $column, array $types)
     {
         foreach ($types as $one_type) {
             if (mb_stripos($column['Type'], $one_type) === 0) {
@@ -355,7 +355,7 @@ class InsertEdit
      *
      * @return array $column['pma_type'], $column['wrap'], $column['first_timestamp']
      */
-    public static function getEnumSetAndTimestampColumns(array $column, $timestamp_seen)
+    public function getEnumSetAndTimestampColumns(array $column, $timestamp_seen)
     {
         $column['first_timestamp'] = false;
         switch ($column['True_Type']) {
@@ -404,7 +404,7 @@ class InsertEdit
      *
      * @return string                           an html snippet
      */
-    public static function getFunctionColumn(array $column, $is_upload, $column_name_appendix,
+    public function getFunctionColumn(array $column, $is_upload, $column_name_appendix,
         $onChangeClause, array $no_support_types, $tabindex_for_function,
         $tabindex, $idindex, $insert_mode, $readOnly, array $foreignData
     ) {
@@ -458,7 +458,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getNullColumn(array $column, $column_name_appendix, $real_null_value,
+    public function getNullColumn(array $column, $column_name_appendix, $real_null_value,
         $tabindex, $tabindex_for_null, $idindex, $vkey, array $foreigners, array $foreignData,
         $readOnly
     ) {
@@ -483,7 +483,7 @@ class InsertEdit
         $html_output .= ' id="field_' . ($idindex) . '_2" />';
 
         // nullify_code is needed by the js nullify() function
-        $nullify_code = self::getNullifyCodeForNullColumn(
+        $nullify_code = $this->getNullifyCodeForNullColumn(
             $column, $foreigners, $foreignData
         );
         // to be able to generate calls to nullify() in jQuery
@@ -507,7 +507,7 @@ class InsertEdit
      *
      * @return integer              $nullify_code
      */
-    public static function getNullifyCodeForNullColumn(array $column, array $foreigners, array $foreignData)
+    public function getNullifyCodeForNullColumn(array $column, array $foreigners, array $foreignData)
     {
         $foreigner = Relation::searchColumnInForeigners($foreigners, $column['Field']);
         if (mb_strstr($column['True_Type'], 'enum')) {
@@ -573,7 +573,7 @@ class InsertEdit
      *
      * @return string an html snippet
      */
-    public static function getValueColumn(array $column, $backup_field, $column_name_appendix,
+    public function getValueColumn(array $column, $backup_field, $column_name_appendix,
         $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
         $special_chars, array $foreignData, array $paramTableDbArray, $rownumber,
         array $titles, $text_dir, $special_chars_encoded, $vkey,
@@ -586,14 +586,14 @@ class InsertEdit
         $html_output = '';
 
         if ($foreignData['foreign_link'] == true) {
-            $html_output .= self::getForeignLink(
+            $html_output .= $this->getForeignLink(
                 $column, $backup_field, $column_name_appendix,
                 $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
                 $paramTableDbArray, $rownumber, $titles, $readOnly
             );
 
         } elseif (is_array($foreignData['disp_row'])) {
-            $html_output .= self::dispRowForeignData(
+            $html_output .= $this->dispRowForeignData(
                 $backup_field, $column_name_appendix,
                 $onChangeClause, $tabindex, $tabindex_for_value,
                 $idindex, $data, $foreignData, $readOnly
@@ -602,7 +602,7 @@ class InsertEdit
         } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
             && mb_strstr($column['pma_type'], 'longtext')
         ) {
-            $html_output .= self::getTextarea(
+            $html_output .= $this->getTextarea(
                 $column, $backup_field, $column_name_appendix, $onChangeClause,
                 $tabindex, $tabindex_for_value, $idindex, $text_dir,
                 $special_chars_encoded, $data_type, $readOnly
@@ -610,7 +610,7 @@ class InsertEdit
 
         } elseif (mb_strstr($column['pma_type'], 'text')) {
 
-            $html_output .= self::getTextarea(
+            $html_output .= $this->getTextarea(
                 $column, $backup_field, $column_name_appendix, $onChangeClause,
                 $tabindex, $tabindex_for_value, $idindex, $text_dir,
                 $special_chars_encoded, $data_type, $readOnly
@@ -624,21 +624,21 @@ class InsertEdit
             }
 
         } elseif ($column['pma_type'] == 'enum') {
-            $html_output .= self::getPmaTypeEnum(
+            $html_output .= $this->getPmaTypeEnum(
                 $column, $backup_field, $column_name_appendix, $extracted_columnspec,
                 $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
                 $readOnly
             );
 
         } elseif ($column['pma_type'] == 'set') {
-            $html_output .= self::getPmaTypeSet(
+            $html_output .= $this->getPmaTypeSet(
                 $column, $extracted_columnspec, $backup_field,
                 $column_name_appendix, $onChangeClause, $tabindex,
                 $tabindex_for_value, $idindex, $data, $readOnly
             );
 
         } elseif ($column['is_binary'] || $column['is_blob']) {
-            $html_output .= self::getBinaryAndBlobColumn(
+            $html_output .= $this->getBinaryAndBlobColumn(
                 $column, $data, $special_chars, $biggest_max_file_size,
                 $backup_field, $column_name_appendix, $onChangeClause, $tabindex,
                 $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded,
@@ -646,7 +646,7 @@ class InsertEdit
             );
 
         } elseif (! in_array($column['pma_type'], $no_support_types)) {
-            $html_output .= self::getValueColumnForOtherDatatypes(
+            $html_output .= $this->getValueColumnForOtherDatatypes(
                 $column, $default_char_editing, $backup_field,
                 $column_name_appendix, $onChangeClause, $tabindex, $special_chars,
                 $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded,
@@ -655,7 +655,7 @@ class InsertEdit
         }
 
         if (in_array($column['pma_type'], $gis_data_types)) {
-            $html_output .= self::getHtmlForGisDataTypes();
+            $html_output .= $this->getHtmlForGisDataTypes();
         }
 
         return $html_output;
@@ -681,7 +681,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getForeignLink(array $column, $backup_field, $column_name_appendix,
+    public function getForeignLink(array $column, $backup_field, $column_name_appendix,
         $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
         array $paramTableDbArray, $rownumber, array $titles, $readOnly
     ) {
@@ -729,7 +729,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function dispRowForeignData($backup_field, $column_name_appendix,
+    public function dispRowForeignData($backup_field, $column_name_appendix,
         $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
         array $foreignData, $readOnly
     ) {
@@ -779,7 +779,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getTextarea(array $column, $backup_field, $column_name_appendix,
+    public function getTextarea(array $column, $backup_field, $column_name_appendix,
         $onChangeClause, $tabindex, $tabindex_for_value, $idindex,
         $text_dir, $special_chars_encoded, $data_type, $readOnly
     ) {
@@ -841,13 +841,13 @@ class InsertEdit
      *
      * @return string an html snippet
      */
-    public static function getPmaTypeEnum(array $column, $backup_field, $column_name_appendix,
+    public function getPmaTypeEnum(array $column, $backup_field, $column_name_appendix,
         array $extracted_columnspec, $onChangeClause, $tabindex, $tabindex_for_value,
         $idindex, $data, $readOnly
     ) {
         $html_output = '';
         if (! isset($column['values'])) {
-            $column['values'] = self::getColumnEnumValues(
+            $column['values'] = $this->getColumnEnumValues(
                 $column, $extracted_columnspec
             );
         }
@@ -856,13 +856,13 @@ class InsertEdit
             . $column_name_appendix . '" value="enum" />';
         $html_output .= "\n" . '            ' . $backup_field . "\n";
         if (mb_strlen($column['Type']) > 20) {
-            $html_output .= self::getDropDownDependingOnLength(
+            $html_output .= $this->getDropDownDependingOnLength(
                 $column, $column_name_appendix, $onChangeClause,
                 $tabindex, $tabindex_for_value,
                 $idindex, $data, $column_enum_values, $readOnly
             );
         } else {
-            $html_output .= self::getRadioButtonDependingOnLength(
+            $html_output .= $this->getRadioButtonDependingOnLength(
                 $column_name_appendix, $onChangeClause,
                 $tabindex, $column, $tabindex_for_value,
                 $idindex, $data, $column_enum_values, $readOnly
@@ -881,7 +881,7 @@ class InsertEdit
      *
      * @return array column values as an associative array
      */
-    public static function getColumnEnumValues(array $column, array $extracted_columnspec)
+    public function getColumnEnumValues(array $column, array $extracted_columnspec)
     {
         $column['values'] = array();
         foreach ($extracted_columnspec['enum_set_values'] as $val) {
@@ -908,7 +908,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getDropDownDependingOnLength(
+    public function getDropDownDependingOnLength(
         array $column, $column_name_appendix, $onChangeClause,
         $tabindex, $tabindex_for_value, $idindex, $data, array $column_enum_values,
         $readOnly
@@ -960,7 +960,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getRadioButtonDependingOnLength(
+    public function getRadioButtonDependingOnLength(
         $column_name_appendix, $onChangeClause,
         $tabindex, array $column, $tabindex_for_value, $idindex, $data,
         array $column_enum_values, $readOnly
@@ -1011,12 +1011,12 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getPmaTypeSet(
+    public function getPmaTypeSet(
         array $column, array $extracted_columnspec, $backup_field,
         $column_name_appendix, $onChangeClause, $tabindex,
         $tabindex_for_value, $idindex, $data, $readOnly
     ) {
-        list($column_set_values, $select_size) = self::getColumnSetValueAndSelectSize(
+        list($column_set_values, $select_size) = $this->getColumnSetValueAndSelectSize(
             $column, $extracted_columnspec
         );
         $vset = array_flip(explode(',', $data));
@@ -1061,7 +1061,7 @@ class InsertEdit
      *
      * @return array $column['values'], $column['select_size']
      */
-    public static function getColumnSetValueAndSelectSize(array $column, array $extracted_columnspec)
+    public function getColumnSetValueAndSelectSize(array $column, array $extracted_columnspec)
     {
         if (! isset($column['values'])) {
             $column['values'] = array();
@@ -1098,7 +1098,7 @@ class InsertEdit
      *
      * @return string                           an html snippet
      */
-    public static function getBinaryAndBlobColumn(
+    public function getBinaryAndBlobColumn(
         array $column, $data, $special_chars, $biggest_max_file_size,
         $backup_field, $column_name_appendix, $onChangeClause, $tabindex,
         $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded,
@@ -1128,7 +1128,7 @@ class InsertEdit
         } elseif ($column['is_blob']
             || ($column['len'] > $GLOBALS['cfg']['LimitChars'])
         ) {
-            $html_output .= "\n" . self::getTextarea(
+            $html_output .= "\n" . $this->getTextarea(
                 $column, $backup_field, $column_name_appendix, $onChangeClause,
                 $tabindex, $tabindex_for_value, $idindex, $text_dir,
                 $special_chars_encoded, 'HEX', $readOnly
@@ -1136,7 +1136,7 @@ class InsertEdit
         } else {
             // field size should be at least 4 and max $GLOBALS['cfg']['LimitChars']
             $fieldsize = min(max($column['len'], 4), $GLOBALS['cfg']['LimitChars']);
-            $html_output .= "\n" . $backup_field . "\n" . self::getHtmlInput(
+            $html_output .= "\n" . $backup_field . "\n" . $this->getHtmlInput(
                 $column, $column_name_appendix, $special_chars, $fieldsize,
                 $onChangeClause, $tabindex, $tabindex_for_value, $idindex, 'HEX',
                 $readOnly
@@ -1153,14 +1153,14 @@ class InsertEdit
                 . ' name="fields_upload' . $vkey . '[' . $column['Field_md5'] . ']"'
                 . ' class="textfield noDragDrop" id="field_' . $idindex . '_3" size="10"'
                 . ' ' . $onChangeClause . '/>&nbsp;';
-            list($html_out,) = self::getMaxUploadSize(
+            list($html_out,) = $this->getMaxUploadSize(
                 $column, $biggest_max_file_size
             );
             $html_output .= $html_out;
         }
 
         if (!empty($GLOBALS['cfg']['UploadDir']) && !$readOnly) {
-            $html_output .= self::getSelectOptionForUpload($vkey, $column);
+            $html_output .= $this->getSelectOptionForUpload($vkey, $column);
         }
 
         return $html_output;
@@ -1182,7 +1182,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getHtmlInput(
+    public function getHtmlInput(
         array $column, $column_name_appendix, $special_chars, $fieldsize, $onChangeClause,
         $tabindex, $tabindex_for_value, $idindex, $data_type, $readOnly
     ) {
@@ -1239,7 +1239,7 @@ class InsertEdit
      *
      * @return string|void an html snippet
      */
-    public static function getSelectOptionForUpload($vkey, array $column)
+    public function getSelectOptionForUpload($vkey, array $column)
     {
         $files = FileListing::getFileSelectOptions(
             Util::userDir($GLOBALS['cfg']['UploadDir'])
@@ -1270,7 +1270,7 @@ class InsertEdit
      *
      * @return array an html snippet and $biggest_max_file_size
      */
-    public static function getMaxUploadSize(array $column, $biggest_max_file_size)
+    public function getMaxUploadSize(array $column, $biggest_max_file_size)
     {
         // find maximum upload size, based on field type
         /**
@@ -1326,7 +1326,7 @@ class InsertEdit
      *
      * @return string an html snippet
      */
-    public static function getValueColumnForOtherDatatypes(array $column, $default_char_editing,
+    public function getValueColumnForOtherDatatypes(array $column, $default_char_editing,
         $backup_field,
         $column_name_appendix, $onChangeClause, $tabindex, $special_chars,
         $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded, $data,
@@ -1334,7 +1334,7 @@ class InsertEdit
     ) {
         // HTML5 data-* attribute data-type
         $data_type = $GLOBALS['dbi']->types->getTypeClass($column['True_Type']);
-        $fieldsize = self::getColumnSize($column, $extracted_columnspec);
+        $fieldsize = $this->getColumnSize($column, $extracted_columnspec);
         $html_output = $backup_field . "\n";
         if ($column['is_char']
             && ($GLOBALS['cfg']['CharEditing'] == 'textarea'
@@ -1342,13 +1342,13 @@ class InsertEdit
         ) {
             $html_output .= "\n";
             $GLOBALS['cfg']['CharEditing'] = $default_char_editing;
-            $html_output .= self::getTextarea(
+            $html_output .= $this->getTextarea(
                 $column, $backup_field, $column_name_appendix, $onChangeClause,
                 $tabindex, $tabindex_for_value, $idindex, $text_dir,
                 $special_chars_encoded, $data_type, $readOnly
             );
         } else {
-            $html_output .= self::getHtmlInput(
+            $html_output .= $this->getHtmlInput(
                 $column, $column_name_appendix, $special_chars, $fieldsize,
                 $onChangeClause, $tabindex, $tabindex_for_value, $idindex,
                 $data_type, $readOnly
@@ -1399,7 +1399,7 @@ class InsertEdit
      *
      * @return integer      field size
      */
-    public static function getColumnSize(array $column, array $extracted_columnspec)
+    public function getColumnSize(array $column, array $extracted_columnspec)
     {
         if ($column['is_char']) {
             $fieldsize = $extracted_columnspec['spec_in_brackets'];
@@ -1429,7 +1429,7 @@ class InsertEdit
      *
      * @return string an html snippet
      */
-    public static function getHtmlForGisDataTypes()
+    public function getHtmlForGisDataTypes()
     {
         $edit_str = Util::getIcon('b_edit', __('Edit/Insert'));
         return '<span class="open_gis_editor">'
@@ -1449,7 +1449,7 @@ class InsertEdit
      *
      * @return string                   an html snippet
      */
-    public static function getContinueInsertionForm(
+    public function getContinueInsertionForm(
         $table,
         $db,
         array $where_clause_array,
@@ -1478,14 +1478,14 @@ class InsertEdit
      *
      * @return string an html snippet
      */
-    public static function getActionsPanel($where_clause, $after_insert, $tabindex,
+    public function getActionsPanel($where_clause, $after_insert, $tabindex,
         $tabindex_for_value, $found_unique_key
     ) {
         $html_output = '<fieldset id="actions_panel">'
             . '<table cellpadding="5" cellspacing="0" class="tdblock width100">'
             . '<tr>'
             . '<td class="nowrap vmiddle">'
-            . self::getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
+            . $this->getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
             . "\n";
 
         $html_output .= '</td>'
@@ -1494,13 +1494,13 @@ class InsertEdit
             . __('and then') . '</strong>&nbsp;&nbsp;&nbsp;'
             . '</td>'
             . '<td class="nowrap vmiddle">'
-            . self::getAfterInsertDropDown(
+            . $this->getAfterInsertDropDown(
                 $where_clause, $after_insert, $found_unique_key
             )
             . '</td>'
             . '</tr>';
         $html_output .='<tr>'
-            . self::getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
+            . $this->getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
             . '</tr>'
             . '</table>'
             . '</fieldset>';
@@ -1516,7 +1516,7 @@ class InsertEdit
      *
      * @return string                       an html snippet
      */
-    public static function getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
+    public function getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
     {
         $html_output = '<select name="submit_type" class="control_at_footer" tabindex="'
             . ($tabindex + $tabindex_for_value + 1) . '">';
@@ -1545,7 +1545,7 @@ class InsertEdit
      *
      * @return string                   an html snippet
      */
-    public static function getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key)
+    public function getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key)
     {
         $html_output = '<select name="after_insert" class="control_at_footer">'
             . '<option value="back" '
@@ -1598,7 +1598,7 @@ class InsertEdit
      *
      * @return string an html snippet
      */
-    public static function getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
+    public function getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
     {
         return '<td>'
         . Util::showHint(
@@ -1625,7 +1625,7 @@ class InsertEdit
      *
      * @return string           an html snippet
      */
-    public static function getHeadAndFootOfInsertRowTable(array $url_params)
+    public function getHeadAndFootOfInsertRowTable(array $url_params)
     {
         $html_output = '<div class="responsivetable">'
             . '<table class="insertRowTable topmargin">'
@@ -1634,10 +1634,10 @@ class InsertEdit
             . '<th>' . __('Column') . '</th>';
 
         if ($GLOBALS['cfg']['ShowFieldTypesInDataEditView']) {
-            $html_output .= self::showTypeOrFunction('type', $url_params, true);
+            $html_output .= $this->showTypeOrFunction('type', $url_params, true);
         }
         if ($GLOBALS['cfg']['ShowFunctionFields']) {
-            $html_output .= self::showTypeOrFunction('function', $url_params, true);
+            $html_output .= $this->showTypeOrFunction('function', $url_params, true);
         }
 
         $html_output .= '<th>' . __('Null') . '</th>'
@@ -1670,7 +1670,7 @@ class InsertEdit
      * @return array $real_null_value, $data, $special_chars, $backup_field,
      *               $special_chars_encoded
      */
-    public static function getSpecialCharsAndBackupFieldForExistingRow(
+    public function getSpecialCharsAndBackupFieldForExistingRow(
         array $current_row, array $column, array $extracted_columnspec,
         $real_null_value, array $gis_data_types, $column_name_appendix, $as_is
     ) {
@@ -1766,7 +1766,7 @@ class InsertEdit
      * @return array $real_null_value, $data, $special_chars,
      *               $backup_field, $special_chars_encoded
      */
-    public static function getSpecialCharsAndBackupFieldForInsertingMode(
+    public function getSpecialCharsAndBackupFieldForInsertingMode(
         array $column, $real_null_value
     ) {
         if (! isset($column['Default'])) {
@@ -1808,7 +1808,7 @@ class InsertEdit
      *
      * @return array     $loop_array, $using_key, $is_insert, $is_insertignore
      */
-    public static function getParamsForUpdateOrInsert()
+    public function getParamsForUpdateOrInsert()
     {
         if (isset($_REQUEST['where_clause'])) {
             // we were editing something => use the WHERE clause
@@ -1842,7 +1842,7 @@ class InsertEdit
      *
      * @return void
      */
-    public static function isInsertRow()
+    public function isInsertRow()
     {
         if (isset($_REQUEST['insert_rows'])
             && is_numeric($_REQUEST['insert_rows'])
@@ -1868,7 +1868,7 @@ class InsertEdit
      *
      * @return void
      */
-    public static function setSessionForEditNext($one_where_clause)
+    public function setSessionForEditNext($one_where_clause)
     {
         $local_query = 'SELECT * FROM ' . Util::backquote($GLOBALS['db'])
             . '.' . Util::backquote($GLOBALS['table']) . ' WHERE '
@@ -1905,7 +1905,7 @@ class InsertEdit
      *
      * @return string               $goto_include
      */
-    public static function getGotoInclude($goto_include)
+    public function getGotoInclude($goto_include)
     {
         $valid_options = array('new_insert', 'same_insert', 'edit_next');
         if (isset($_REQUEST['after_insert'])
@@ -1941,7 +1941,7 @@ class InsertEdit
      *
      * @return string           error url for query failure
      */
-    public static function getErrorUrl(array $url_params)
+    public function getErrorUrl(array $url_params)
     {
         if (isset($_REQUEST['err_url'])) {
             return $_REQUEST['err_url'];
@@ -1959,7 +1959,7 @@ class InsertEdit
      *
      * @return array of query
      */
-    public static function buildSqlQuery($is_insertignore, array $query_fields, array $value_sets)
+    public function buildSqlQuery($is_insertignore, array $query_fields, array $value_sets)
     {
         if ($is_insertignore) {
             $insert_command = 'INSERT IGNORE ';
@@ -1980,12 +1980,12 @@ class InsertEdit
      * Executes the sql query and get the result, then move back to the calling page
      *
      * @param array $url_params url parameters array
-     * @param array $query      built query from self::buildSqlQuery()
+     * @param array $query      built query from buildSqlQuery()
      *
      * @return array            $url_params, $total_affected_rows, $last_messages
      *                          $warning_messages, $error_messages, $return_to_sql_query
      */
-    public static function executeSqlQuery(array $url_params, array $query)
+    public function executeSqlQuery(array $url_params, array $query)
     {
         $return_to_sql_query = '';
         if (! empty($GLOBALS['sql_query'])) {
@@ -2035,7 +2035,7 @@ class InsertEdit
                 }
                 $GLOBALS['dbi']->freeResult($result);
             }
-            $warning_messages = self::getWarningMessages();
+            $warning_messages = $this->getWarningMessages();
         }
         return array(
             $url_params,
@@ -2052,7 +2052,7 @@ class InsertEdit
      *
      * @return array  $warning_essages
      */
-    public static function getWarningMessages()
+    public function getWarningMessages()
     {
         $warning_essages = array();
         foreach ($GLOBALS['dbi']->getWarnings() as $warning) {
@@ -2073,7 +2073,7 @@ class InsertEdit
      *
      * @return string $dispval display value from the foreign table
      */
-    public static function getDisplayValueForForeignTableColumn($where_comparison,
+    public function getDisplayValueForForeignTableColumn($where_comparison,
         array $map, $relation_field
     ) {
         $foreigner = Relation::searchColumnInForeigners($map, $relation_field);
@@ -2118,7 +2118,7 @@ class InsertEdit
      *
      * @return string $output HTML <a> tag
      */
-    public static function getLinkForRelationalDisplayField(array $map, $relation_field,
+    public function getLinkForRelationalDisplayField(array $map, $relation_field,
         $where_comparison, $dispval, $relation_field_value
     ) {
         $foreigner = Relation::searchColumnInForeigners($map, $relation_field);
@@ -2171,7 +2171,7 @@ class InsertEdit
      *
      * @return array $extra_data
      */
-    public static function transformEditedValues($db, $table,
+    public function transformEditedValues($db, $table,
         array $transformation, array &$edited_values, $file, $column_name, array $extra_data, $type
     ) {
         $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
@@ -2222,7 +2222,7 @@ class InsertEdit
      *
      * @return array $cur_value
      */
-    public static function getCurrentValueAsAnArrayForMultipleEdit($multi_edit_funcs,
+    public function getCurrentValueAsAnArrayForMultipleEdit($multi_edit_funcs,
         $multi_edit_salt,
         $gis_from_text_functions, $current_value, $gis_from_wkb_functions,
         $func_optional_param, $func_no_param, $key
@@ -2284,7 +2284,7 @@ class InsertEdit
      *
      * @return array ($query_values, $query_fields)
      */
-    public static function getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_name,
+    public function getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_name,
         $multi_edit_columns_null, $current_value, $multi_edit_columns_prev,
         $multi_edit_funcs, $is_insert, $query_values, $query_fields,
         $current_value_as_an_array, $value_sets, $key, $multi_edit_columns_null_prev
@@ -2353,7 +2353,7 @@ class InsertEdit
      *
      * @return string $current_value  current column value in the form
      */
-    public static function getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
+    public function getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
         $multi_edit_columns_type, $current_value, $multi_edit_auto_increment,
         $rownumber, $multi_edit_columns_name, $multi_edit_columns_null,
         $multi_edit_columns_null_prev, $is_insert, $using_key, $where_clause, $table,
@@ -2464,7 +2464,7 @@ class InsertEdit
      *
      * @return void
      */
-    public static function verifyWhetherValueCanBeTruncatedAndAppendExtraData(
+    public function verifyWhetherValueCanBeTruncatedAndAppendExtraData(
         $db, $table, $column_name, array &$extra_data
     ) {
         $extra_data['isNeedToRecheck'] = false;
@@ -2502,7 +2502,7 @@ class InsertEdit
      *
      * @return array
      */
-    public static function getTableColumns($db, $table)
+    public function getTableColumns($db, $table)
     {
         $GLOBALS['dbi']->selectDb($db);
         return array_values($GLOBALS['dbi']->getColumns($db, $table, null, true));
@@ -2517,7 +2517,7 @@ class InsertEdit
      *
      * @return mixed
      */
-    public static function determineInsertOrEdit($where_clause, $db, $table)
+    public function determineInsertOrEdit($where_clause, $db, $table)
     {
         if (isset($_REQUEST['where_clause'])) {
             $where_clause = $_REQUEST['where_clause'];
@@ -2541,16 +2541,16 @@ class InsertEdit
         if (isset($where_clause)) {
             // we are editing
             $insert_mode = false;
-            $where_clause_array = self::getWhereClauseArray($where_clause);
+            $where_clause_array = $this->getWhereClauseArray($where_clause);
             list($where_clauses, $result, $rows, $found_unique_key)
-                = self::analyzeWhereClauses(
+                = $this->analyzeWhereClauses(
                     $where_clause_array, $table, $db
                 );
         } else {
             // we are inserting
             $insert_mode = true;
             $where_clause = null;
-            list($result, $rows) = self::loadFirstRow($table, $db);
+            list($result, $rows) = $this->loadFirstRow($table, $db);
             $where_clauses = null;
             $where_clause_array = array();
             $found_unique_key = false;
@@ -2579,7 +2579,7 @@ class InsertEdit
      *
      * @return array $comments_map comments for columns
      */
-    public static function getCommentsMap($db, $table)
+    public function getCommentsMap($db, $table)
     {
         $comments_map = array();
 
@@ -2598,7 +2598,7 @@ class InsertEdit
      *
      * @return array $url_params url parameters
      */
-    public static function getUrlParameters($db, $table)
+    public function getUrlParameters($db, $table)
     {
         /**
          * @todo check if we could replace by "db_|tbl_" - please clarify!?
@@ -2620,7 +2620,7 @@ class InsertEdit
      *
      * @return string
      */
-    public static function getHtmlForGisEditor()
+    public function getHtmlForGisEditor()
     {
         return '<div id="gis_editor"></div>'
             . '<div id="popup_background"></div>'
@@ -2635,7 +2635,7 @@ class InsertEdit
      *
      * @return string
      */
-    public static function getHtmlForIgnoreOption($row_id, $checked = true)
+    public function getHtmlForIgnoreOption($row_id, $checked = true)
     {
         return '<input type="checkbox"'
                 . ($checked ? ' checked="checked"' : '')
@@ -2654,7 +2654,7 @@ class InsertEdit
      *
      * @return String
      */
-    public static function getHtmlForFunctionOption(array $column, $column_name_appendix)
+    public function getHtmlForFunctionOption(array $column, $column_name_appendix)
     {
         return '<tr class="noclick">'
             . '<td '
@@ -2673,7 +2673,7 @@ class InsertEdit
      *
      * @return string
      */
-    public static function getHtmlForInsertEditColumnType(array $column)
+    public function getHtmlForInsertEditColumnType(array $column)
     {
         return '<td class="center' . $column['wrap'] . '">'
             . '<span class="column_type" dir="ltr">' . $column['pma_type'] . '</span>'
@@ -2688,7 +2688,7 @@ class InsertEdit
      *
      * @return string
      */
-    public static function getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
+    public function getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
     {
         $html_output ='<form id="insertForm" class="lock-page ';
         if ($has_blob_field && $is_upload) {
@@ -2738,7 +2738,7 @@ class InsertEdit
      *
      * @return string
      */
-    public static function getHtmlForInsertEditFormColumn(array $table_columns, $column_number,
+    public function getHtmlForInsertEditFormColumn(array $table_columns, $column_number,
         array $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
         $jsvkey, $vkey, $insert_mode, array $current_row, &$o_rows,
         &$tabindex, $columns_cnt, $is_upload, $tabindex_for_function,
@@ -2748,12 +2748,12 @@ class InsertEdit
     ) {
         $column = $table_columns[$column_number];
         $readOnly = false;
-        if (! self::userHasColumnPrivileges($column, $insert_mode)) {
+        if (! $this->userHasColumnPrivileges($column, $insert_mode)) {
             $readOnly = true;
         }
 
         if (! isset($column['processed'])) {
-            $column = self::analyzeTableColumnsArray(
+            $column = $this->analyzeTableColumnsArray(
                 $column, $comments_map, $timestamp_seen
             );
         }
@@ -2794,12 +2794,12 @@ class InsertEdit
             $column['Default'] = date('Y-m-d H:i:s', time());
         }
 
-        $html_output = self::getHtmlForFunctionOption(
+        $html_output = $this->getHtmlForFunctionOption(
             $column, $column_name_appendix
         );
 
         if ($GLOBALS['cfg']['ShowFieldTypesInDataEditView']) {
-            $html_output .= self::getHtmlForInsertEditColumnType($column);
+            $html_output .= $this->getHtmlForInsertEditColumnType($column);
         } //End if
 
         // Get a list of GIS data types.
@@ -2814,7 +2814,7 @@ class InsertEdit
                 $real_null_value, $special_chars_encoded, $special_chars,
                 $data, $backup_field
             )
-                = self::getSpecialCharsAndBackupFieldForExistingRow(
+                = $this->getSpecialCharsAndBackupFieldForExistingRow(
                     $current_row, $column, $extracted_columnspec,
                     $real_null_value, $gis_data_types, $column_name_appendix, $as_is
                 );
@@ -2828,7 +2828,7 @@ class InsertEdit
             list($real_null_value, $data, $special_chars, $backup_field,
                 $special_chars_encoded
             )
-                = self::getSpecialCharsAndBackupFieldForInsertingMode(
+                = $this->getSpecialCharsAndBackupFieldForInsertingMode(
                     $tmp, $real_null_value
                 );
             unset($tmp);
@@ -2846,7 +2846,7 @@ class InsertEdit
             $foreigners, $column['Field'], false, '', ''
         );
         if ($GLOBALS['cfg']['ShowFunctionFields']) {
-            $html_output .= self::getFunctionColumn(
+            $html_output .= $this->getFunctionColumn(
                 $column, $is_upload, $column_name_appendix,
                 $onChangeClause, $no_support_types, $tabindex_for_function,
                 $tabindex, $idindex, $insert_mode, $readOnly, $foreignData
@@ -2855,7 +2855,7 @@ class InsertEdit
 
         // The null column
         // ---------------
-        $html_output .= self::getNullColumn(
+        $html_output .= $this->getNullColumn(
             $column, $column_name_appendix, $real_null_value,
             $tabindex, $tabindex_for_null, $idindex, $vkey, $foreigners,
             $foreignData, $readOnly
@@ -2921,7 +2921,7 @@ class InsertEdit
         if (!empty($transformed_html)) {
             $html_output .= $transformed_html;
         } else {
-            $html_output .= self::getValueColumn(
+            $html_output .= $this->getValueColumn(
                 $column, $backup_field, $column_name_appendix, $onChangeClause,
                 $tabindex, $tabindex_for_value, $idindex, $data, $special_chars,
                 $foreignData, array($table, $db), $row_id, $titles,
@@ -2965,14 +2965,14 @@ class InsertEdit
      *
      * @return string
      */
-    public static function getHtmlForInsertEditRow(array $url_params, array $table_columns,
+    public function getHtmlForInsertEditRow(array $url_params, array $table_columns,
         array $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
         $jsvkey, $vkey, $insert_mode, array $current_row, &$o_rows, &$tabindex, $columns_cnt,
         $is_upload, $tabindex_for_function, array $foreigners, $tabindex_for_null,
         $tabindex_for_value, $table, $db, $row_id, array $titles,
         $biggest_max_file_size, $text_dir, array $repopulate, array $where_clause_array
     ) {
-        $html_output = self::getHeadAndFootOfInsertRowTable($url_params)
+        $html_output = $this->getHeadAndFootOfInsertRowTable($url_params)
             . '<tbody>';
 
         //store the default value for CharEditing
@@ -2988,7 +2988,7 @@ class InsertEdit
             if (isset($mime_map[$table_column['Field']])) {
                 $column_mime = $mime_map[$table_column['Field']];
             }
-            $html_output .= self::getHtmlForInsertEditFormColumn(
+            $html_output .= $this->getHtmlForInsertEditFormColumn(
                 $table_columns, $column_number, $comments_map, $timestamp_seen,
                 $current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
                 $current_row, $o_rows, $tabindex, $columns_cnt, $is_upload,
@@ -3014,7 +3014,7 @@ class InsertEdit
      *
      * @return boolean whether user has necessary privileges
      */
-    public static function userHasColumnPrivileges(array $table_column, $insert_mode)
+    public function userHasColumnPrivileges(array $table_column, $insert_mode)
     {
         $privileges = $table_column['Privileges'];
         return ($insert_mode && strstr($privileges, 'insert') !== false)
diff --git a/tbl_change.php b/tbl_change.php
index 1d5428f983..6ffdaeffad 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -24,13 +24,15 @@ PageSettings::showGroup('Edit');
  */
 require_once 'libraries/db_table_exists.inc.php';
 
+$insertEdit = new InsertEdit();
+
 /**
  * Determine whether Insert or Edit and set global variables
  */
 list(
     $insert_mode, $where_clause, $where_clause_array, $where_clauses,
     $result, $rows, $found_unique_key, $after_insert
-) = InsertEdit::determineInsertOrEdit(
+) = $insertEdit->determineInsertOrEdit(
     isset($where_clause) ? $where_clause : null, $db, $table
 );
 // Increase number of rows if unsaved rows are more
@@ -52,11 +54,11 @@ if (empty($GLOBALS['goto'])) {
 }
 
 
-$_url_params = InsertEdit::getUrlParameters($db, $table);
+$_url_params = $insertEdit->getUrlParameters($db, $table);
 $err_url = $GLOBALS['goto'] . Url::getCommon($_url_params);
 unset($_url_params);
 
-$comments_map = InsertEdit::getCommentsMap($db, $table);
+$comments_map = $insertEdit->getCommentsMap($db, $table);
 
 /**
  * START REGULAR OUTPUT
@@ -82,13 +84,13 @@ if (! empty($disp_message)) {
     $response->addHTML(Util::getMessage($disp_message, null));
 }
 
-$table_columns = InsertEdit::getTableColumns($db, $table);
+$table_columns = $insertEdit->getTableColumns($db, $table);
 
 // retrieve keys into foreign fields, if any
 $foreigners = Relation::getForeigners($db, $table);
 
 // Retrieve form parameters for insert/edit form
-$_form_params = InsertEdit::getFormParametersForInsertForm(
+$_form_params = $insertEdit->getFormParametersForInsertForm(
     $db, $table, $where_clauses, $where_clause_array, $err_url
 );
 
@@ -115,13 +117,13 @@ $biggest_max_file_size = 0;
 
 $url_params['db'] = $db;
 $url_params['table'] = $table;
-$url_params = InsertEdit::urlParamsInEditMode(
+$url_params = $insertEdit->urlParamsInEditMode(
     $url_params, $where_clause_array, $where_clause
 );
 
 $has_blob_field = false;
 foreach ($table_columns as $column) {
-    if (InsertEdit::isColumn(
+    if ($insertEdit->isColumn(
         $column,
         array('blob', 'tinyblob', 'mediumblob', 'longblob')
     )) {
@@ -132,7 +134,7 @@ foreach ($table_columns as $column) {
 
 //Insert/Edit form
 //If table has blob fields we have to disable ajax.
-$html_output .= InsertEdit::getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
+$html_output .= $insertEdit->getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
 
 $html_output .= Url::getHiddenInputs($_form_params);
 
@@ -145,11 +147,11 @@ if (! $cfg['ShowFunctionFields'] || ! $cfg['ShowFieldTypesInDataEditView']) {
 }
 
 if (! $cfg['ShowFunctionFields']) {
-    $html_output .= InsertEdit::showTypeOrFunction('function', $url_params, false);
+    $html_output .= $insertEdit->showTypeOrFunction('function', $url_params, false);
 }
 
 if (! $cfg['ShowFieldTypesInDataEditView']) {
-    $html_output .= InsertEdit::showTypeOrFunction('type', $url_params, false);
+    $html_output .= $insertEdit->showTypeOrFunction('type', $url_params, false);
 }
 
 $GLOBALS['plugin_scripts'] = array();
@@ -171,10 +173,10 @@ foreach ($rows as $row_id => $current_row) {
         $checked = false;
     }
     if ($insert_mode && $row_id > 0) {
-        $html_output .= InsertEdit::getHtmlForIgnoreOption($row_id, $checked);
+        $html_output .= $insertEdit->getHtmlForIgnoreOption($row_id, $checked);
     }
 
-    $html_output .= InsertEdit::getHtmlForInsertEditRow(
+    $html_output .= $insertEdit->getHtmlForInsertEditRow(
         $url_params, $table_columns, $comments_map, $timestamp_seen,
         $current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
         $current_row, $o_rows, $tabindex, $columns_cnt,
@@ -191,7 +193,7 @@ if (! isset($after_insert)) {
 }
 
 //action panel
-$html_output .= InsertEdit::getActionsPanel(
+$html_output .= $insertEdit->getActionsPanel(
     $where_clause, $after_insert, $tabindex,
     $tabindex_for_value, $found_unique_key
 );
@@ -204,12 +206,12 @@ if ($biggest_max_file_size > 0) {
 }
 $html_output .= '</form>';
 
-$html_output .= InsertEdit::getHtmlForGisEditor();
+$html_output .= $insertEdit->getHtmlForGisEditor();
 // end Insert/Edit form
 
 if ($insert_mode) {
     //Continue insertion form
-    $html_output .= InsertEdit::getContinueInsertionForm(
+    $html_output .= $insertEdit->getContinueInsertionForm(
         $table, $db, $where_clause_array, $err_url
     );
 }
diff --git a/tbl_replace.php b/tbl_replace.php
index e45d2b2e93..7108ba5919 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -13,12 +13,15 @@
  */
 
 use PhpMyAdmin\Core;
+use PhpMyAdmin\File;
 use PhpMyAdmin\InsertEdit;
+use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins\IOTransformationsPlugin;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 /**
  * Gets some core libraries
@@ -26,7 +29,7 @@ use PhpMyAdmin\Transformations;
 require_once 'libraries/common.inc.php';
 
 // Check parameters
-PhpMyAdmin\Util::checkParameters(array('db', 'table', 'goto'));
+Util::checkParameters(array('db', 'table', 'goto'));
 
 $GLOBALS['dbi']->selectDb($GLOBALS['db']);
 
@@ -44,8 +47,10 @@ $scripts->addFile('sql.js');
 $scripts->addFile('indexes.js');
 $scripts->addFile('gis_data_editor.js');
 
+$insertEdit = new InsertEdit();
+
 // check whether insert row mode, if so include tbl_change.php
-InsertEdit::isInsertRow();
+$insertEdit->isInsertRow();
 
 $after_insert_actions = array('new_insert', 'same_insert', 'edit_next');
 if (isset($_REQUEST['after_insert'])
@@ -57,22 +62,22 @@ if (isset($_REQUEST['after_insert'])
             if ($_REQUEST['after_insert'] == 'same_insert') {
                 $url_params['where_clause'][] = $one_where_clause;
             } elseif ($_REQUEST['after_insert'] == 'edit_next') {
-                InsertEdit::setSessionForEditNext($one_where_clause);
+                $insertEdit->setSessionForEditNext($one_where_clause);
             }
         }
     }
 }
 //get $goto_include for different cases
-$goto_include = InsertEdit::getGotoInclude($goto_include);
+$goto_include = $insertEdit->getGotoInclude($goto_include);
 
 // Defines the url to return in case of failure of the query
-$err_url = InsertEdit::getErrorUrl($url_params);
+$err_url = $insertEdit->getErrorUrl($url_params);
 
 /**
  * Prepares the update/insert of a row
  */
 list($loop_array, $using_key, $is_insert, $is_insertignore)
-    = InsertEdit::getParamsForUpdateOrInsert();
+    = $insertEdit->getParamsForUpdateOrInsert();
 
 $query = array();
 $value_sets = array();
@@ -203,7 +208,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
         // Note: $key is an md5 of the fieldname. The actual fieldname is
         // available in $multi_edit_columns_name[$key]
 
-        $file_to_insert = new PhpMyAdmin\File();
+        $file_to_insert = new File();
         $file_to_insert->checkTblChangeForm($key, $rownumber);
 
         $possibly_uploaded_val = $file_to_insert->getContent();
@@ -249,7 +254,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
         // delete $file_to_insert temporary variable
         $file_to_insert->cleanUp();
 
-        $current_value = InsertEdit::getCurrentValueForDifferentTypes(
+        $current_value = $insertEdit->getCurrentValueForDifferentTypes(
             $possibly_uploaded_val, $key, $multi_edit_columns_type,
             $current_value, $multi_edit_auto_increment,
             $rownumber, $multi_edit_columns_name, $multi_edit_columns_null,
@@ -257,7 +262,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
             $using_key, $where_clause, $table, $multi_edit_funcs
         );
 
-        $current_value_as_an_array = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
+        $current_value_as_an_array = $insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
             $multi_edit_funcs,
             $multi_edit_salt, $gis_from_text_functions, $current_value,
             $gis_from_wkb_functions, $func_optional_param, $func_no_param, $key
@@ -265,7 +270,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
 
         if (! isset($multi_edit_virtual) || ! isset($multi_edit_virtual[$key])) {
             list($query_values, $query_fields)
-                = InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit(
+                = $insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
                     $multi_edit_columns_name, $multi_edit_columns_null,
                     $current_value, $multi_edit_columns_prev, $multi_edit_funcs,
                     $is_insert, $query_values, $query_fields,
@@ -288,7 +293,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
             $value_sets[] = implode(', ', $query_values);
         } else {
             // build update query
-            $query[] = 'UPDATE ' . PhpMyAdmin\Util::backquote($GLOBALS['table'])
+            $query[] = 'UPDATE ' . Util::backquote($GLOBALS['table'])
                 . ' SET ' . implode(', ', $query_values)
                 . ' WHERE ' . $where_clause
                 . ($_REQUEST['clause_is_unique'] ? '' : ' LIMIT 1');
@@ -305,12 +310,12 @@ unset(
 
 // Builds the sql query
 if ($is_insert && count($value_sets) > 0) {
-    $query = InsertEdit::buildSqlQuery($is_insertignore, $query_fields, $value_sets);
+    $query = $insertEdit->buildSqlQuery($is_insertignore, $query_fields, $value_sets);
 } elseif (empty($query) && ! isset($_REQUEST['preview_sql']) && !$row_skipped) {
     // No change -> move back to the calling script
     //
     // Note: logic passes here for inline edit
-    $message = PhpMyAdmin\Message::success(__('No change'));
+    $message = Message::success(__('No change'));
     // Avoid infinite recursion
     if ($goto_include == 'tbl_replace.php') {
         $goto_include = 'tbl_change.php';
@@ -332,15 +337,15 @@ if (isset($_REQUEST['preview_sql'])) {
  */
 list ($url_params, $total_affected_rows, $last_messages, $warning_messages,
     $error_messages, $return_to_sql_query)
-        = InsertEdit::executeSqlQuery($url_params, $query);
+        = $insertEdit->executeSqlQuery($url_params, $query);
 
 if ($is_insert && (count($value_sets) > 0 || $row_skipped)) {
-    $message = PhpMyAdmin\Message::getMessageForInsertedRows(
+    $message = Message::getMessageForInsertedRows(
         $total_affected_rows
     );
     $unsaved_values = array_values($unsaved_values);
 } else {
-    $message = PhpMyAdmin\Message::getMessageForAffectedRows(
+    $message = Message::getMessageForAffectedRows(
         $total_affected_rows
     );
 }
@@ -389,12 +394,12 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
         foreach ($relation_fields as $cell_index => $curr_rel_field) {
             foreach ($curr_rel_field as $relation_field => $relation_field_value) {
                 $where_comparison = "='" . $relation_field_value . "'";
-                $dispval = InsertEdit::getDisplayValueForForeignTableColumn(
+                $dispval = $insertEdit->getDisplayValueForForeignTableColumn(
                     $where_comparison, $map, $relation_field
                 );
 
                 $extra_data['relations'][$cell_index]
-                    = InsertEdit::getLinkForRelationalDisplayField(
+                    = $insertEdit->getLinkForRelationalDisplayField(
                         $map, $relation_field, $where_comparison,
                         $dispval, $relation_field_value
                     );
@@ -418,7 +423,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
             $column_name = $transformation['column_name'];
             foreach ($transformation_types as $type) {
                 $file = Core::securePath($transformation[$type]);
-                $extra_data = InsertEdit::transformEditedValues(
+                $extra_data = $insertEdit->transformEditedValues(
                     $db, $table, $transformation, $edited_values, $file,
                     $column_name, $extra_data, $type
                 );
@@ -430,7 +435,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
     // without informing while saving
     $column_name = $_REQUEST['fields_name']['multi_edit'][0][0];
 
-    InsertEdit::verifyWhetherValueCanBeTruncatedAndAppendExtraData(
+    $insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData(
         $db, $table, $column_name, $extra_data
     );
 
@@ -438,8 +443,10 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
     $_table = new Table($_REQUEST['table'], $_REQUEST['db']);
     $extra_data['row_count'] = $_table->countRecords();
 
-    $extra_data['sql_query']
-        = PhpMyAdmin\Util::getMessage($message, $GLOBALS['display_query']);
+    $extra_data['sql_query'] = Util::getMessage(
+        $message,
+        $GLOBALS['display_query']
+    );
 
     $response->setRequestStatus($message->isSuccess());
     $response->addJSON('message', $message);
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 23b3dc5a4d..b2a622d0df 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -24,6 +24,8 @@ use stdClass;
  */
 class InsertEditTest extends TestCase
 {
+    private $insertEdit;
+
     /**
      * Setup for test cases
      *
@@ -58,10 +60,12 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['Confirm'] = true;
         $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
         $GLOBALS['PMA_Config'] = new Config();
+
+        $this->insertEdit = new InsertEdit();
     }
 
     /**
-     * Test for InsertEdit::getFormParametersForInsertForm
+     * Test for getFormParametersForInsertForm
      *
      * @return void
      */
@@ -72,7 +76,7 @@ class InsertEditTest extends TestCase
         $_POST['sql_query'] = 'SELECT a';
         $GLOBALS['goto'] = 'index.php';
 
-        $result = InsertEdit::getFormParametersForInsertForm(
+        $result = $this->insertEdit->getFormParametersForInsertForm(
             'dbname', 'tablename', array(), $where_clause, 'localhost'
         );
 
@@ -92,7 +96,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getWhereClauseArray
+     * Test for getWhereClauseArray
      *
      * @return void
      */
@@ -100,22 +104,22 @@ class InsertEditTest extends TestCase
     {
         $this->assertEquals(
             array(),
-            InsertEdit::getWhereClauseArray(null)
+            $this->insertEdit->getWhereClauseArray(null)
         );
 
         $this->assertEquals(
             array(1, 2, 3),
-            InsertEdit::getWhereClauseArray(array(1, 2, 3))
+            $this->insertEdit->getWhereClauseArray(array(1, 2, 3))
         );
 
         $this->assertEquals(
             array('clause'),
-            InsertEdit::getWhereClauseArray('clause')
+            $this->insertEdit->getWhereClauseArray('clause')
         );
     }
 
     /**
-     * Test for InsertEdit::analyzeWhereClauses
+     * Test for analyzeWhereClauses
      *
      * @return void
      */
@@ -149,7 +153,7 @@ class InsertEditTest extends TestCase
             );
 
         $GLOBALS['dbi'] = $dbi;
-        $result = InsertEdit::analyzeWhereClauses($clauses, 'table', 'db');
+        $result = $this->insertEdit->analyzeWhereClauses($clauses, 'table', 'db');
 
         $this->assertEquals(
             array(
@@ -166,7 +170,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::showEmptyResultMessageOrSetUniqueCondition
+     * Test for showEmptyResultMessageOrSetUniqueCondition
      *
      * @return void
      */
@@ -190,7 +194,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::showEmptyResultMessageOrSetUniqueCondition(
+        $result = $this->insertEdit->showEmptyResultMessageOrSetUniqueCondition(
             array('1' => array('1' => 1)), 1, array(),
             'SELECT', array('1' => 'result1')
         );
@@ -210,7 +214,7 @@ class InsertEditTest extends TestCase
         $response->setAccessible(true);
         $response->setValue($responseMock);
 
-        $result = InsertEdit::showEmptyResultMessageOrSetUniqueCondition(
+        $result = $this->insertEdit->showEmptyResultMessageOrSetUniqueCondition(
             array(false), 0, array('1'), 'SELECT', array('1' => 'result1')
         );
 
@@ -220,7 +224,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::loadFirstRow
+     * Test for loadFirstRow
      *
      * @return void
      */
@@ -243,7 +247,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::loadFirstRow('table', 'db');
+        $result = $this->insertEdit->loadFirstRow('table', 'db');
 
         $this->assertEquals(
             array('result1', array(false, false)),
@@ -252,7 +256,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::urlParamsInEditMode
+     * Test for urlParamsInEditMode
      *
      * @return void
      */
@@ -261,7 +265,7 @@ class InsertEditTest extends TestCase
         $where_clause_array = array('foo=1', 'bar=2');
         $_POST['sql_query'] = 'SELECT 1';
 
-        $result = InsertEdit::urlParamsInEditMode(array(1), $where_clause_array, '');
+        $result = $this->insertEdit->urlParamsInEditMode(array(1), $where_clause_array, '');
 
         $this->assertEquals(
             array(
@@ -274,7 +278,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::showTypeOrFunction
+     * Test for showTypeOrFunction
      *
      * @return void
      */
@@ -284,7 +288,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $url_params = array('ShowFunctionFields' => 2);
 
-        $result = InsertEdit::showTypeOrFunction('function', $url_params, false);
+        $result = $this->insertEdit->showTypeOrFunction('function', $url_params, false);
 
         $this->assertEquals(
             ' : <a href="tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesIn'
@@ -294,7 +298,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 2
-        $result = InsertEdit::showTypeOrFunction('function', $url_params, true);
+        $result = $this->insertEdit->showTypeOrFunction('function', $url_params, true);
 
         $this->assertEquals(
             '<th><a href="tbl_change.php?ShowFunctionFields=0&amp;ShowFieldTypesIn'
@@ -304,7 +308,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 3
-        $result = InsertEdit::showTypeOrFunction('type', $url_params, false);
+        $result = $this->insertEdit->showTypeOrFunction('type', $url_params, false);
 
         $this->assertEquals(
             ' : <a href="tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesIn'
@@ -314,7 +318,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 4
-        $result = InsertEdit::showTypeOrFunction('type', $url_params, true);
+        $result = $this->insertEdit->showTypeOrFunction('type', $url_params, true);
 
         $this->assertEquals(
             '<th><a href="tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesIn'
@@ -325,7 +329,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::analyzeTableColumnsArray
+     * Test for analyzeTableColumnsArray
      *
      * @return void
      */
@@ -337,7 +341,7 @@ class InsertEditTest extends TestCase
             'Type' => 'float(10, 1)'
         );
 
-        $result = InsertEdit::analyzeTableColumnsArray(
+        $result = $this->insertEdit->analyzeTableColumnsArray(
             $column, array(), false
         );
 
@@ -398,7 +402,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getColumnTitle
+     * Test for getColumnTitle
      *
      * @return void
      */
@@ -409,14 +413,14 @@ class InsertEditTest extends TestCase
         $column['Field_html'] = 'f1&lt;';
 
         $this->assertEquals(
-            InsertEdit::getColumnTitle($column, array()),
+            $this->insertEdit->getColumnTitle($column, array()),
             'f1&lt;'
         );
 
         $comments = array();
         $comments['f1<'] = 'comment>';
 
-        $result = InsertEdit::getColumnTitle($column, $comments);
+        $result = $this->insertEdit->getColumnTitle($column, $comments);
 
         $this->assertContains(
             'title="comment&gt;"',
@@ -430,7 +434,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::isColumn
+     * Test for isColumn
      *
      * @return void
      */
@@ -440,51 +444,51 @@ class InsertEditTest extends TestCase
         $types = array('binary', 'varbinary');
 
         $column['Type'] = 'binaryfoo';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'Binaryfoo';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'varbinaryfoo';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'barbinaryfoo';
-        $this->assertFalse(InsertEdit::isColumn($column, $types));
+        $this->assertFalse($this->insertEdit->isColumn($column, $types));
 
         $types = array('char', 'varchar');
 
         $column['Type'] = 'char(10)';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'VarChar(20)';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'foochar';
-        $this->assertFalse(InsertEdit::isColumn($column, $types));
+        $this->assertFalse($this->insertEdit->isColumn($column, $types));
 
         $types = array('blob', 'tinyblob', 'mediumblob', 'longblob');
 
         $column['Type'] = 'blob';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'bloB';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'mediumBloB';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'tinyblobabc';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'longblob';
-        $this->assertTrue(InsertEdit::isColumn($column, $types));
+        $this->assertTrue($this->insertEdit->isColumn($column, $types));
 
         $column['Type'] = 'foolongblobbar';
-        $this->assertFalse(InsertEdit::isColumn($column, $types));
+        $this->assertFalse($this->insertEdit->isColumn($column, $types));
     }
 
     /**
-     * Test for InsertEdit::getEnumSetAndTimestampColumns
+     * Test for getEnumSetAndTimestampColumns
      *
      * @return void
      */
@@ -494,46 +498,46 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'set';
         $this->assertEquals(
             array('set', '', false),
-            InsertEdit::getEnumSetAndTimestampColumns($column, false)
+            $this->insertEdit->getEnumSetAndTimestampColumns($column, false)
         );
 
         $column['True_Type'] = 'enum';
         $this->assertEquals(
             array('enum', '', false),
-            InsertEdit::getEnumSetAndTimestampColumns($column, false)
+            $this->insertEdit->getEnumSetAndTimestampColumns($column, false)
         );
 
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
         $this->assertEquals(
             array('date', ' nowrap', true),
-            InsertEdit::getEnumSetAndTimestampColumns($column, false)
+            $this->insertEdit->getEnumSetAndTimestampColumns($column, false)
         );
 
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
         $this->assertEquals(
             array('date', ' nowrap', false),
-            InsertEdit::getEnumSetAndTimestampColumns($column, true)
+            $this->insertEdit->getEnumSetAndTimestampColumns($column, true)
         );
 
         $column['True_Type'] = 'SET';
         $column['Type'] = 'num';
         $this->assertEquals(
             array('num', ' nowrap', false),
-            InsertEdit::getEnumSetAndTimestampColumns($column, false)
+            $this->insertEdit->getEnumSetAndTimestampColumns($column, false)
         );
 
         $column['True_Type'] = '';
         $column['Type'] = 'num';
         $this->assertEquals(
             array('num', ' nowrap', false),
-            InsertEdit::getEnumSetAndTimestampColumns($column, false)
+            $this->insertEdit->getEnumSetAndTimestampColumns($column, false)
         );
     }
 
     /**
-     * Test for InsertEdit::getFunctionColumn
+     * Test for getFunctionColumn
      *
      * @return void
      */
@@ -544,7 +548,7 @@ class InsertEditTest extends TestCase
         $column['is_blob'] = true;
         $this->assertContains(
             '<td class="center">Binary</td>',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, false, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
@@ -553,7 +557,7 @@ class InsertEditTest extends TestCase
         $column['is_binary'] = true;
         $this->assertContains(
             '<td class="center">Binary</td>',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
@@ -562,7 +566,7 @@ class InsertEditTest extends TestCase
         $column['is_blob'] = false;
         $this->assertContains(
             '<td class="center">Binary</td>',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
@@ -571,7 +575,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'enum';
         $this->assertContains(
             '<td class="center">--</td>',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
@@ -579,7 +583,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'set';
         $this->assertContains(
             '<td class="center">--</td>',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
@@ -588,7 +592,7 @@ class InsertEditTest extends TestCase
         $column['pma_type'] = 'int';
         $this->assertContains(
             '<td class="center">--</td>',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, true, '', '', array('int'), 0, 0, 0, false, false, array()
             )
         );
@@ -596,14 +600,14 @@ class InsertEditTest extends TestCase
         $column['Field'] = 'num';
         $this->assertContains(
             '<select name="funcsa" b tabindex="5" id="field_3_1"',
-            InsertEdit::getFunctionColumn(
+            $this->insertEdit->getFunctionColumn(
                 $column, true, 'a', 'b', array(), 2, 3, 3, false, false, array()
             )
         );
     }
 
     /**
-     * Test for InsertEdit::getNullColumn
+     * Test for getNullColumn
      *
      * @return void
      */
@@ -619,7 +623,7 @@ class InsertEditTest extends TestCase
             'foreign_keys_data' => array()
         );
 
-        $result = InsertEdit::getNullColumn(
+        $result = $this->insertEdit->getNullColumn(
             $column, 'a', true, 2, 0, 1, "<script>", $foreigners, array(), false
         );
 
@@ -654,7 +658,7 @@ class InsertEditTest extends TestCase
 
         // case 2
         $column['Null'] = 'NO';
-        $result = InsertEdit::getNullColumn(
+        $result = $this->insertEdit->getNullColumn(
             $column, 'a', true, 2, 0, 1, "<script>", array(), array(), false
         );
 
@@ -665,7 +669,7 @@ class InsertEditTest extends TestCase
 
         // case 3
         $column['Null'] = 'YES';
-        $result = InsertEdit::getNullColumn(
+        $result = $this->insertEdit->getNullColumn(
             $column, 'a', true, 2, 0, 1, "<script>", array(), array(), true
         );
 
@@ -676,7 +680,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getNullifyCodeForNullColumn
+     * Test for getNullifyCodeForNullColumn
      *
      * @return void
      */
@@ -691,20 +695,20 @@ class InsertEditTest extends TestCase
         $column['Type'] = 'ababababababababababa';
         $this->assertEquals(
             '1',
-            InsertEdit::getNullifyCodeForNullColumn($column, $foreigners, array())
+            $this->insertEdit->getNullifyCodeForNullColumn($column, $foreigners, array())
         );
 
         $column['True_Type'] = 'enum';
         $column['Type'] = 'abababababababababab';
         $this->assertEquals(
             '2',
-            InsertEdit::getNullifyCodeForNullColumn($column, $foreigners, array())
+            $this->insertEdit->getNullifyCodeForNullColumn($column, $foreigners, array())
         );
 
         $column['True_Type'] = 'set';
         $this->assertEquals(
             '3',
-            InsertEdit::getNullifyCodeForNullColumn($column, $foreigners, array())
+            $this->insertEdit->getNullifyCodeForNullColumn($column, $foreigners, array())
         );
 
         $column['True_Type'] = '';
@@ -712,12 +716,12 @@ class InsertEditTest extends TestCase
         $foreignData['foreign_link'] = '';
         $this->assertEquals(
             '4',
-            InsertEdit::getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
+            $this->insertEdit->getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
         );
     }
 
     /**
-     * Test for InsertEdit::getForeignLink
+     * Test for getForeignLink
      *
      * @return void
      */
@@ -727,7 +731,7 @@ class InsertEditTest extends TestCase
         $column['Field'] = 'f';
         $titles['Browse'] = "'";
         $GLOBALS['cfg']['ServerDefault'] = 2;
-        $result = InsertEdit::getForeignLink(
+        $result = $this->insertEdit->getForeignLink(
             $column, 'a', 'b', 'd', 2, 0, 1, "abc", array('tbl', 'db'), 8,
             $titles, false
         );
@@ -753,7 +757,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::dispRowForeignData
+     * Test for dispRowForeignData
      *
      * @return void
      */
@@ -765,7 +769,7 @@ class InsertEditTest extends TestCase
         $foreignData['foreign_display'] = null;
         $GLOBALS['cfg']['ForeignKeyMaxLimit'] = 1;
         $GLOBALS['cfg']['NaturalOrder'] = false;
-        $result = InsertEdit::dispRowForeignData(
+        $result = $this->insertEdit->dispRowForeignData(
             'a', 'b', 'd', 2, 0, 1, "<s>", $foreignData, false
         );
 
@@ -787,7 +791,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getTextarea
+     * Test for getTextarea
      *
      * @return void
      */
@@ -803,7 +807,7 @@ class InsertEditTest extends TestCase
         $column['is_char'] = true;
         $column['Type'] = 'char(10)';
         $column['True_Type'] = 'char';
-        $result = InsertEdit::getTextarea(
+        $result = $this->insertEdit->getTextarea(
             $column, 'a', 'b', '', 2, 0, 1, "abc/", 'foobar', 'CHAR', false
         );
 
@@ -816,7 +820,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getPmaTypeEnum
+     * Test for getPmaTypeEnum
      *
      * @return void
      */
@@ -831,7 +835,7 @@ class InsertEditTest extends TestCase
                 'plain' => 'data'
             )
         );
-        $result = InsertEdit::getPmaTypeEnum(
+        $result = $this->insertEdit->getPmaTypeEnum(
             $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1,
             'foobar', false
         );
@@ -847,7 +851,7 @@ class InsertEditTest extends TestCase
         );
 
         $column['Type'] = 'ababababababababababa';
-        $result = InsertEdit::getPmaTypeEnum(
+        $result = $this->insertEdit->getPmaTypeEnum(
             $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1,
             'foobar', false
         );
@@ -865,7 +869,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getColumnEnumValues
+     * Test for getColumnEnumValues
      *
      * @return void
      */
@@ -878,7 +882,7 @@ class InsertEditTest extends TestCase
 
         $column['values'] = 'abc';
 
-        $result = InsertEdit::getColumnEnumValues($column, $extracted_columnspec);
+        $result = $this->insertEdit->getColumnEnumValues($column, $extracted_columnspec);
         $this->assertEquals(
             array(
                 array('plain' => '<abc>', 'html' => '&lt;abc&gt;'),
@@ -889,7 +893,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getDropDownDependingOnLength
+     * Test for getDropDownDependingOnLength
      *
      * @return void
      */
@@ -906,7 +910,7 @@ class InsertEditTest extends TestCase
             )
         );
 
-        $result = InsertEdit::getDropDownDependingOnLength(
+        $result = $this->insertEdit->getDropDownDependingOnLength(
             array(), 'a', 'b', 2, 0, 1, 'data', $column_enum_values, false
         );
 
@@ -937,7 +941,7 @@ class InsertEditTest extends TestCase
         $column = array();
         $column['Default'] = 'data';
         $column['Null'] = 'YES';
-        $result = InsertEdit::getDropDownDependingOnLength(
+        $result = $this->insertEdit->getDropDownDependingOnLength(
             $column, 'a', 'b', 2, 0, 1, '', $column_enum_values, false
         );
 
@@ -948,7 +952,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getRadioButtonDependingOnLength
+     * Test for getRadioButtonDependingOnLength
      *
      * @return void
      */
@@ -965,7 +969,7 @@ class InsertEditTest extends TestCase
             )
         );
 
-        $result = InsertEdit::getRadioButtonDependingOnLength(
+        $result = $this->insertEdit->getRadioButtonDependingOnLength(
             'a', 'b', 2, array(), 0, 1, 'data', $column_enum_values, false
         );
 
@@ -1002,7 +1006,7 @@ class InsertEditTest extends TestCase
         $column = array();
         $column['Default'] = 'data';
         $column['Null'] = 'YES';
-        $result = InsertEdit::getRadioButtonDependingOnLength(
+        $result = $this->insertEdit->getRadioButtonDependingOnLength(
             'a', 'b', 2, $column, 0, 1, '', $column_enum_values, false
         );
 
@@ -1014,7 +1018,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getPmaTypeSet
+     * Test for getPmaTypeSet
      *
      * @return void
      */
@@ -1030,7 +1034,7 @@ class InsertEditTest extends TestCase
 
         $column['select_size'] = 1;
 
-        $result = InsertEdit::getPmaTypeSet(
+        $result = $this->insertEdit->getPmaTypeSet(
             $column, array(), 'a', 'b', 'c', 2, 0, 1, 'data,<', false
         );
 
@@ -1054,7 +1058,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getColumnSetValueAndSelectSize
+     * Test for getColumnSetValueAndSelectSize
      *
      * @return void
      */
@@ -1062,7 +1066,7 @@ class InsertEditTest extends TestCase
     {
         $extracted_columnspec = $column = array();
         $extracted_columnspec['enum_set_values'] = array('a', '<');
-        $result = InsertEdit::getColumnSetValueAndSelectSize(array(), $extracted_columnspec);
+        $result = $this->insertEdit->getColumnSetValueAndSelectSize(array(), $extracted_columnspec);
 
         $this->assertEquals(
             array(
@@ -1077,7 +1081,7 @@ class InsertEditTest extends TestCase
 
         $column['values'] = array(1, 2);
         $column['select_size'] = 3;
-        $result = InsertEdit::getColumnSetValueAndSelectSize($column, $extracted_columnspec);
+        $result = $this->insertEdit->getColumnSetValueAndSelectSize($column, $extracted_columnspec);
 
         $this->assertEquals(
             array(
@@ -1089,7 +1093,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getBinaryAndBlobColumn
+     * Test for getBinaryAndBlobColumn
      *
      * @return void
      */
@@ -1104,7 +1108,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'blob';
         $GLOBALS['max_upload_size'] = 65536;
 
-        $result = InsertEdit::getBinaryAndBlobColumn(
+        $result = $this->insertEdit->getBinaryAndBlobColumn(
             $column, '12\\"23', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
             'foo', true, false
         );
@@ -1122,7 +1126,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ProtectBinary'] = "all";
         $column['is_binary'] = true;
 
-        $result = InsertEdit::getBinaryAndBlobColumn(
+        $result = $this->insertEdit->getBinaryAndBlobColumn(
             $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
             'foo', false, false
         );
@@ -1138,7 +1142,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ProtectBinary'] = "noblob";
         $column['is_blob'] = false;
 
-        $result = InsertEdit::getBinaryAndBlobColumn(
+        $result = $this->insertEdit->getBinaryAndBlobColumn(
             $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
             'foo', true, false
         );
@@ -1161,7 +1165,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['CharTextareaCols'] = 1;
         $GLOBALS['cfg']['LimitChars'] = 100;
 
-        $result = InsertEdit::getBinaryAndBlobColumn(
+        $result = $this->insertEdit->getBinaryAndBlobColumn(
             $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
             'foo', true, false
         );
@@ -1186,7 +1190,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['TextareaRows'] = 20;
         $GLOBALS['cfg']['TextareaCols'] = 10;
 
-        $result = InsertEdit::getBinaryAndBlobColumn(
+        $result = $this->insertEdit->getBinaryAndBlobColumn(
             $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
             'foo', true, false
         );
@@ -1212,7 +1216,7 @@ class InsertEditTest extends TestCase
          *
          */
 
-        $result = InsertEdit::getBinaryAndBlobColumn(
+        $result = $this->insertEdit->getBinaryAndBlobColumn(
             $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
             'foo', true, false
         );
@@ -1227,7 +1231,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getHtmlInput
+     * Test for getHtmlInput
      *
      * @return void
      */
@@ -1237,7 +1241,7 @@ class InsertEditTest extends TestCase
         $column = array();
         $column['pma_type'] = 'date';
         $column['True_Type'] = 'date';
-        $result = InsertEdit::getHtmlInput(
+        $result = $this->insertEdit->getHtmlInput(
             $column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false
         );
 
@@ -1250,7 +1254,7 @@ class InsertEditTest extends TestCase
         // case 2 datetime
         $column['pma_type'] = 'datetime';
         $column['True_Type'] = 'datetime';
-        $result = InsertEdit::getHtmlInput(
+        $result = $this->insertEdit->getHtmlInput(
             $column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false
         );
         $this->assertEquals(
@@ -1262,7 +1266,7 @@ class InsertEditTest extends TestCase
         // case 3 timestamp
         $column['pma_type'] = 'timestamp';
         $column['True_Type'] = 'timestamp';
-        $result = InsertEdit::getHtmlInput(
+        $result = $this->insertEdit->getHtmlInput(
             $column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false
         );
         $this->assertEquals(
@@ -1273,7 +1277,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getMaxUploadSize
+     * Test for getMaxUploadSize
      *
      * @return void
      */
@@ -1282,7 +1286,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['max_upload_size'] = 257;
         $column = array();
         $column['pma_type'] = 'tinyblob';
-        $result = InsertEdit::getMaxUploadSize($column, 256);
+        $result = $this->insertEdit->getMaxUploadSize($column, 256);
 
         $this->assertEquals(
             array("(Max: 256B)\n", 256),
@@ -1292,7 +1296,7 @@ class InsertEditTest extends TestCase
         // case 2
         $GLOBALS['max_upload_size'] = 250;
         $column['pma_type'] = 'tinyblob';
-        $result = InsertEdit::getMaxUploadSize($column, 20);
+        $result = $this->insertEdit->getMaxUploadSize($column, 20);
 
         $this->assertEquals(
             array("(Max: 250B)\n", 250),
@@ -1301,7 +1305,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getValueColumnForOtherDatatypes
+     * Test for getValueColumnForOtherDatatypes
      *
      * @return void
      */
@@ -1324,7 +1328,7 @@ class InsertEditTest extends TestCase
 
         $extracted_columnspec = array();
         $extracted_columnspec['spec_in_brackets'] = 25;
-        $result = InsertEdit::getValueColumnForOtherDatatypes(
+        $result = $this->insertEdit->getValueColumnForOtherDatatypes(
             $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
             "foo\nbar", $extracted_columnspec, false
         );
@@ -1343,7 +1347,7 @@ class InsertEditTest extends TestCase
         $column['Extra'] = 'auto_increment';
         $column['pma_type'] = 'timestamp';
         $column['True_Type'] = 'timestamp';
-        $result = InsertEdit::getValueColumnForOtherDatatypes(
+        $result = $this->insertEdit->getValueColumnForOtherDatatypes(
             $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
             "foo\nbar", $extracted_columnspec, false
         );
@@ -1359,7 +1363,7 @@ class InsertEditTest extends TestCase
 
         // case 3: (else -> datetime)
         $column['pma_type'] = 'datetime';
-        $result = InsertEdit::getValueColumnForOtherDatatypes(
+        $result = $this->insertEdit->getValueColumnForOtherDatatypes(
             $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
             "foo\nbar", $extracted_columnspec, false
         );
@@ -1371,7 +1375,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getColumnSize
+     * Test for getColumnSize
      *
      * @return void
      */
@@ -1385,7 +1389,7 @@ class InsertEditTest extends TestCase
 
         $this->assertEquals(
             40,
-            InsertEdit::getColumnSize($column, $extracted_columnspec)
+            $this->insertEdit->getColumnSize($column, $extracted_columnspec)
         );
 
         $this->assertEquals(
@@ -1398,12 +1402,12 @@ class InsertEditTest extends TestCase
         $column['len'] = 20;
         $this->assertEquals(
             30,
-            InsertEdit::getColumnSize($column, $extracted_columnspec)
+            $this->insertEdit->getColumnSize($column, $extracted_columnspec)
         );
     }
 
     /**
-     * Test for InsertEdit::getHtmlForGisDataTypes
+     * Test for getHtmlForGisDataTypes
      *
      * @return void
      */
@@ -1415,12 +1419,12 @@ class InsertEditTest extends TestCase
             '<a href="#" target="_blank"><span class="nowrap"><img src="themes/dot.'
             . 'gif" title="Edit/Insert" alt="Edit/Insert" class="icon ic_b_edit" />'
             . '</span></a>',
-            InsertEdit::getHtmlForGisDataTypes()
+            $this->insertEdit->getHtmlForGisDataTypes()
         );
     }
 
     /**
-     * Test for InsertEdit::getContinueInsertionForm
+     * Test for getContinueInsertionForm
      *
      * @return void
      */
@@ -1433,7 +1437,7 @@ class InsertEditTest extends TestCase
         $_REQUEST['where_clause'] = true;
         $_POST['sql_query'] = "SELECT 1";
 
-        $result = InsertEdit::getContinueInsertionForm(
+        $result = $this->insertEdit->getContinueInsertionForm(
             "tbl", "db", $where_clause_array, "localhost"
         );
 
@@ -1475,14 +1479,14 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getActionsPanel
+     * Test for getActionsPanel
      *
      * @return void
      */
     public function testGetActionsPanel()
     {
         $GLOBALS['cfg']['ShowHint'] = false;
-        $result = InsertEdit::getActionsPanel(null, 'back', 2, 1, false);
+        $result = $this->insertEdit->getActionsPanel(null, 'back', 2, 1, false);
 
         $this->assertContains(
             '<select name="submit_type" class="control_at_footer" tabindex="4">',
@@ -1502,13 +1506,13 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getSubmitTypeDropDown
+     * Test for getSubmitTypeDropDown
      *
      * @return void
      */
     public function testGetSubmitTypeDropDown()
     {
-        $result = InsertEdit::getSubmitTypeDropDown(array(), 2, 2);
+        $result = $this->insertEdit->getSubmitTypeDropDown(array(), 2, 2);
 
         $this->assertContains(
             '<select name="submit_type" class="control_at_footer" tabindex="5">',
@@ -1522,13 +1526,13 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getAfterInsertDropDown
+     * Test for getAfterInsertDropDown
      *
      * @return void
      */
     public function testGetAfterInsertDropDown()
     {
-        $result = InsertEdit::getAfterInsertDropDown("`t`.`f` = 2", 'new_insert', true);
+        $result = $this->insertEdit->getAfterInsertDropDown("`t`.`f` = 2", 'new_insert', true);
 
         $this->assertContains(
             '<option value="new_insert" selected="selected">',
@@ -1547,14 +1551,14 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getSubmitAndResetButtonForActionsPanel
+     * Test for getSubmitAndResetButtonForActionsPanel
      *
      * @return void
      */
     public function testGetSubmitAndResetButtonForActionsPanel()
     {
         $GLOBALS['cfg']['ShowHint'] = false;
-        $result = InsertEdit::getSubmitAndResetButtonForActionsPanel(1, 0);
+        $result = $this->insertEdit->getSubmitAndResetButtonForActionsPanel(1, 0);
 
         $this->assertContains(
             '<input type="submit" class="control_at_footer" value="Go" '
@@ -1576,7 +1580,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getHeadAndFootOfInsertRowTable
+     * Test for getHeadAndFootOfInsertRowTable
      *
      * @return void
      */
@@ -1587,7 +1591,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $url_params = array('ShowFunctionFields' => 2);
 
-        $result = InsertEdit::getHeadAndFootOfInsertRowTable($url_params);
+        $result = $this->insertEdit->getHeadAndFootOfInsertRowTable($url_params);
 
         $this->assertContains(
             'tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesInDataEditView=0',
@@ -1601,7 +1605,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getSpecialCharsAndBackupFieldForExistingRow
+     * Test for getSpecialCharsAndBackupFieldForExistingRow
      *
      * @return void
      */
@@ -1614,7 +1618,7 @@ class InsertEditTest extends TestCase
         $column['Key'] = 'PRI';
         $column['Extra'] = 'fooauto_increment';
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForExistingRow(
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForExistingRow(
             $current_row, $column, array(), false, array(), 'a', false
         );
 
@@ -1636,7 +1640,7 @@ class InsertEditTest extends TestCase
         $extracted_columnspec['spec_in_brackets'] = 20;
         $column['True_Type'] = 'bit';
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForExistingRow(
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForExistingRow(
             $current_row, $column, $extracted_columnspec, false, array(), 'a', false
         );
 
@@ -1652,7 +1656,7 @@ class InsertEditTest extends TestCase
         );
 
         $current_row['f'] = "abcd";
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForExistingRow(
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForExistingRow(
             $current_row, $column, $extracted_columnspec, false, array(), 'a', true
         );
 
@@ -1678,7 +1682,7 @@ class InsertEditTest extends TestCase
         $extracted_columnspec['spec_in_brackets'] = 20;
         $column['True_Type'] = 'int';
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForExistingRow(
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForExistingRow(
             $current_row, $column, $extracted_columnspec,
             false, array('int'), 'a', false
         );
@@ -1703,7 +1707,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'char';
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForExistingRow(
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForExistingRow(
             $current_row, $column, $extracted_columnspec,
             false, array('int'), 'a', false
         );
@@ -1722,7 +1726,7 @@ class InsertEditTest extends TestCase
         // Case 5
         $current_row['f'] = "11001\x00";
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForExistingRow(
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForExistingRow(
             $current_row, $column, $extracted_columnspec,
             false, array('int'), 'a', false
         );
@@ -1740,7 +1744,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getSpecialCharsAndBackupFieldForInsertingMode
+     * Test for getSpecialCharsAndBackupFieldForInsertingMode
      *
      * @return void
      */
@@ -1753,7 +1757,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ProtectBinary'] = false;
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForInsertingMode($column, false);
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForInsertingMode($column, false);
 
         $this->assertEquals(
             array(
@@ -1770,7 +1774,7 @@ class InsertEditTest extends TestCase
         unset($column['Default']);
         $column['True_Type'] = 'char';
 
-        $result = InsertEdit::getSpecialCharsAndBackupFieldForInsertingMode($column, false);
+        $result = $this->insertEdit->getSpecialCharsAndBackupFieldForInsertingMode($column, false);
 
         $this->assertEquals(
             array(
@@ -1785,7 +1789,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getParamsForUpdateOrInsert
+     * Test for getParamsForUpdateOrInsert
      *
      * @return void
      */
@@ -1794,7 +1798,7 @@ class InsertEditTest extends TestCase
         $_REQUEST['where_clause'] = 'LIMIT 1';
         $_REQUEST['submit_type'] = 'showinsert';
 
-        $result = InsertEdit::getParamsForUpdateOrInsert();
+        $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $this->assertEquals(
             array(
@@ -1809,7 +1813,7 @@ class InsertEditTest extends TestCase
         // case 2 (else)
         unset($_REQUEST['where_clause']);
         $_REQUEST['fields']['multi_edit'] = array('a' => 'b', 'c' => 'd');
-        $result = InsertEdit::getParamsForUpdateOrInsert();
+        $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $this->assertEquals(
             array(
@@ -1823,7 +1827,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::isInsertRow
+     * Test for isInsertRow
      *
      * @return void
      */
@@ -1863,7 +1867,7 @@ class InsertEditTest extends TestCase
         $response->setAccessible(true);
         $response->setValue($responseMock);
 
-        InsertEdit::isInsertRow();
+        $this->insertEdit->isInsertRow();
 
         $response->setValue($restoreInstance);
 
@@ -1871,7 +1875,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::setSessionForEditNext
+     * Test for setSessionForEditNext
      *
      * @return void
      */
@@ -1909,7 +1913,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['dbi'] = $dbi;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
-        InsertEdit::setSessionForEditNext('`a` = 2');
+        $this->insertEdit->setSessionForEditNext('`a` = 2');
 
         $this->assertEquals(
             'CONCAT(`table`.`orgname`) IS NULL',
@@ -1918,7 +1922,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getGotoInclude
+     * Test for getGotoInclude
      *
      * @return void
      */
@@ -1929,20 +1933,20 @@ class InsertEditTest extends TestCase
 
         $this->assertEquals(
             'db_sql.php',
-            InsertEdit::getGotoInclude('index')
+            $this->insertEdit->getGotoInclude('index')
         );
 
         $GLOBALS['table'] = 'tbl';
         $this->assertEquals(
             'tbl_sql.php',
-            InsertEdit::getGotoInclude('index')
+            $this->insertEdit->getGotoInclude('index')
         );
 
         $GLOBALS['goto'] = 'db_sql.php';
 
         $this->assertEquals(
             'db_sql.php',
-            InsertEdit::getGotoInclude('index')
+            $this->insertEdit->getGotoInclude('index')
         );
 
         $this->assertEquals(
@@ -1953,12 +1957,12 @@ class InsertEditTest extends TestCase
         $_REQUEST['after_insert'] = 'new_insert';
         $this->assertEquals(
             'tbl_change.php',
-            InsertEdit::getGotoInclude('index')
+            $this->insertEdit->getGotoInclude('index')
         );
     }
 
     /**
-     * Test for InsertEdit::getErrorUrl
+     * Test for getErrorUrl
      *
      * @return void
      */
@@ -1967,18 +1971,18 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $this->assertEquals(
             'tbl_change.php?lang=en',
-            InsertEdit::getErrorUrl(array())
+            $this->insertEdit->getErrorUrl(array())
         );
 
         $_REQUEST['err_url'] = 'localhost';
         $this->assertEquals(
             'localhost',
-            InsertEdit::getErrorUrl(array())
+            $this->insertEdit->getErrorUrl(array())
         );
     }
 
     /**
-     * Test for InsertEdit::buildSqlQuery
+     * Test for buildSqlQuery
      *
      * @return void
      */
@@ -1991,17 +1995,17 @@ class InsertEditTest extends TestCase
 
         $this->assertEquals(
             array('INSERT IGNORE INTO `table` (a, b) VALUES (1), (2)'),
-            InsertEdit::buildSqlQuery(true, $query_fields, $value_sets)
+            $this->insertEdit->buildSqlQuery(true, $query_fields, $value_sets)
         );
 
         $this->assertEquals(
             array('INSERT INTO `table` (a, b) VALUES (1), (2)'),
-            InsertEdit::buildSqlQuery(false, $query_fields, $value_sets)
+            $this->insertEdit->buildSqlQuery(false, $query_fields, $value_sets)
         );
     }
 
     /**
-     * Test for InsertEdit::executeSqlQuery
+     * Test for executeSqlQuery
      *
      * @return void
      */
@@ -2044,7 +2048,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::executeSqlQuery(array(), $query);
+        $result = $this->insertEdit->executeSqlQuery(array(), $query);
 
         $this->assertEquals(
             array('sql_query' => 'SELECT'),
@@ -2087,7 +2091,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::executeSqlQuery
+     * Test for executeSqlQuery
      *
      * @return void
      */
@@ -2130,7 +2134,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::executeSqlQuery(array(), $query);
+        $result = $this->insertEdit->executeSqlQuery(array(), $query);
 
         $this->assertEquals(
             array('sql_query' => 'SELECT'),
@@ -2173,7 +2177,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getWarningMessages
+     * Test for getWarningMessages
      *
      * @return void
      */
@@ -2194,7 +2198,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::getWarningMessages();
+        $result = $this->insertEdit->getWarningMessages();
 
         $this->assertEquals(
             array(
@@ -2206,7 +2210,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getDisplayValueForForeignTableColumn
+     * Test for getDisplayValueForForeignTableColumn
      *
      * @return void
      */
@@ -2243,13 +2247,13 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::getDisplayValueForForeignTableColumn("=1", $map, 'f');
+        $result = $this->insertEdit->getDisplayValueForForeignTableColumn("=1", $map, 'f');
 
         $this->assertEquals(2, $result);
     }
 
     /**
-     * Test for InsertEdit::getLinkForRelationalDisplayField
+     * Test for getLinkForRelationalDisplayField
      *
      * @return void
      */
@@ -2262,7 +2266,7 @@ class InsertEditTest extends TestCase
         $map['f']['foreign_table'] = 'TABLES';
         $map['f']['foreign_field'] = 'f';
 
-        $result = InsertEdit::getLinkForRelationalDisplayField($map, 'f', "=1", "a>", "b<");
+        $result = $this->insertEdit->getLinkForRelationalDisplayField($map, 'f', "=1", "a>", "b<");
 
         $this->assertEquals(
             '<a href="sql.php?db=information_schema&amp;table=TABLES&amp;pos=0&amp;'
@@ -2272,7 +2276,7 @@ class InsertEditTest extends TestCase
         );
 
         $_SESSION['tmpval']['relational_display'] = 'D';
-        $result = InsertEdit::getLinkForRelationalDisplayField($map, 'f', "=1", "a>", "b<");
+        $result = $this->insertEdit->getLinkForRelationalDisplayField($map, 'f', "=1", "a>", "b<");
 
         $this->assertEquals(
             '<a href="sql.php?db=information_schema&amp;table=TABLES&amp;pos=0&amp;'
@@ -2283,7 +2287,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::transformEditedValues
+     * Test for transformEditedValues
      *
      * @return void
      */
@@ -2298,7 +2302,7 @@ class InsertEditTest extends TestCase
         $transformation = array(
             'transformation_options' => "'','option ,, quoted',abd"
         );
-        $result = InsertEdit::transformEditedValues(
+        $result = $this->insertEdit->transformEditedValues(
             'db', 'table', $transformation, $edited_values,
             'Text_Plain_PreApPend.php', 'c', array('a' => 'b'),
             'transformation'
@@ -2311,7 +2315,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit
+     * Test for getQueryValuesForInsertAndUpdateInMultipleEdit
      *
      * @return void
      */
@@ -2319,7 +2323,7 @@ class InsertEditTest extends TestCase
     {
         $multi_edit_columns_name = array('0' => 'fld');
 
-        $result = InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit(
+        $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name, array(), '', array(), array(), true, array(1),
             array(2), 'foo', array(), '0', array()
         );
@@ -2332,7 +2336,7 @@ class InsertEditTest extends TestCase
             $result
         );
 
-        $result = InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit(
+        $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name, array(), '', array(), array(), false, array(1),
             array(2), 'foo', array(), '0', array('a')
         );
@@ -2345,7 +2349,7 @@ class InsertEditTest extends TestCase
             $result
         );
 
-        $result = InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit(
+        $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name, array('b'), "'`c`'", array('c'), array(),
             false, array(1), array(2), 'foo', array(), '0', array('a')
         );
@@ -2358,7 +2362,7 @@ class InsertEditTest extends TestCase
             $result
         );
 
-        $result = InsertEdit::getQueryValuesForInsertAndUpdateInMultipleEdit(
+        $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
             $multi_edit_columns_name, array('b'), "'`c`'", array('c'), array(3),
             false, array(1), array(2), 'foo', array(), 0, array()
         );
@@ -2373,13 +2377,13 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getCurrentValueAsAnArrayForMultipleEdit
+     * Test for getCurrentValueAsAnArrayForMultipleEdit
      *
      * @return void
      */
     public function testGetCurrentValueAsAnArrayForMultipleEdit()
     {
-        $result = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
+        $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
             array(), array(), array(), 'currVal', array(),
             array(), array(), '0'
         );
@@ -2400,7 +2404,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
+        $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
             $multi_edit_funcs, array(), array(), 'currVal', array(),
             array(), array(), '0'
         );
@@ -2410,7 +2414,7 @@ class InsertEditTest extends TestCase
         // case 3
         $multi_edit_funcs = array('AES_ENCRYPT');
         $multi_edit_salt = array("");
-        $result = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
+        $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
             $multi_edit_funcs, $multi_edit_salt, array(), "'''", array(),
             array('func'), array('func'), '0'
         );
@@ -2419,14 +2423,14 @@ class InsertEditTest extends TestCase
         // case 4
         $multi_edit_funcs = array('func');
         $multi_edit_salt = array();
-        $result = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
+        $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
             $multi_edit_funcs, $multi_edit_salt, array(), "'''", array(),
             array('func'), array('func'), '0'
         );
         $this->assertEquals("func(''')", $result);
 
         // case 5
-        $result = InsertEdit::getCurrentValueAsAnArrayForMultipleEdit(
+        $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
             $multi_edit_funcs, $multi_edit_salt, array(), "''", array(),
             array('func'), array('func'), '0'
         );
@@ -2434,7 +2438,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getCurrentValueForDifferentTypes
+     * Test for getCurrentValueForDifferentTypes
      *
      * @return void
      */
@@ -2460,7 +2464,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             '123', '0', array(), '', array(), 0, array(), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2471,7 +2475,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 2
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('test'), '', array(1), 0, array(), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2482,7 +2486,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 3
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('test'), '', array(), 0, array(), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2494,7 +2498,7 @@ class InsertEditTest extends TestCase
 
         // case 4
         $_REQUEST['fields']['multi_edit'][0][0] = array();
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('set'), '', array(), 0, array(), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2505,7 +2509,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 5
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('protected'), '', array(), 0, array('a'), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2516,7 +2520,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 6
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('protected'), '', array(), 0, array('a'), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2527,7 +2531,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 7
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('bit'), '20\'12', array(), 0, array('a'), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2538,7 +2542,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 7
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('date'), '20\'12', array(), 0, array('a'), array(),
             array(), true, true, '1', 'table', array()
         );
@@ -2550,7 +2554,7 @@ class InsertEditTest extends TestCase
 
         // case 8
         $_REQUEST['fields']['multi_edit'][0][0] = array();
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('set'), '', array(), 0, array(), array(1),
             array(), true, true, '1', 'table', array()
         );
@@ -2561,7 +2565,7 @@ class InsertEditTest extends TestCase
         );
 
         // case 9
-        $result = InsertEdit::getCurrentValueForDifferentTypes(
+        $result = $this->insertEdit->getCurrentValueForDifferentTypes(
             false, '0', array('protected'), '', array(), 0, array('a'), array(),
             array(1), true, true, '1', 'table', array()
         );
@@ -2573,7 +2577,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::verifyWhetherValueCanBeTruncatedAndAppendExtraData
+     * Test for verifyWhetherValueCanBeTruncatedAndAppendExtraData
      *
      * @return void
      */
@@ -2637,20 +2641,20 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        InsertEdit::verifyWhetherValueCanBeTruncatedAndAppendExtraData(
+        $this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData(
             'db', 'table', 'a', $extra_data
         );
 
         $this->assertFalse($extra_data['isNeedToRecheck']);
 
-        InsertEdit::verifyWhetherValueCanBeTruncatedAndAppendExtraData(
+        $this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData(
             'db', 'table', 'a', $extra_data
         );
 
         $this->assertEquals('123', $extra_data['truncatableFieldValue']);
         $this->assertTrue($extra_data['isNeedToRecheck']);
 
-        InsertEdit::verifyWhetherValueCanBeTruncatedAndAppendExtraData(
+        $this->insertEdit->verifyWhetherValueCanBeTruncatedAndAppendExtraData(
             'db', 'table', 'a', $extra_data
         );
 
@@ -2661,7 +2665,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getTableColumns
+     * Test for getTableColumns
      *
      * @return void
      */
@@ -2682,7 +2686,7 @@ class InsertEditTest extends TestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = InsertEdit::getTableColumns('db', 'table');
+        $result = $this->insertEdit->getTableColumns('db', 'table');
 
         $this->assertEquals(
             array('b', 'd'),
@@ -2691,7 +2695,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::determineInsertOrEdit
+     * Test for determineInsertOrEdit
      *
      * @return void
      */
@@ -2721,7 +2725,7 @@ class InsertEditTest extends TestCase
         $response->setAccessible(true);
         $response->setValue($responseMock);
 
-        $result = InsertEdit::determineInsertOrEdit('1', 'db', 'table');
+        $result = $this->insertEdit->determineInsertOrEdit('1', 'db', 'table');
 
         $this->assertEquals(
             array(
@@ -2742,7 +2746,7 @@ class InsertEditTest extends TestCase
         unset($_SESSION['edit_next']);
         $_REQUEST['default_action'] = '';
 
-        $result = InsertEdit::determineInsertOrEdit(null, 'db', 'table');
+        $result = $this->insertEdit->determineInsertOrEdit(null, 'db', 'table');
 
         $response->setValue($restoreInstance);
 
@@ -2762,7 +2766,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getCommentsMap
+     * Test for getCommentsMap
      *
      * @return void
      */
@@ -2795,19 +2799,19 @@ class InsertEditTest extends TestCase
 
         $this->assertEquals(
             array(),
-            InsertEdit::getCommentsMap('db', 'table')
+            $this->insertEdit->getCommentsMap('db', 'table')
         );
 
         $GLOBALS['cfg']['ShowPropertyComments'] = true;
 
         $this->assertEquals(
             array('d' => 'b'),
-            InsertEdit::getCommentsMap('db', 'table')
+            $this->insertEdit->getCommentsMap('db', 'table')
         );
     }
 
     /**
-     * Test for InsertEdit::getUrlParameters
+     * Test for getUrlParameters
      *
      * @return void
      */
@@ -2822,12 +2826,12 @@ class InsertEditTest extends TestCase
                 'sql_query' => 'SELECT',
                 'table' => 'bar'
             ),
-            InsertEdit::getUrlParameters('foo', 'bar')
+            $this->insertEdit->getUrlParameters('foo', 'bar')
         );
     }
 
     /**
-     * Test for InsertEdit::getHtmlForIgnoreOption
+     * Test for getHtmlForIgnoreOption
      *
      * @return void
      */
@@ -2839,17 +2843,17 @@ class InsertEditTest extends TestCase
         $checked = 'checked="checked" ';
         $this->assertEquals(
             sprintf($expected, $checked),
-            InsertEdit::getHtmlForIgnoreOption(1)
+            $this->insertEdit->getHtmlForIgnoreOption(1)
         );
 
         $this->assertEquals(
             sprintf($expected, ''),
-            InsertEdit::getHtmlForIgnoreOption(1, false)
+            $this->insertEdit->getHtmlForIgnoreOption(1, false)
         );
     }
 
     /**
-     * Test for InsertEdit::getHtmlForInsertEditFormColumn
+     * Test for getHtmlForInsertEditFormColumn
      *
      * @return void
      */
@@ -2875,7 +2879,7 @@ class InsertEditTest extends TestCase
         );
 
         // Test w/ input transformation
-        $actual = InsertEdit::getHtmlForInsertEditFormColumn(
+        $actual = $this->insertEdit->getHtmlForInsertEditFormColumn(
             $table_columns, 0, array(), false, array(), '', '',
             '', false, array(), $o_rows, $tabindex, 0, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
@@ -2931,7 +2935,7 @@ class InsertEditTest extends TestCase
         $repopulate = array(
             md5('qwerty') => '12-10-14'
         );
-        $actual = InsertEdit::getHtmlForInsertEditFormColumn(
+        $actual = $this->insertEdit->getHtmlForInsertEditFormColumn(
             $table_columns, 0, array(), false, array(), '', '',
             '', true, array(), $o_rows, $tabindex, 0, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
@@ -2958,7 +2962,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getHtmlForInsertEditRow
+     * Test for getHtmlForInsertEditRow
      *
      * @return void
      */
@@ -2979,7 +2983,7 @@ class InsertEditTest extends TestCase
                 'Privileges' => 'select,insert,update,references',
             )
         );
-        $actual = InsertEdit::getHtmlForInsertEditRow(
+        $actual = $this->insertEdit->getHtmlForInsertEditRow(
             array(), $table_columns, array(), false, array(), '', '',
             '', false, array(), $o_rows, $tabindex, 1, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '',
@@ -3012,7 +3016,7 @@ class InsertEditTest extends TestCase
     }
 
     /**
-     * Test for InsertEdit::getHtmlForInsertEditRow based on the column privilges
+     * Test for getHtmlForInsertEditRow based on the column privilges
      *
      * @return void
      */
@@ -3043,7 +3047,7 @@ class InsertEditTest extends TestCase
                 'Privileges' => 'select,insert,references',
             )
         );
-        $actual = InsertEdit::getHtmlForInsertEditRow(
+        $actual = $this->insertEdit->getHtmlForInsertEditRow(
             array(), $table_columns, array(), false, array(), '', '',
             '', false, array(), $o_rows, $tabindex, 1, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '',
@@ -3079,7 +3083,7 @@ class InsertEditTest extends TestCase
                 'Privileges' => 'select,update,references',
             )
         );
-        $actual = InsertEdit::getHtmlForInsertEditRow(
+        $actual = $this->insertEdit->getHtmlForInsertEditRow(
             array(), $table_columns, array(), false, array(), '', '',
             '', true, array(), $o_rows, $tabindex, 2, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '',