Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

ChangeLog

@@ -30,7 +30,9 @@ phpMyAdmin - ChangeLog
 + rfe #1380 Support for Paramaters with raw SQL
 + rfe #1146 Show original size of truncated columns
 
-4.4.5.0 (not yet released)
+4.4.6.0 (not yet released)
+
+4.4.5.0 (2015-05-05)
 - bug       Table overhead stats: missing space before the unit
 - bug       Fix resize icon in Designer
 - bug #4879 Exit fullscreen in Designer does not change the button text

doc/Makefile

@@ -47,7 +47,27 @@ help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 clean:
-	-rm -rf $(BUILDDIR)/*
+	-rm -rf $(BUILDDIR)/doctrees
+	-rm -rf $(BUILDDIR)/html
+	-rm -rf $(BUILDDIR)/dirhtml
+	-rm -rf $(BUILDDIR)/singlehtml
+	-rm -rf $(BUILDDIR)/pickle
+	-rm -rf $(BUILDDIR)/json
+	-rm -rf $(BUILDDIR)/htmlhelp
+	-rm -rf $(BUILDDIR)/qthelp
+	-rm -rf $(BUILDDIR)/devhelp
+	-rm -rf $(BUILDDIR)/epub
+	-rm -rf $(BUILDDIR)/latex
+	-rm -rf $(BUILDDIR)/text
+	-rm -rf $(BUILDDIR)/man
+	-rm -rf $(BUILDDIR)/texinfo
+	-rm -rf $(BUILDDIR)/info
+	-rm -rf $(BUILDDIR)/gettext
+	-rm -rf $(BUILDDIR)/changes
+	-rm -rf $(BUILDDIR)/linkcheck
+	-rm -rf $(BUILDDIR)/doctest
+	-rm -rf $(BUILDDIR)/xml
+	-rm -rf $(BUILDDIR)/pseudoxml
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

libraries/browse_foreigners.lib.php

@@ -215,7 +215,11 @@ function PMA_getHtmlForColumnElement($cssClass, $isSelected, $keyname,
     $description, $title
 ) {
     $keyname = htmlspecialchars($keyname);
-    $output = '<td ' . $cssClass . '>'
+    $output = '<td';
+    if (! empty($cssClass)) {
+        $output .= ' ' . $cssClass;
+    }
+    $output .= '>'
         . ($isSelected ? '<strong>' : '')
         . '<a class="foreign_value" data-key="' . $keyname . '" '
         . 'href="#" title="' . __('Use this value')

libraries/config/messages.inc.php

@@ -461,7 +461,7 @@ $strConfigNavigationTreeDisplayItemFilterMinimum_name
 $strConfigNavigationTreeDisplayDbFilterMinimum_name
     = __('Minimum number of databases to display the database filter box');
 $strConfigNavigationTreeEnableGrouping_desc = __(
-    'Group items in the navigation tree (determined by the separator defined below).'
+    'Group items in the navigation tree (determined by the separator defined in the Databases and Tables tabs above).'
 );
 $strConfigNavigationTreeEnableGrouping_name = __('Group items in the tree');
 $strConfigNavigationTreeDbSeparator_desc

libraries/insert_edit.lib.php

@@ -769,7 +769,7 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
         . ' cols="' . $textareaCols . '"'
         . ' dir="' . $text_dir . '"'
         . ' id="field_' . ($idindex) . '_3"'
-        . ' ' . $unnullify_trigger
+        . (! empty($unnullify_trigger) ? ' ' . $unnullify_trigger : '')
         . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
         . ' data-type="' . $data_type . '">'
         . $special_chars_encoded

test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

@@ -217,79 +217,59 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
 
         // assertions
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<img src="testlogo_right.png" id="imLogo"'
-            ),
+        $this->assertContains(
+            '<img src="testlogo_right.png" id="imLogo"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<div class="error">'
-            ),
+        $this->assertContains(
+            '<div class="error">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form method="post" action="index.php" name="login_form" ' .
-                'class="disableAjax login hide js-show">'
-            ),
+        $this->assertContains(
+            '<form method="post" action="index.php" name="login_form" ' .
+            'class="disableAjax login hide js-show">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" name="pma_servername" id="input_servername" ' .
-                'value="localhost"'
-            ),
+        $this->assertContains(
+            '<input type="text" name="pma_servername" id="input_servername" ' .
+            'value="localhost"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" name="pma_username" id="input_username" ' .
-                'value="pmauser" size="24" class="textfield"/>'
-            ),
+        $this->assertContains(
+            '<input type="text" name="pma_username" id="input_username" ' .
+            'value="pmauser" size="24" class="textfield"/>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="password" name="pma_password" id="input_password" ' .
-                'value="" size="24" class="textfield" />'
-            ),
+        $this->assertContains(
+            '<input type="password" name="pma_password" id="input_password" ' .
+            'value="" size="24" class="textfield" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="server" id="select_server" ' .
-                'onchange="document.forms[\'login_form\'].' .
-                'elements[\'pma_servername\'].value = \'\'" >'
-            ),
+        $this->assertContains(
+            '<select name="server" id="select_server" ' .
+            'onchange="document.forms[\'login_form\'].' .
+            'elements[\'pma_servername\'].value = \'\'" >',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="target" value="testTarget" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="target" value="testTarget" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="db" value="testDb" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="db" value="testDb" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="table" value="testTable" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="table" value="testTable" />',
             $result
         );
 
@@ -341,33 +321,25 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
 
         // assertions
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<img name="imLogo" id="imLogo" src="testpma_logo.png"'
-            ),
+        $this->assertContains(
+            '<img name="imLogo" id="imLogo" src="testpma_logo.png"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
-                'id="sel-lang">'
-            ),
+        $this->assertContains(
+            '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
+            'id="sel-lang">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form method="post" action="index.php" name="login_form" ' .
-                'autocomplete="off" class="disableAjax login hide js-show">'
-            ),
+        $this->assertContains(
+            '<form method="post" action="index.php" name="login_form" ' .
+            'autocomplete="off" class="disableAjax login hide js-show">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="server" value="0" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="server" value="0" />',
             $result
         );
 

test/classes/plugin/auth/PMA_AuthenticationHttp_test.php

@@ -443,10 +443,8 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase
         $this->object->authFails();
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<p>error 123</p>'
-            ),
+        $this->assertContains(
+            '<p>error 123</p>',
             $result
         );
 

test/libraries/PMA_FormDisplay_tpl_test.php

@@ -37,47 +37,35 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayFormTop(null, 'posted', array(1));
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form method="get" action="http://www.phpmyadmin.net" ' .
-                'class="config-form disableAjax">'
-            ),
+        $this->assertContains(
+            '<form method="get" action="http://www.phpmyadmin.net" ' .
+            'class="config-form disableAjax">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="tab_hash" value="" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="tab_hash" value="" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="check_page_refresh"  ' .
-                'id="check_page_refresh" value="" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="check_page_refresh"  ' .
+            'id="check_page_refresh" value="" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="lang" value="en" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="lang" value="en" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="token" value="token" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="token" value="token" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="0" value="1" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="0" value="1" />',
             $result
         );
     }
@@ -93,23 +81,23 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayTabsTop(array('one', 'two'));
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray('<ul class="tabs">'),
+        $this->assertContains(
+            '<ul class="tabs">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<a href="#0">', array('content' => 'one')),
+        $this->assertContains(
+            '<a href="#0"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<a href="#1">', array('content' => 'two')),
+        $this->assertContains(
+            '<a href="#1"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<div class="tabs_contents">'),
+        $this->assertContains(
+            '<div class="tabs_contents"',
             $result
         );
     }
@@ -128,61 +116,33 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayFieldsetTop("TitleTest", "DescTest", $errors, $attributes);
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<fieldset class="optbox" name="attrname">'
-            ),
+        $this->assertContains(
+            '<fieldset class="optbox" name="attrname">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<legend>',
-                array(
-                    'content' => 'TitleTest',
-                    'parent' => array('tag' => 'fieldset')
-                )
-            ),
+        $this->assertContains(
+            '<legend>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<p>',
-                array(
-                    'content' => 'DescTest',
-                )
-            ),
+        $this->assertContains(
+            '<p>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<dl class="errors">'
-            ),
+        $this->assertContains(
+            '<dl class="errors">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<dd>',
-                array('content' => 'e1', 'parent' => array('tag' => 'dl'))
-            ),
+        $this->assertContains(
+            '<dd>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<dd>',
-                array('content' => 'e2', 'parent' => array('tag' => 'dl'))
-            ),
-            $result
-        );
-
-        $this->assertTag(
-            PMA_getTagArray(
-                '<table width="100%" cellspacing="0">'
-            ),
+        $this->assertContains(
+            '<table width="100%" cellspacing="0">',
             $result
         );
     }
@@ -216,82 +176,52 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<tr class="group-header-field group-header-1 disabled-field">'
-            ),
+        $this->assertContains(
+            '<tr class="group-header-field group-header-1 disabled-field">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<label for="test/path">',
-                array('content' => 'testName')
-            ),
+        $this->assertContains(
+            '<label for="test/path">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a href="http://doclink" target="documentation">',
-                array(
-                    'parent' => array(
-                        'tag' => 'span',
-                        'attributes' => array('class' => 'doc')
-                    )
-                )
-            ),
+        $this->assertContains(
+            '<a href="http://doclink" target="documentation"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<img src="testImageb_help.png" title="Documentation" ' .
-                'alt="Documentation" />',
-                array(
-                    'parent' => array('tag' => 'a')
-                )
-            ),
+        $this->assertContains(
+            '<img src="testImageb_help.png" title="Documentation" ' .
+            'alt="Documentation" /',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<span class="disabled-notice">'
-            ),
+        $this->assertContains(
+            '<span class="disabled-notice">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<small>',
-                array('content' => 'desc')
-            ),
+        $this->assertContains(
+            '<small>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" size="60" name="test/path" id="test/path" ' .
-                'class="custom field-error" value="val" />'
-            ),
+        $this->assertContains(
+            '<input type="text" size="60" name="test/path" id="test/path" ' .
+            'class="custom field-error" value="val" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<span class="field-comment-mark field-comment-warning" '
-                . 'title="testComment">',
-                array('content' => 'i')
-            ),
+        $this->assertContains(
+            '<span class="field-comment-mark field-comment-warning" '
+            . 'title="testComment">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a class="restore-default" href="#test/path" ' .
-                'style="display:none">'
-            ),
+        $this->assertContains(
+            '<a class="restore-default" href="#test/path" ' .
+            'style="display:none">',
             $result
         );
 
@@ -320,55 +250,31 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<tr class="group-field group-field-1">'
-            ),
+        $this->assertContains(
+            '<tr class="group-field group-field-1">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="checkbox" name="test/path" id="test/path" ' .
-                'checked="checked" />',
-                array(
-                    'parent' => array(
-                        'tag' => 'span',
-                        'attributes' => array('class' => 'checkbox custom')
-                    )
-                )
-            ),
+        $this->assertContains(
+            '<input type="checkbox" name="test/path" id="test/path" ' .
+            'checked="checked" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a class="userprefs-comment" title="userprefsComment">',
-                array('child' => array('tag' => 'img'))
-            ),
+        $this->assertContains(
+            '<a class="userprefs-comment" title="userprefsComment">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<td class="userprefs-allow" title="Allow users to customize ' .
-                'this value">',
-                array(
-                    'child' => PMA_getTagArray(
-                        '<input type="checkbox" name="test/path-userprefs-allow" ' .
-                        'checked="checked"/>'
-                    )
-                )
-            ),
+        $this->assertContains(
+            '<td class="userprefs-allow" title="Allow users to customize ' .
+            'this value">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a class="set-value" href="#test/path=setVal" ' .
-                'title="Set value: setVal" style="display:none">',
-                array('child' => array('tag' => 'img'))
-            ),
+        $this->assertContains(
+            '<a class="set-value" href="#test/path=setVal" ' .
+            'title="Set value: setVal" style="display:none">',
             $result
         );
 
@@ -385,11 +291,9 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" size="25" name="test/path" id="test/path" ' .
-                'value="val" />'
-            ),
+        $this->assertContains(
+            '<input type="text" size="25" name="test/path" id="test/path" ' .
+            'value="val" />',
             $result
         );
 
@@ -401,11 +305,9 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="number" name="test/path" ' .
-                'id="test/path" value="val" />'
-            ),
+        $this->assertContains(
+            '<input type="number" name="test/path" ' .
+            'id="test/path" value="val" />',
             $result
         );
 
@@ -423,50 +325,23 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
             '', true, $opts
         );
         $result = ob_get_clean();
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="test/path" id="test/path">'
-            ),
+        $this->assertContains(
+            '<select name="test/path" id="test/path">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="test/path" id="test/path">'
-            ),
+        $this->assertContains(
+            '<option value="1" selected="selected" disabled="disabled">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="1" selected="selected" disabled="disabled">',
-                array(
-                    'parent' => array('tag' => 'select'),
-                    'content' => "test"
-                )
-            ),
+        $this->assertContains(
+            '<option value="key1">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="key1">',
-                array(
-                    'parent' => array('tag' => 'select'),
-                    'content' => "yes"
-                )
-            ),
-            $result
-        );
-
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="key2">',
-                array(
-                    'parent' => array('tag' => 'select'),
-                    'content' => "no"
-                )
-            ),
+        $this->assertContains(
+            '<option value="key2">',
             $result
         );
 
@@ -485,21 +360,12 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="test/path" id="test/path">'
-            ),
+        $this->assertContains(
+            '<select name="test/path" id="test/path">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="test/path" id="test/path">'
-            ),
-            $result
-        );
-
-        // assertTag doesn't seem to work with htmlentities
+        // assertContains doesn't seem to work with htmlentities
         $this->assertContains(
             '<option value="a&lt;b">c&amp;d</option>',
             $result
@@ -514,13 +380,8 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<textarea cols="40" rows="5" name="test/path" id="test/path">',
-                array(
-                    'content' => "foo\nbar"
-                )
-            ),
+        $this->assertContains(
+            '<textarea cols="40" rows="5" name="test/path" id="test/path">',
             $result
         );
         runkit_constant_remove('PMA_SETUP');
@@ -551,18 +412,8 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayGroupHeader('headerText');
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<tr class="group-header group-header-4">',
-                array(
-                    'child' => PMA_getTagArray(
-                        '<th colspan="3">',
-                        array(
-                            'content' => 'headerText'
-                        )
-                    )
-                )
-            ),
+        $this->assertContains(
+            '<tr class="group-header group-header-4">',
             $result
         );
 
@@ -575,18 +426,8 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayGroupHeader('headerText');
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<tr class="group-header group-header-4">',
-                array(
-                    'child' => PMA_getTagArray(
-                        '<th colspan="2">',
-                        array(
-                            'content' => 'headerText'
-                        )
-                    )
-                )
-            ),
+        $this->assertContains(
+            '<tr class="group-header group-header-4">',
             $result
         );
 
@@ -628,30 +469,18 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayFieldsetBottom();
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<td colspan="3" class="lastrow">'
-            ),
+        $this->assertContains(
+            '<td colspan="3" class="lastrow">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="submit" name="submit_save" value="Apply"',
-                array(
-                    'parent' => array('tag' => 'td')
-                )
-            ),
+        $this->assertContains(
+            '<input type="submit" name="submit_save" value="Apply"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="button" name="submit_reset" value="Reset" />',
-                array(
-                    'parent' => array('tag' => 'td')
-                )
-            ),
+        $this->assertContains(
+            '<input type="button" name="submit_reset" value="Reset" />',
             $result
         );
 
@@ -668,10 +497,8 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         PMA_displayFieldsetBottom();
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<td colspan="2" class="lastrow">'
-            ),
+        $this->assertContains(
+            '<td colspan="2" class="lastrow">',
             $result
         );
     }

test/libraries/PMA_browse_foreigners_test.php

@@ -141,25 +141,19 @@ class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<select class="pageselector ajax" name="pos">'),
+        $this->assertContains(
+            '<select class="pageselector ajax" name="pos"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option selected="selected" '
-                . 'style="font-weight: bold" value="0">',
-                array('content' => '1')
-            ),
+        $this->assertContains(
+            '<option selected="selected" '
+            . 'style="font-weight: bold" value="0">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="25">',
-                array('content' => '2')
-            ),
+        $this->assertContains(
+            '<option  value="25"',
             $result
         );
     }
@@ -181,21 +175,18 @@ class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
             $description, $title
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<td>'),
+        $this->assertContains(
+            '<td>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a class="foreign_value" href="#" '
-                . 'title="Use this value">',
-                array('content' => 'foo')
-            ),
+        $this->assertContains(
+            '<a class="foreign_value" data-key="" href="#" '
+            . 'title="Use this value">',
             $result
         );
 
-        $cssClass = 'baz';
+        $cssClass = 'class="baz"';
         $isSelected = true;
         $keyname = 'bar';
         $title = 'foo';
@@ -204,22 +195,19 @@ class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
             $description, $title
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<td>'),
+        $this->assertContains(
+            '<td class="baz">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<strong>'),
+        $this->assertContains(
+            '<strong>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a class="foreign_value" href="#" '
-                . 'title="Use this value: foo">',
-                array('content' => 'bar')
-            ),
+        $this->assertContains(
+            '<a class="foreign_value" data-key="bar" href="#" '
+            . 'title="Use this value: foo">',
             $result
         );
     }
@@ -267,75 +255,63 @@ class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
             $db, $table, $field, $foreignData, $fieldkey, $data
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form class="ajax" '
-                . 'id="browse_foreign_form" name="browse_foreign_from" '
-                . 'action="browse_foreigners.php" method="post">'
-            ),
+        $this->assertContains(
+            '<form class="ajax" '
+            . 'id="browse_foreign_form" name="browse_foreign_from" '
+            . 'action="browse_foreigners.php" method="post">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<fieldset>'),
+        $this->assertContains(
+            '<fieldset>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<input type="hidden" name="field" value="foo" />'),
+        $this->assertContains(
+            '<input type="hidden" name="field" value="foo" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<input type="hidden" name="fieldkey" value="bar" />'),
+        $this->assertContains(
+            '<input type="hidden" name="fieldkey" value="bar" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<input type="hidden" name="rownumber" value="1" />'),
+        $this->assertContains(
+            '<input type="hidden" name="rownumber" value="1" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<span class="formelement">'),
+        $this->assertContains(
+            '<span class="formelement">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<label for="input_foreign_filter">',
-                array('content' => 'Search:')
-            ),
+        $this->assertContains(
+            '<label for="input_foreign_filter">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" name="foreign_filter" '
-                . 'id="input_foreign_filter" '
-                . 'value="5" data-old="5" '
-                . '/>'
-            ),
+        $this->assertContains(
+            '<input type="text" name="foreign_filter" '
+             . 'id="input_foreign_filter" '
+            . 'value="5" data-old="5" '
+            . '/>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="submit" name="submit_foreign_filter" value="Go" />'
-            ),
+        $this->assertContains(
+            '<input type="submit" name="submit_foreign_filter" value="Go" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<span class="formelement">',
-                array('content' => '')
-            ),
+        $this->assertContains(
+            '<span class="formelement">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<table width="100%" id="browse_foreign_table">'),
+        $this->assertContains(
+            '<table width="100%" id="browse_foreign_table">',
             $result
         );
 
@@ -346,26 +322,16 @@ class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
             $db, $table, $field, $foreignData, $fieldkey, $data
         );
 
-        $this->assertTag(
-            PMA_getTagArray('<table width="100%" id="browse_foreign_table">'),
+        $this->assertContains(
+            '<table width="100%" id="browse_foreign_table">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<th>',
-                array('content' => 'Keyname')
-            ),
+        $this->assertContains(
+            '<th>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<th>',
-                array('content' => 'Description')
-            ),
-            $result
-        );
     }
 }
 ?>

test/libraries/PMA_build_html_for_db_test.php

@@ -114,7 +114,7 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
      */
     public function testBuildHtmlForDb($current, $is_superuser,
         $url_query, $column_order, $replication_types,
-        $replication_info, $tags
+        $replication_info, $html_segments
     ) {
         $result = PMA_buildHtmlForDb(
             $current, $is_superuser, $url_query,
@@ -124,9 +124,9 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
             $column_order,
             $result[0]
         );
-        foreach ($tags as $value) {
-            $this->assertTag(
-                $value,
+        foreach ($html_segments as $html_segment) {
+            $this->assertContains(
+                $html_segment,
                 $result[1]
             );
         }
@@ -157,111 +157,8 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
                     )
                 ),
                 array(
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'tool'
-                        ),
-                        'child' => array(
-                            'tag' => 'input',
-                            'attributes' => array(
-                                'type' => 'checkbox',
-                                'name' => 'selected_dbs[]',
-                                'value' => 'pma'
-                            )
-                        )
-                    ),
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'name'
-                        ),
-                        'child' => array(
-                            'tag' => 'a',
-                            'attributes' => array(
-                                'title' => 'Jump to database'
-                            ),
-                            'content' => 'pma'
-                        )
-                    ),
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'tool'
-                        ),
-                        'descendant' => array(
-                            'tag' => 'img',
-                            'attributes' => array(
-                                'title' => 'Not replicated'
-                            )
-                        )
-                    ),
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'tool'
-                        ),
-                        'child' => array(
-                            'tag' => 'a',
-                            'child' => array(
-                                'tag' => 'span',
-                                'child' => array(
-                                    'tag' => 'img',
-                                    'attributes' => array(
-                                        'title' => 'Check Privileges'
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            ),
-            array(
-                array('SCHEMA_NAME' => 'sakila'),
-                true,
-                'target=main.php',
-                PMA_getColumnOrder(),
-                array(
-                    'SCHEMA_NAME' => 'sakila',
-                ),
-                array(
-                    'sakila' => array(
-                        'status' => 'true',
-                        'Ignore_DB' => array(
-                            'pma' => 'pma'
-                        ),
-                        'Do_DB' => array(
-                            'sakila' => 'sakila'
-                        )
-                    )
-                ),
-                array(
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'tool'
-                        ),
-                        'child' => array(
-                            'tag' => 'input',
-                            'attributes' => array(
-                                'type' => 'checkbox',
-                                'name' => 'selected_dbs[]',
-                                'value' => 'sakila'
-                            )
-                        )
-                    ),
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'tool'
-                        ),
-                        'descendant' => array(
-                            'tag' => 'img',
-                            'attributes' => array(
-                                'title' => 'Replicated'
-                            )
-                        )
-                    ),
+                    '<td class="tool">',
+                    '<input type="checkbox" name="selected_dbs[]" class="checkall" title="pma" value="pma"'
                 )
             ),
             array(
@@ -281,21 +178,7 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
                     )
                 ),
                 array(
-                    array(
-                        'tag' => 'td',
-                        'attributes' => array(
-                            'class' => 'tool'
-                        ),
-                        'child' => array(
-                            'tag' => 'input',
-                            'attributes' => array(
-                                'type' => 'checkbox',
-                                'name' => 'selected_dbs[]',
-                                'value' => 'INFORMATION_SCHEMA',
-                                'disabled' => 'disabled'
-                            )
-                        )
-                    )
+                    '<input type="checkbox" name="selected_dbs[]" class="checkall" title="INFORMATION_SCHEMA" value="INFORMATION_SCHEMA" disabled="disabled"'
                 )
             )
         );

