diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index c311c30f7e..c775cb9af6 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -18,6 +18,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\UserPreferences; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\HttpRequest; +use PhpMyAdmin\Config; /** * Indication for error handler (see end of this file). @@ -1750,5 +1751,5 @@ class Config } if (! defined('TESTSUITE')) { - register_shutdown_function(['PhpMyAdmin\Config', 'fatalErrorHandler']); + register_shutdown_function([Config::class, 'fatalErrorHandler']); } diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index db745fa0cf..5c8c698290 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -1512,8 +1512,8 @@ class Qbe if (empty($from_clause)) { // Create cartesian product $from_clause = implode( - ", ", - array_map(['PhpMyAdmin\Util', 'backquote'], $search_tables) + ', ', + array_map([Util::class, 'backquote'], $search_tables) ); } @@ -1622,7 +1622,7 @@ class Qbe // Add these tables as cartesian product before joined tables $join .= implode( ', ', - array_map(['PhpMyAdmin\Util', 'backquote'], $unfinalized) + array_map([Util::class, 'backquote'], $unfinalized) ); } } diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index d3b3c3f5ad..821e543d25 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -27,6 +27,9 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use \stdClass; use PhpMyAdmin\Plugins\TransformationsPlugin; +use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json; +use PhpMyAdmin\Plugins\Transformations\Output\Text_Octetstream_Sql; +use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql; /** * Handle all the functionalities related to displaying results @@ -262,22 +265,22 @@ class Results { $json_highlighting_data = [ 'libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php', - 'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json', + Text_Plain_Json::class, 'Text_Plain', ]; $sql_highlighting_data = [ 'libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php', - 'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql', + Text_Plain_Sql::class, 'Text_Plain', ]; $blob_sql_highlighting_data = [ 'libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php', - 'PhpMyAdmin\Plugins\Transformations\Output\Text_Octetstream_Sql', + Text_Octetstream_Sql::class, 'Text_Octetstream', ]; $link_data = [ 'libraries/classes/Plugins/Transformations/Text_Plain_Link.php', - 'PhpMyAdmin\Plugins\Transformations\Text_Plain_Link', + Text_Plain_Link::class, 'Text_Plain', ]; $this->transformation_info = [ diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index 4288359112..6a227abf21 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Util; use PhpMyAdmin\Url; +use PhpMyAdmin\Navigation\NavigationTree; /** * Displays a collapsible of database objects in the navigation frame @@ -880,7 +881,7 @@ class NavigationTree $this->groupTree(); $children = $this->_tree->children; usort($children, [ - 'PhpMyAdmin\\Navigation\\NavigationTree', + NavigationTree::class, 'sortNode', ]); $this->_setVisibility(); @@ -922,7 +923,7 @@ class NavigationTree $listContent .= $this->_getPageSelector($node); $children = $node->children; usort($children, [ - 'PhpMyAdmin\\Navigation\\NavigationTree', + NavigationTree::class, 'sortNode', ]); @@ -1228,7 +1229,7 @@ class NavigationTree usort( $children, [ - 'PhpMyAdmin\\Navigation\\NavigationTree', + NavigationTree::class, 'sortNode', ] ); @@ -1314,7 +1315,7 @@ class NavigationTree $children = $this->_tree->children; usort($children, [ - 'PhpMyAdmin\\Navigation\\NavigationTree', + NavigationTree::class, 'sortNode', ]); $this->_setVisibility(); diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php index 6aad9bfe19..b43f679dec 100644 --- a/libraries/classes/Plugins.php +++ b/libraries/classes/Plugins.php @@ -14,6 +14,14 @@ use PhpMyAdmin\Properties\Options\OptionsPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Properties\Plugins\PluginPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; +use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem; +use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; +use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; +use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; +use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem; +use PhpMyAdmin\Properties\Options\Items\DocPropertyItem; +use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; /** * PhpMyAdmin\Plugins class @@ -418,7 +426,7 @@ class Plugins $ret = null; $property_class = get_class($propertyItem); switch ($property_class) { - case 'PhpMyAdmin\Properties\Options\Items\BoolPropertyItem': + case BoolPropertyItem::class: $ret .= '
  • ' . "\n"; $ret .= 'getName() . '">' . self::getString($propertyItem->getText()) . ''; break; - case 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem': - echo 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem'; + case DocPropertyItem::class: + echo DocPropertyItem::class; break; - case 'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem': + case HiddenPropertyItem::class: $ret .= '
  • '; break; - case 'PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem': + case MessageOnlyPropertyItem::class: $ret .= '
  • ' . "\n"; $ret .= '

    ' . self::getString($propertyItem->getText()) . '

    '; break; - case 'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem': + case RadioPropertyItem::class: /** * @var \PhpMyAdmin\Properties\Options\Items\RadioPropertyItem $pitem */ @@ -485,7 +493,7 @@ class Plugins . self::getString($val) . '
  • '; } break; - case 'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem': + case SelectPropertyItem::class: /** * @var \PhpMyAdmin\Properties\Options\Items\SelectPropertyItem $pitem */ @@ -512,7 +520,7 @@ class Plugins $ret .= ''; break; - case 'PhpMyAdmin\Properties\Options\Items\TextPropertyItem': + case TextPropertyItem::class: /** * @var \PhpMyAdmin\Properties\Options\Items\TextPropertyItem $pitem */ @@ -537,7 +545,7 @@ class Plugins : '') . '>'; break; - case 'PhpMyAdmin\Properties\Options\Items\NumberPropertyItem': + case NumberPropertyItem::class: $ret .= '
  • ' . "\n"; $ret .= '