test/libraries/PMA_central_columns_test.php

@@ -446,8 +446,8 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
     public function testPMAGetHTMLforTableNavigation()
     {
         $result = PMA_getHTMLforTableNavigation(0, 0, 'phpmyadmin');
-        $this->assertTag(
-            array('tag' => 'table'),
+        $this->assertContains(
+            '<table',
             $result
         );
         $this->assertContains(
@@ -489,8 +489,9 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
      */
     public function testPMAGetCentralColumnsTableHeader()
     {
-        $this->assertTag(
-            array('tag' => 'thead'), PMA_getCentralColumnsTableHeader(
+        $this->assertContains(
+            '<thead',
+            PMA_getCentralColumnsTableHeader(
                 'column_heading', __('Click to sort'), 2
             )
         );
@@ -513,15 +514,21 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
             'col_attribute'=>''
         );
         $result = PMA_getHTMLforCentralColumnsTableRow($row, false, 1, 'phpmyadmin');
-        $this->assertTag(
-            array('tag' => 'tr'), $result
+        $this->assertContains(
+            '<tr',
+            $result
         );
         $this->assertContains(
             PMA_URL_getHiddenInputs('phpmyadmin'),
             $result
         );
-        $this->assertTag(
-            array('tag' => 'span', 'content'=>'col_test'), $result
+        $this->assertContains(
+            '<span',
+            $result
+        );
+        $this->assertContains(
+            'col_test',
+            $result
         );
         $this->assertContains(
             __('on update CURRENT_TIMESTAMP'),
@@ -614,8 +621,13 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
     public function testPMAGetHTMLforAddNewColumn()
     {
         $result = PMA_getHTMLforAddNewColumn('phpmyadmin');
-        $this->assertTag(
-            array('tag' => 'form','tag'=>'table'), $result
+        $this->assertContains(
+            '<form',
+            $result
+        );
+        $this->assertContains(
+            '<table',
+            $result
         );
         $this->assertContains(
             __('Add new column'),
@@ -672,12 +684,13 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
     {
         $db = 'PMA_db';
         $result = PMA_getHTMLforTableDropdown($db);
-        $this->assertTag(array('tag'=>'select', 'id'=>'table-select'), $result);
-        $this->assertTag(
-            array(
-                'tag'=>'option', 'attributes'=>array('value'=>'PMA_table'),
-                'content'=>'PMA_table'
-            ), $result
+        $this->assertContains(
+            '<select name="table-select" id="table-select"',
+            $result
+        );
+        $this->assertContains(
+            '<option value="PMA_table"',
+            $result
         );
     }
 
@@ -706,7 +719,14 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
     public function testPMAGetHTMLforAddCentralColumn()
     {
         $result = PMA_getHTMLforAddCentralColumn(20, 0, 'phpmyadmin');
-        $this->assertTag(array('tag'=>'table', 'tag'=>'form'), $result);
+        $this->assertContains(
+            '<table',
+            $result
+        );
+        $this->assertContains(
+            '<form',
+            $result
+        );
         $this->assertContains(
             PMA_URL_getHiddenInputs('phpmyadmin')
             . '<input type="hidden" name="add_column" value="add">'

test/libraries/PMA_insert_edit_test.php

@@ -554,42 +554,42 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ProtectBinary'] = 'blob';
         $column = array();
         $column['is_blob'] = true;
-        $this->assertTag(
-            PMA_getTagArray('<td class="center">', array('content' => 'Binary')),
+        $this->assertContains(
+            '<td class="center">Binary</td>',
             PMA_getFunctionColumn($column, false, '', '', array(), 0, 0, 0, false)
         );
 
         $GLOBALS['cfg']['ProtectBinary'] = 'all';
         $column['is_binary'] = true;
-        $this->assertTag(
-            PMA_getTagArray('<td class="center">', array('content' => 'Binary')),
+        $this->assertContains(
+            '<td class="center">Binary</td>',
             PMA_getFunctionColumn($column, true, '', '', array(), 0, 0, 0, false)
         );
 
         $GLOBALS['cfg']['ProtectBinary'] = 'noblob';
         $column['is_blob'] = false;
-        $this->assertTag(
-            PMA_getTagArray('<td class="center">', array('content' => 'Binary')),
+        $this->assertContains(
+            '<td class="center">Binary</td>',
             PMA_getFunctionColumn($column, true, '', '', array(), 0, 0, 0, false)
         );
 
         $GLOBALS['cfg']['ProtectBinary'] = false;
         $column['True_Type'] = 'enum';
-        $this->assertTag(
-            PMA_getTagArray('<td class="center">', array('content' => '--')),
+        $this->assertContains(
+            '<td class="center">--</td>',
             PMA_getFunctionColumn($column, true, '', '', array(), 0, 0, 0, false)
         );
 
         $column['True_Type'] = 'set';
-        $this->assertTag(
-            PMA_getTagArray('<td class="center">', array('content' => '--')),
+        $this->assertContains(
+            '<td class="center">--</td>',
             PMA_getFunctionColumn($column, true, '', '', array(), 0, 0, 0, false)
         );
 
         $column['True_Type'] = '';
         $column['pma_type'] = 'int';
-        $this->assertTag(
-            PMA_getTagArray('<td class="center">', array('content' => '--')),
+        $this->assertContains(
+            '<td class="center">--</td>',
             PMA_getFunctionColumn(
                 $column, true, '', '', array('int'), 0, 0, 0, false
             )
@@ -626,42 +626,32 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $column, 'a', true, 2, 0, 1, "<script>", $foreigners, array()
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fields_null_preva" value="on" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fields_null_preva" value="on" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="checkbox" class="checkbox_null" tabindex="2" '
-                . 'name="fields_nulla" checked="checked" id="field_1_2" '
-            ),
+        $this->assertContains(
+            '<input type="checkbox" class="checkbox_null" tabindex="2" '
+                . 'name="fields_nulla" checked="checked" id="field_1_2" ',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" class="nullify_code" name="nullify_codea" '
-                . 'value="2" '
-            ),
+        $this->assertContains(
+            '<input type="hidden" class="nullify_code" name="nullify_codea" '
+                . 'value="2" ',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" class="hashed_field" name="hashed_fielda" '
-                . 'value="foobar" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" class="hashed_field" name="hashed_fielda" '
+                . 'value="foobar" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" class="multi_edit" name="multi_edita" '
-                . 'value="<script>"'
-            ),
+        $this->assertContains(
+            '<input type="hidden" class="multi_edit" name="multi_edita" '
+                . 'value="<script>"',
             $result
         );
 
@@ -733,20 +723,15 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $column, 'a', 'b', 'd', 2, 0, 1, "abc", array('tbl', 'db'), 8, $titles
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fields_typeb" value="foreign"'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fields_typeb" value="foreign"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a class="ajax browse_foreign" href="browse_'
-                . 'foreigners.php?db=db&table=tbl&field=f&rownumber=8&data=abc'
-                . '&server=1&lang=en&token=token">',
-                array('content' => "\\'")
-            ),
+        $this->assertContains(
+            '<a class="ajax browse_foreign" href="browse_'
+                . 'foreigners.php?db=db&amp;table=tbl&amp;field=f&amp;rownumber=8&amp;data=abc'
+                . '&amp;server=1&amp;lang=en&amp;token=token">',
             $result
         );
 
@@ -786,10 +771,8 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fields_typeb" value="foreign"'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fields_typeb" value="foreign"',
             $result
         );
     }
@@ -812,21 +795,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $column['Type'] = 'char(10)';
         $column['True_Type'] = 'char';
         $result = PMA_getTextarea(
-            $column, 'a', 'b', 'd', 2, 0, 1, "abc/", 'foobar', 'CHAR'
-        );
-
-        $this->assertTag(
-            PMA_getTagArray(
-                '<textarea name="fieldsb" class="char" '
-                . 'data-maxlength="10" rows="5" cols="1" dir="abc/" '
-                . 'id="field_1_3" tabindex="2" data-type="CHAR">',
-                array('content' => 'foobar')
-            ),
-            $result
+            $column, 'a', 'b', '', 2, 0, 1, "abc/", 'foobar', 'CHAR'
         );
 
         $this->assertContains(
-            " d ",
+            '<textarea name="fieldsb" class="char" '
+                . 'data-maxlength="10" rows="5" cols="1" dir="abc/" '
+                . 'id="field_1_3" tabindex="2" data-type="CHAR">',
             $result
         );
     }
@@ -845,17 +820,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1, 'foobar'
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fields_typeb" value="enum" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fields_typeb" value="enum" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fieldsb" value=""'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fieldsb" value=""',
             $result
         );
 
@@ -864,17 +835,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1, 'foobar'
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fields_typeb" value="enum"'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fields_typeb" value="enum"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fieldsb" value="" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fieldsb" value="" />',
             $result
         );
 
@@ -937,19 +904,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="foo" selected="selected">',
-                array('content' => 'foo')
-            ),
+        $this->assertContains(
+            '<option value="foo" selected="selected">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="bar">',
-                array('content' => 'bar')
-            ),
+        $this->assertContains(
+            '<option value="bar">',
             $result
         );
 
@@ -968,11 +929,8 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $column, 'a', 'b', 2, 0, 1, '', $column_enum_values
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="foo" selected="selected">',
-                array('content' => 'foo')
-            ),
+        $this->assertContains(
+            '<option value="foo" selected="selected">',
             $result
         );
     }
@@ -1066,10 +1024,8 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
 
         $this->assertContains("a\n", $result);
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="fields_typeb" value="set" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="fields_typeb" value="set" />',
             $result
         );
 
@@ -1463,61 +1419,44 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             "tbl", "db", $where_clause_array, "localhost"
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form id="continueForm" method="post" action="tbl_replace.php" '
-                . 'name="continueForm">'
-            ),
+        $this->assertContains(
+            '<form id="continueForm" method="post" action="tbl_replace.php" '
+                . 'name="continueForm">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="db" value="db" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="db" value="db" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="table" value="tbl" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="table" value="tbl" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="goto" value="index.php" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="goto" value="index.php" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="err_url" value="localhost" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="err_url" value="localhost" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="sql_query" value="SELECT 1" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="sql_query" value="SELECT 1" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="where_clause[0]" value="a<b" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="where_clause[0]" value="a&lt;b" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="1" selected="selected">',
-                array('content' => '1')
-            ),
+        $this->assertContains(
+            '<option value="1" selected="selected">',
             $result
         );
     }
@@ -1532,25 +1471,19 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ShowHint'] = false;
         $result = PMA_getActionsPanel(null, 'back', 2, 1, false);
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="submit_type" class="control_at_footer" tabindex="4">'
-            ),
+        $this->assertContains(
+            '<select name="submit_type" class="control_at_footer" tabindex="4">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="after_insert">'
-            ),
+        $this->assertContains(
+            '<select name="after_insert"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="submit" class="control_at_footer" value="Go" '
-                . 'tabindex="9" id="buttonYes" '
-            ),
+        $this->assertContains(
+            '<input type="submit" class="control_at_footer" value="Go" '
+                . 'tabindex="9" id="buttonYes" ',
             $result
         );
     }
@@ -1564,18 +1497,13 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
     {
         $result = PMA_getSubmitTypeDropDown(array(), 2, 2);
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="submit_type" class="control_at_footer" tabindex="5">'
-            ),
+        $this->assertContains(
+            '<select name="submit_type" class="control_at_footer" tabindex="5">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="save">',
-                array('content' => 'Save')
-            ),
+        $this->assertContains(
+            '<option value="save">',
             $result
         );
     }
@@ -1589,24 +1517,18 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
     {
         $result = PMA_getAfterInsertDropDown("`t`.`f` = 2", 'new_insert', true);
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="new_insert" selected="selected">'
-            ),
+        $this->assertContains(
+            '<option value="new_insert" selected="selected">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="same_insert"'
-            ),
+        $this->assertContains(
+            '<option value="same_insert"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option value="edit_next" >'
-            ),
+        $this->assertContains(
+            '<option value="edit_next" >',
             $result
         );
     }
@@ -1621,27 +1543,21 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ShowHint'] = false;
         $result = PMA_getSubmitAndResetButtonForActionsPanel(1, 0);
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="submit" class="control_at_footer" value="Go" '
-                . 'tabindex="7" id="buttonYes" />'
-            ),
+        $this->assertContains(
+            '<input type="submit" class="control_at_footer" value="Go" '
+                . 'tabindex="7" id="buttonYes" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="button" class="preview_sql" value="Preview SQL" '
-                . 'tabindex="8" />'
-            ),
+        $this->assertContains(
+            '<input type="button" class="preview_sql" value="Preview SQL" '
+                . 'tabindex="8" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="reset" class="control_at_footer" value="Reset" '
-                . 'tabindex="9" />'
-            ),
+        $this->assertContains(
+            '<input type="reset" class="control_at_footer" value="Reset" '
+                . 'tabindex="9" />',
             $result
         );
     }
@@ -2941,41 +2857,33 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             'col',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option>',
-                array('content' => 'AES_ENCRYPT')
-            ),
+        $this->assertContains(
+                '<option>AES_ENCRYPT</option>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<span class="column_type">',
-                array('content' => 'varchar(20)')
-            ),
+        $this->assertContains(
+                '<span class="column_type">varchar(20)</span>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray('<tr class="noclick even">'),
+        $this->assertContains(
+            '<tr class="noclick even">',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray('<span class="default_value hide">'),
+        $this->assertContains(
+            '<span class="default_value hide">',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<img width="150" height="100" '
-                . 'alt="Image preview here"/>'
-            ),
+        $this->assertContains(
+            '<img src="" width="150" height="100" '
+                . 'alt="Image preview here"/>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="file" class="image-upload" '
+        $this->assertContains(
+            '<input type="file" '
                 . 'name="fields_upload[d89e2ddb530bb8953b290ab0793aecb0]" '
-                . 'accept="image/*"/>'
-            ),
+                . 'accept="image/*" '
+                . 'class="image-upload"'
+                . '/>',
             $actual
         );
 
@@ -3003,26 +2911,18 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             'qwerty',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<option>',
-                array('content' => 'UUID')
-            ),
+        $this->assertContains(
+                '<option>UUID</option>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<span class="column_type">',
-                array('content' => 'datetime')
-            ),
+        $this->assertContains(
+            '<span class="column_type">datetime</span>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" '
+        $this->assertContains(
+            '<input type="text" '
                 . 'name="fields[d8578edf8458ce06fbc5bb76a58c5ca4]" '
-                . 'value="12-10-14.000000">'
-            ),
+                . 'value="12-10-14.000000"',
             $actual
         );
     }
@@ -3058,38 +2958,24 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             'test',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<th>',
-                array('content' => 'Column')
-            ),
+        $this->assertContains(
+            '<th>Column</th>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<a>',
-                array('content' => 'Type')
-            ),
+        $this->assertContains(
+            '<a',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<th>',
-                array('content' => 'Value')
-            ),
+        $this->assertContains(
+            '<th>Value</th>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<span class="column_type">',
-                array('content' => 'longtext')
-            ),
+        $this->assertContains(
+            '<span class="column_type">longtext</span>',
             $actual
         );
-        $this->assertTag(
-            PMA_getTagArray(
-                '<textarea name="fields[098f6bcd4621d373cade4e832627b4f6]">'
-            ),
+        $this->assertContains(
+            '<textarea name="fields[098f6bcd4621d373cade4e832627b4f6]"',
             $actual
         );
     }