Rename ServerStatusData to Server/Status/Data

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-07 14:07:04 -03:00 · 2017-09-07 14:07:04 -03:00 · cf354d29cd
commit cf354d29cd
parent b881c4cddb
19 changed files with 160 additions and 164 deletions
--- a/libraries/classes/Server/Status/Data.php
+++ b/libraries/classes/Server/Status/Data.php
@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * ServerStatusData class
+ * PhpMyAdmin\Server\Status\Data class
 * Used by server_status_*.php pages
 *
 * @package PhpMyAdmin
 */
-namespace PhpMyAdmin;
+namespace PhpMyAdmin\Server\Status;

 use PhpMyAdmin\Url;

@ -21,7 +21,7 @@ use PhpMyAdmin\Url;
 *
 * @package PhpMyAdmin
 */
-class ServerStatusData
+class Data
 {
    public $status;
    public $sections;
--- a/libraries/classes/Server/Status/Monitor.php
+++ b/libraries/classes/Server/Status/Monitor.php
@ -10,7 +10,7 @@
 namespace PhpMyAdmin\Server\Status;

 use PhpMyAdmin\Sanitize;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Util;

 require_once 'libraries/sysinfo.lib.php';
@ -20,11 +20,11 @@ class Monitor
    /**
     * Prints html with monitor
     *
-     * @param ServerStatusData $ServerStatusData Server status data
+     * @param Data $serverStatusData Server status data
     *
     * @return string
     */
-    public static function getHtmlForMonitor(ServerStatusData $ServerStatusData)
+    public static function getHtmlForMonitor(Data $serverStatusData)
    {
        $retval  = self::getHtmlForTabLinks();

@ -44,7 +44,7 @@ class Monitor
        $retval .= '<script type="text/javascript">';
        $retval .= 'variableNames = [ ';
        $i = 0;
-        foreach ($ServerStatusData->status as $name=>$value) {
+        foreach ($serverStatusData->status as $name=>$value) {
            if (is_numeric($value)) {
                if ($i++ > 0) {
                    $retval .= ", ";
@ -288,7 +288,7 @@ class Monitor
        $retval .= '<div class="clearfloat paddingtop"></div>';
        $retval .= '<div class="floatleft">';
        $retval .= __('Refresh rate') . '<br />';
-        $retval .= ServerStatusData::getHtmlForRefreshList(
+        $retval .= Data::getHtmlForRefreshList(
            'gridChartRefresh',
            5,
            Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
@ -337,11 +337,11 @@ class Monitor
    /**
     * Define some data and links needed on the client side
     *
-     * @param ServerStatusData $ServerStatusData Server status data
+     * @param Data $serverStatusData Server status data
     *
     * @return string
     */
-    public static function getHtmlForClientSideDataAndLinks($ServerStatusData)
+    public static function getHtmlForClientSideDataAndLinks(Data $serverStatusData)
    {
        /**
         * Define some data needed on the client side
@ -351,7 +351,7 @@ class Monitor
        $form .= sprintf($input, 'server_time', microtime(true) * 1000);
        $form .= sprintf($input, 'server_os', PMA_getSysInfoOs());
        $form .= sprintf($input, 'is_superuser', $GLOBALS['dbi']->isSuperuser());
-        $form .= sprintf($input, 'server_db_isLocal', $ServerStatusData->db_isLocal);
+        $form .= sprintf($input, 'server_db_isLocal', $serverStatusData->db_isLocal);
        $form .= '</form>';
        /**
         * Define some links used on client side
--- a/libraries/server_status.lib.php
+++ b/libraries/server_status.lib.php
@ -7,25 +7,25 @@
 *
 * @package PhpMyAdmin
 */
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 /**
 * Prints server status information: processes, connections and traffic
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForServerStatus($ServerStatusData)
+function PMA_getHtmlForServerStatus(Data $serverStatusData)
 {
    //display the server state General Information
-    $retval  = PMA_getHtmlForServerStateGeneralInfo($ServerStatusData);
+    $retval  = PMA_getHtmlForServerStateGeneralInfo($serverStatusData);

    //display the server state traffic information
-    $retval .= PMA_getHtmlForServerStateTraffic($ServerStatusData);
+    $retval .= PMA_getHtmlForServerStateTraffic($serverStatusData);

    //display the server state connection information
-    $retval .= PMA_getHtmlForServerStateConnections($ServerStatusData);
+    $retval .= PMA_getHtmlForServerStateConnections($serverStatusData);

    // display replication information
    if ($GLOBALS['replication_info']['master']['status']
@ -40,19 +40,19 @@ function PMA_getHtmlForServerStatus($ServerStatusData)
 /**
 * Prints server state General information
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
+function PMA_getHtmlForServerStateGeneralInfo(Data $serverStatusData)
 {
    $start_time = $GLOBALS['dbi']->fetchValue(
-        'SELECT UNIX_TIMESTAMP() - ' . $ServerStatusData->status['Uptime']
+        'SELECT UNIX_TIMESTAMP() - ' . $serverStatusData->status['Uptime']
    );

    $retval  = '<h3>';
-    $bytes_received = $ServerStatusData->status['Bytes_received'];
-    $bytes_sent = $ServerStatusData->status['Bytes_sent'];
+    $bytes_received = $serverStatusData->status['Bytes_received'];
+    $bytes_sent = $serverStatusData->status['Bytes_sent'];
    $retval .= sprintf(
        __('Network traffic since startup: %s'),
        implode(
@ -68,7 +68,7 @@ function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
    $retval .= '<p>';
    $retval .= sprintf(
        __('This MySQL server has been running for %1$s. It started up on %2$s.'),
-        PhpMyAdmin\Util::timespanFormat($ServerStatusData->status['Uptime']),
+        PhpMyAdmin\Util::timespanFormat($serverStatusData->status['Uptime']),
        PhpMyAdmin\Util::localisedDate($start_time)
    ) . "\n";
    $retval .= '</p>';
@ -126,13 +126,13 @@ function PMA_getHtmlForReplicationInfo()
 /**
 * Prints server state traffic information
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForServerStateTraffic($ServerStatusData)
+function PMA_getHtmlForServerStateTraffic(Data $serverStatusData)
 {
-    $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
+    $hour_factor    = 3600 / $serverStatusData->status['Uptime'];
    $retval  = '<table id="serverstatustraffic" class="width100 data noclick">';
    $retval .= '<thead>';
    $retval .= '<tr>';
@ -156,7 +156,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
    $retval .= implode(
        ' ',
        PhpMyAdmin\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_received'], 3, 1
+            $serverStatusData->status['Bytes_received'], 3, 1
        )
    );
    $retval .= '</td>';
@ -164,7 +164,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
    $retval .= implode(
        ' ',
        PhpMyAdmin\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_received'] * $hour_factor, 3, 1
+            $serverStatusData->status['Bytes_received'] * $hour_factor, 3, 1
        )
    );
    $retval .= '</td>';
@ -175,7 +175,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
    $retval .= implode(
        ' ',
        PhpMyAdmin\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_sent'], 3, 1
+            $serverStatusData->status['Bytes_sent'], 3, 1
        )
    );
    $retval .= '</td>';
@ -183,7 +183,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
    $retval .= implode(
        ' ',
        PhpMyAdmin\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_sent'] * $hour_factor, 3, 1
+            $serverStatusData->status['Bytes_sent'] * $hour_factor, 3, 1
        )
    );
    $retval .= '</td>';
@ -191,8 +191,8 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
    $retval .= '<tr>';
    $retval .= '<th class="name">' . __('Total') . '</th>';
    $retval .= '<td class="value">';
-    $bytes_received = $ServerStatusData->status['Bytes_received'];
-    $bytes_sent = $ServerStatusData->status['Bytes_sent'];
+    $bytes_received = $serverStatusData->status['Bytes_received'];
+    $bytes_sent = $serverStatusData->status['Bytes_sent'];
    $retval .= implode(
        ' ',
        PhpMyAdmin\Util::formatByteDown(
@ -201,8 +201,8 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
-    $bytes_received = $ServerStatusData->status['Bytes_received'];
-    $bytes_sent = $ServerStatusData->status['Bytes_sent'];
+    $bytes_received = $serverStatusData->status['Bytes_received'];
+    $bytes_sent = $serverStatusData->status['Bytes_sent'];
    $retval .= implode(
        ' ',
        PhpMyAdmin\Util::formatByteDown(
@ -219,13 +219,13 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
 /**
 * Prints server state connections information
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForServerStateConnections($ServerStatusData)
+function PMA_getHtmlForServerStateConnections(Data $serverStatusData)
 {
-    $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
+    $hour_factor    = 3600 / $serverStatusData->status['Uptime'];
    $retval  = '<table id="serverstatusconnections" class="width100 data noclick">';
    $retval .= '<thead>';
    $retval .= '<tr>';
@ -240,7 +240,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
    $retval .= '<th class="name">' . __('Max. concurrent connections') . '</th>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Max_used_connections'], 0
+        $serverStatusData->status['Max_used_connections'], 0
    );
    $retval .= '</td>';
    $retval .= '<td class="value">--- </td>';
@ -250,18 +250,18 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
    $retval .= '<th class="name">' . __('Failed attempts') . '</th>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Aborted_connects'], 4, 1, true
+        $serverStatusData->status['Aborted_connects'], 4, 1, true
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Aborted_connects'] * $hour_factor, 4, 2, true
+        $serverStatusData->status['Aborted_connects'] * $hour_factor, 4, 2, true
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
-    if ($ServerStatusData->status['Connections'] > 0) {
-        $abortNum = $ServerStatusData->status['Aborted_connects'];
-        $connectNum = $ServerStatusData->status['Connections'];
+    if ($serverStatusData->status['Connections'] > 0) {
+        $abortNum = $serverStatusData->status['Aborted_connects'];
+        $connectNum = $serverStatusData->status['Connections'];

        $retval .= PhpMyAdmin\Util::formatNumber(
            $abortNum * 100 / $connectNum,
@ -277,18 +277,18 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
    $retval .= '<th class="name">' . __('Aborted') . '</th>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Aborted_clients'], 4, 1, true
+        $serverStatusData->status['Aborted_clients'], 4, 1, true
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Aborted_clients'] * $hour_factor, 4, 2, true
+        $serverStatusData->status['Aborted_clients'] * $hour_factor, 4, 2, true
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
-    if ($ServerStatusData->status['Connections'] > 0) {
-        $abortNum = $ServerStatusData->status['Aborted_clients'];
-        $connectNum = $ServerStatusData->status['Connections'];
+    if ($serverStatusData->status['Connections'] > 0) {
+        $abortNum = $serverStatusData->status['Aborted_clients'];
+        $connectNum = $serverStatusData->status['Connections'];

        $retval .= PhpMyAdmin\Util::formatNumber(
            $abortNum * 100 / $connectNum,
@ -304,12 +304,12 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
    $retval .= '<th class="name">' . __('Total') . '</th>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Connections'], 4, 0
+        $serverStatusData->status['Connections'], 4, 0
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $ServerStatusData->status['Connections'] * $hour_factor, 4, 2
+        $serverStatusData->status['Connections'] * $hour_factor, 4, 2
    );
    $retval .= '</td>';
    $retval .= '<td class="value">';
@ -321,4 +321,3 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)

    return $retval;
 }
-
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@ -8,7 +8,7 @@
 * @package PhpMyAdmin
 */
 use PhpMyAdmin\Message;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Util;
 use PhpMyAdmin\Url;

@ -27,7 +27,7 @@ function PMA_getHtmlForProcessListAutoRefresh()
    )->getDisplay();
    $retval  = $notice . '<div class="tabLinks">';
    $retval .= '<label>' . __('Refresh rate') . ': ';
-    $retval .= ServerStatusData::getHtmlForRefreshList(
+    $retval .= Data::getHtmlForRefreshList(
        'refreshRate',
        5,
        Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
@ -299,4 +299,3 @@ function PMA_getHtmlForServerProcessItem($process, $show_full_sql)

    return $retval;
 }
-
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@ -7,21 +7,21 @@
 *
 * @package PhpMyAdmin
 */
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 /**
 * Returns the html content for the query statistics
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForQueryStatistics($ServerStatusData)
+function PMA_getHtmlForQueryStatistics(Data $serverStatusData)
 {
    $retval = '';

-    $hour_factor   = 3600 / $ServerStatusData->status['Uptime'];
-    $used_queries = $ServerStatusData->used_queries;
+    $hour_factor   = 3600 / $serverStatusData->status['Uptime'];
+    $used_queries = $serverStatusData->used_queries;
    $total_queries = array_sum($used_queries);

    $retval .= '<h3 id="serverstatusqueries">';
@ -43,21 +43,21 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
    $retval .= '<br />';
    $retval .= '&oslash; ' . __('per minute:') . ' ';
    $retval .= PhpMyAdmin\Util::formatNumber(
-        $total_queries * 60 / $ServerStatusData->status['Uptime'],
+        $total_queries * 60 / $serverStatusData->status['Uptime'],
        0
    );
    $retval .= '<br />';
-    if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
+    if ($total_queries / $serverStatusData->status['Uptime'] >= 1) {
        $retval .= '&oslash; ' . __('per second:') . ' ';
        $retval .= PhpMyAdmin\Util::formatNumber(
-            $total_queries / $ServerStatusData->status['Uptime'],
+            $total_queries / $serverStatusData->status['Uptime'],
            0
        );
    }
    $retval .= '</span>';
    $retval .= '</h3>';

-    $retval .= PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData);
+    $retval .= PMA_getHtmlForServerStatusQueriesDetails($serverStatusData);

    return $retval;
 }
@ -65,19 +65,19 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
 /**
 * Returns the html content for the query details
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
+function PMA_getHtmlForServerStatusQueriesDetails(Data $serverStatusData)
 {
-    $hour_factor   = 3600 / $ServerStatusData->status['Uptime'];
-    $used_queries = $ServerStatusData->used_queries;
+    $hour_factor   = 3600 / $serverStatusData->status['Uptime'];
+    $used_queries = $serverStatusData->used_queries;
    $total_queries = array_sum($used_queries);
    // reverse sort by value to show most used statements first
    arsort($used_queries);

-    //(- $ServerStatusData->status['Connections']);
+    //(- $serverStatusData->status['Connections']);
    $perc_factor    = 100 / $total_queries;

    $retval = '<table id="serverstatusqueriesdetails" '
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@ -7,17 +7,17 @@
 *
 * @package PhpMyAdmin
 */
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Url;

 /**
 * Returns the html for the list filter
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForFilter($ServerStatusData)
+function PMA_getHtmlForFilter(Data $serverStatusData)
 {
    $filterAlert = '';
    if (! empty($_REQUEST['filterAlert'])) {
@ -54,8 +54,8 @@ function PMA_getHtmlForFilter($ServerStatusData)
    $retval .= '<select id="filterCategory" name="filterCategory">';
    $retval .= '<option value="">' . __('Filter by category…') . '</option>';

-    foreach ($ServerStatusData->sections as $section_id => $section_name) {
-        if (isset($ServerStatusData->sectionUsed[$section_id])) {
+    foreach ($serverStatusData->sections as $section_id => $section_name) {
+        if (isset($serverStatusData->sectionUsed[$section_id])) {
            if (! empty($_REQUEST['filterCategory'])
                && $_REQUEST['filterCategory'] == $section_id
            ) {
@ -85,15 +85,15 @@ function PMA_getHtmlForFilter($ServerStatusData)
 /**
 * Prints the suggestion links
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForLinkSuggestions($ServerStatusData)
+function PMA_getHtmlForLinkSuggestions(Data $serverStatusData)
 {
    $retval  = '<div id="linkSuggestions" class="defaultLinks hide">';
    $retval .= '<p class="notice">' . __('Related links:');
-    foreach ($ServerStatusData->links as $section_name => $section_links) {
+    foreach ($serverStatusData->links as $section_name => $section_links) {
        $retval .= '<span class="status_' . $section_name . '"> ';
        $i = 0;
        foreach ($section_links as $link_name => $link_url) {
@ -119,11 +119,11 @@ function PMA_getHtmlForLinkSuggestions($ServerStatusData)
 /**
 * Returns a table with variables information
 *
- * @param ServerStatusData $ServerStatusData Server status data
+ * @param Data $serverStatusData Server status data
 *
 * @return string
 */
-function PMA_getHtmlForVariablesList($ServerStatusData)
+function PMA_getHtmlForVariablesList(Data $serverStatusData)
 {
    $retval  = '';
    $strShowStatus = PMA_getStatusVariablesDescriptions();
@ -162,25 +162,25 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
        'Qcache_lowmem_prunes' => 0,

        'Qcache_free_blocks' =>
-            isset($ServerStatusData->status['Qcache_total_blocks'])
-            ? $ServerStatusData->status['Qcache_total_blocks'] / 5
+            isset($serverStatusData->status['Qcache_total_blocks'])
+            ? $serverStatusData->status['Qcache_total_blocks'] / 5
            : 0,
        'Slow_launch_threads' => 0,

        // depends on Key_read_requests
        // normally lower then 1:0.01
-        'Key_reads' => isset($ServerStatusData->status['Key_read_requests'])
-            ? (0.01 * $ServerStatusData->status['Key_read_requests']) : 0,
+        'Key_reads' => isset($serverStatusData->status['Key_read_requests'])
+            ? (0.01 * $serverStatusData->status['Key_read_requests']) : 0,
        // depends on Key_write_requests
        // normally nearly 1:1
-        'Key_writes' => isset($ServerStatusData->status['Key_write_requests'])
-            ? (0.9 * $ServerStatusData->status['Key_write_requests']) : 0,
+        'Key_writes' => isset($serverStatusData->status['Key_write_requests'])
+            ? (0.9 * $serverStatusData->status['Key_write_requests']) : 0,

        'Key_buffer_fraction' => 0.5,

        // alert if more than 95% of thread cache is in use
-        'Threads_cached' => isset($ServerStatusData->variables['thread_cache_size'])
-            ? 0.95 * $ServerStatusData->variables['thread_cache_size'] : 0
+        'Threads_cached' => isset($serverStatusData->variables['thread_cache_size'])
+            ? 0.95 * $serverStatusData->variables['thread_cache_size'] : 0

        // higher is better
        // variable => min value
@ -188,7 +188,7 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
    );

    $retval .= PMA_getHtmlForRenderVariables(
-        $ServerStatusData,
+        $serverStatusData,
        $alerts,
        $strShowStatus
    );
@ -199,13 +199,13 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
 /**
 * Returns HTML for render variables list
 *
- * @param ServerStatusData $ServerStatusData Server status data
- * @param array            $alerts           Alert Array
- * @param array            $strShowStatus    Status Array
+ * @param Data  $serverStatusData Server status data
+ * @param array $alerts           Alert Array
+ * @param array $strShowStatus    Status Array
 *
 * @return string
 */
-function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatus)
+function PMA_getHtmlForRenderVariables(Data $serverStatusData, array $alerts, array $strShowStatus)
 {
    $retval = '<div class="responsivetable">';
    $retval  .= '<table class="data noclick" id="serverstatusvariables">';
@ -221,9 +221,9 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
    $retval .= '</thead>';
    $retval .= '<tbody>';

-    foreach ($ServerStatusData->status as $name => $value) {
-        $retval .= '<tr class="' . (isset($ServerStatusData->allocationMap[$name])
-                ?' s_' . $ServerStatusData->allocationMap[$name]
+    foreach ($serverStatusData->status as $name => $value) {
+        $retval .= '<tr class="' . (isset($serverStatusData->allocationMap[$name])
+                ?' s_' . $serverStatusData->allocationMap[$name]
                : '')
            . '">';

@ -294,8 +294,8 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
            $retval .= $strShowStatus[$name];
        }

-        if (isset($ServerStatusData->links[$name])) {
-            foreach ($ServerStatusData->links[$name] as $link_name => $link_url) {
+        if (isset($serverStatusData->links[$name])) {
+            foreach ($serverStatusData->links[$name] as $link_name => $link_url) {
                if ('doc' == $link_name) {
                    $retval .= PhpMyAdmin\Util::showMySQLDocu($link_url);
                } else {
--- a/server_status.php
+++ b/server_status.php
@ -8,7 +8,7 @@

 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
@ -26,7 +26,7 @@ require_once 'libraries/replication_gui.lib.php';
 $response = Response::getInstance();
 $response->addHTML('<div>');

-$serverStatusData = new ServerStatusData();
+$serverStatusData = new Data();
 $response->addHTML($serverStatusData->getMenuHtml());
 if ($serverStatusData->dataLoaded) {
    $response->addHTML(PMA_getHtmlForServerStatus($serverStatusData));
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@ -8,14 +8,14 @@

 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_status_advisor.lib.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';

-$serverStatusData = new ServerStatusData();
+$serverStatusData = new Data();

 $response = Response::getInstance();
 $scripts = $response->getHeader()->getScripts();
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@ -7,7 +7,7 @@
 */

 use PhpMyAdmin\Server\Status\Monitor;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Response;

 require_once 'libraries/common.inc.php';
@ -91,14 +91,14 @@ $scripts->addFile('server_status_sorter.js');
 /**
 * start output
 */
-$ServerStatusData = new ServerStatusData();
+$serverStatusData = new Data();

 /**
 * Output
 */
 $response->addHTML('<div>');
-$response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(Monitor::getHtmlForMonitor($ServerStatusData));
-$response->addHTML(Monitor::getHtmlForClientSideDataAndLinks($ServerStatusData));
+$response->addHTML($serverStatusData->getMenuHtml());
+$response->addHTML(Monitor::getHtmlForMonitor($serverStatusData));
+$response->addHTML(Monitor::getHtmlForClientSideDataAndLinks($serverStatusData));
 $response->addHTML('</div>');
 exit;
--- a/server_status_processes.php
+++ b/server_status_processes.php
@ -7,7 +7,7 @@
 */

 use PhpMyAdmin\Response;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
@ -19,7 +19,7 @@ require_once 'libraries/server_status_processes.lib.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';

-$ServerStatusData = new ServerStatusData();
+$serverStatusData = new Data();
 $response = Response::getInstance();

 /**
@ -54,7 +54,7 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
    $scripts  = $header->getScripts();
    $scripts->addFile('server_status_processes.js');
    $response->addHTML('<div>');
-    $response->addHTML($ServerStatusData->getMenuHtml());
+    $response->addHTML($serverStatusData->getMenuHtml());
    $response->addHTML(PMA_getHtmlForProcessListFilter());
    $response->addHTML(PMA_getHtmlForServerProcesslist());
    $response->addHTML(PMA_getHtmlForProcessListAutoRefresh());
--- a/server_status_queries.php
+++ b/server_status_queries.php
@ -9,7 +9,7 @@

 use PhpMyAdmin\Response;
 use PhpMyAdmin\Message;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
@ -17,7 +17,7 @@ require_once 'libraries/server_status_queries.lib.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';

-$serverStatusData = new ServerStatusData();
+$serverStatusData = new Data();

 $response = Response::getInstance();
 $header   = $response->getHeader();
--- a/server_status_variables.php
+++ b/server_status_variables.php
@ -8,7 +8,7 @@

 use PhpMyAdmin\Response;
 use PhpMyAdmin\Message;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
@ -32,7 +32,7 @@ if (isset($_REQUEST['flush'])) {
    unset($_flush_commands);
 }

-$serverStatusData = new ServerStatusData();
+$serverStatusData = new Data();

 $response = Response::getInstance();
 $header   = $response->getHeader();
--- a/test/classes/Server/Status/DataTest.php
+++ b/test/classes/Server/Status/DataTest.php
@ -1,25 +1,23 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for ServerStatusData class
+ * Test for PhpMyAdmin\Server\Status\Data class
 *
 * @package PhpMyAdmin-test
 */
+namespace PhpMyAdmin\Tests\Server\Status;

-/*
- * Include to test.
- */
 use PhpMyAdmin\Core;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;

 require_once 'test/PMATestCase.php';

 /**
- * Test for ServerStatusData class
+ * Test for PhpMyAdmin\Server\Status\Data class
 *
 * @package PhpMyAdmin-test
 */
-class ServerStatusDataTest extends PMATestCase
+class DataTest extends \PMATestCase
 {
    /**
     * @access protected
@ -44,7 +42,7 @@ class ServerStatusDataTest extends PMATestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_status = array(
            "Aborted_clients" => "0",
            "Aborted_connects" => "0",
@ -102,7 +100,7 @@ class ServerStatusDataTest extends PMATestCase

        $GLOBALS['dbi'] = $dbi;

-        $this->object = new ServerStatusData();
+        $this->object = new Data();
    }

    /**
--- a/test/classes/Server/Status/MonitorTest.php
+++ b/test/classes/Server/Status/MonitorTest.php
@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests\Server\Status;

 use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status\Monitor;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;

 /**
@ -24,7 +24,7 @@ class MonitorTest extends \PHPUnit_Framework_TestCase
     *
     * @return void
     */
-    public $ServerStatusData;
+    public $serverStatusData;

    /**
     * Test for setUp
@ -60,7 +60,7 @@ class MonitorTest extends \PHPUnit_Framework_TestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_status = array(
            "Aborted_clients" => "0",
            "Aborted_connects" => "0",
@ -110,7 +110,7 @@ class MonitorTest extends \PHPUnit_Framework_TestCase

        $GLOBALS['dbi'] = $dbi;

-        $this->ServerStatusData = new ServerStatusData();
+        $this->serverStatusData = new Data();
    }

    /**
@ -122,7 +122,7 @@ class MonitorTest extends \PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForMonitor()
    {
        //Call the test function
-        $html = Monitor::getHtmlForMonitor($this->ServerStatusData);
+        $html = Monitor::getHtmlForMonitor($this->serverStatusData);

        //validate 1: Monitor::getHtmlForTabLinks
        $this->assertContains(
@ -194,7 +194,7 @@ class MonitorTest extends \PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForClientSideDataAndLinks()
    {
        //Call the test function
-        $html = Monitor::getHtmlForClientSideDataAndLinks($this->ServerStatusData);
+        $html = Monitor::getHtmlForClientSideDataAndLinks($this->serverStatusData);

        //validate 1: Monitor::getHtmlForClientSideDataAndLinks
        $from = '<form id="js_data" class="hide">'
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@ -49,7 +49,7 @@ class ServerVariablesControllerTest extends PMATestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_session_variable = array(
            "auto_increment_increment" => "1",
            "auto_increment_offset" => "13",
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@ -7,7 +7,7 @@
 */

 use PhpMyAdmin\Core;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;

 require_once 'libraries/server_status_advisor.lib.php';
@ -26,7 +26,7 @@ class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
     *
     * @return void
     */
-    public $ServerStatusData;
+    public $serverStatusData;

    /**
     * Test for setUp
@ -65,7 +65,7 @@ class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_status = array(
            "Aborted_clients" => "0",
            "Aborted_connects" => "0",
@ -115,7 +115,7 @@ class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase

        $GLOBALS['dbi'] = $dbi;

-        $this->ServerStatusData = new ServerStatusData();
+        $this->serverStatusData = new Data();
    }

    /**
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@ -7,7 +7,7 @@
 */

 use PhpMyAdmin\Core;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;

 require_once 'libraries/server_status_queries.lib.php';
@ -26,7 +26,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
     *
     * @return void
     */
-    public $ServerStatusData;
+    public $serverStatusData;

    /**
     * Test for setUp
@ -59,7 +59,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_status = array(
            "Aborted_clients" => "0",
            "Aborted_connects" => "0",
@ -99,9 +99,9 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
            ->will($this->returnValueMap($fetchResult));

        $GLOBALS['dbi'] = $dbi;
-        $this->ServerStatusData = new ServerStatusData();
-        $this->ServerStatusData->status['Uptime'] = 36000;
-        $this->ServerStatusData->used_queries = array(
+        $this->serverStatusData = new Data();
+        $this->serverStatusData->status['Uptime'] = 36000;
+        $this->serverStatusData->used_queries = array(
            "Com_change_db" => "15",
            "Com_select" => "12",
            "Com_set_option" => "54",
@ -119,10 +119,10 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForQueryStatistics()
    {
        //Call the test function
-        $html = PMA_getHtmlForQueryStatistics($this->ServerStatusData);
+        $html = PMA_getHtmlForQueryStatistics($this->serverStatusData);

-        $hour_factor   = 3600 / $this->ServerStatusData->status['Uptime'];
-        $used_queries = $this->ServerStatusData->used_queries;
+        $hour_factor   = 3600 / $this->serverStatusData->status['Uptime'];
+        $used_queries = $this->serverStatusData->used_queries;
        $total_queries = array_sum($used_queries);

        $questions_from_start = sprintf(
@ -152,7 +152,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase

        //validate 3:per minute
        $value_per_minute = PhpMyAdmin\Util::formatNumber(
-            $total_queries * 60 / $this->ServerStatusData->status['Uptime'],
+            $total_queries * 60 / $this->serverStatusData->status['Uptime'],
            0
        );
        $this->assertContains(
@ -173,7 +173,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForServerStatusQueriesDetails()
    {
        //Call the test function
-        $html = PMA_getHtmlForServerStatusQueriesDetails($this->ServerStatusData);
+        $html = PMA_getHtmlForServerStatusQueriesDetails($this->serverStatusData);

        //validate 1: PMA_getHtmlForServerStatusQueriesDetails
        $this->assertContains(
--- a/test/libraries/PMA_server_status_test.php
+++ b/test/libraries/PMA_server_status_test.php
@ -7,7 +7,7 @@
 */

 use PhpMyAdmin\Core;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;

 require_once 'libraries/server_status.lib.php';
@ -26,7 +26,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
     *
     * @return void
     */
-    public $ServerStatusData;
+    public $serverStatusData;

    /**
     * Test for setUp
@ -52,7 +52,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_status = array(
            "Aborted_clients" => "0",
            "Aborted_connects" => "0",
@ -130,7 +130,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase

        $GLOBALS['dbi'] = $dbi;

-        $this->ServerStatusData = new ServerStatusData();
+        $this->serverStatusData = new Data();
    }

    /**
@ -147,15 +147,15 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
        $max_used_conn = 500;
        $aborted_conn = 200;
        $conn = 1000;
-        $this->ServerStatusData->status['Uptime'] = 36000;
-        $this->ServerStatusData->status['Bytes_received'] = $bytes_received;
-        $this->ServerStatusData->status['Bytes_sent'] = $bytes_sent;
-        $this->ServerStatusData->status['Max_used_connections'] = $max_used_conn;
-        $this->ServerStatusData->status['Aborted_connects'] = $aborted_conn;
-        $this->ServerStatusData->status['Connections'] = $conn;
+        $this->serverStatusData->status['Uptime'] = 36000;
+        $this->serverStatusData->status['Bytes_received'] = $bytes_received;
+        $this->serverStatusData->status['Bytes_sent'] = $bytes_sent;
+        $this->serverStatusData->status['Max_used_connections'] = $max_used_conn;
+        $this->serverStatusData->status['Aborted_connects'] = $aborted_conn;
+        $this->serverStatusData->status['Connections'] = $conn;

        //Call the test function
-        $html = PMA_getHtmlForServerStatus($this->ServerStatusData);
+        $html = PMA_getHtmlForServerStatus($this->serverStatusData);

        //validate 1: PMA_getHtmlForServerStateGeneralInfo
        //traffic: $bytes_received + $bytes_sent
@ -240,8 +240,8 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase

        $GLOBALS['replication_info']['master']['status'] = true;
        $GLOBALS['replication_info']['slave']['status'] = true;
-        $this->ServerStatusData->status['Connections'] = 0;
-        $html = PMA_getHtmlForServerStatus($this->ServerStatusData);
+        $this->serverStatusData->status['Connections'] = 0;
+        $html = PMA_getHtmlForServerStatus($this->serverStatusData);

        $this->assertContains(
            'This MySQL server works as <b>master</b> and <b>slave</b>',
@ -250,7 +250,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase

        $GLOBALS['replication_info']['master']['status'] = false;
        $GLOBALS['replication_info']['slave']['status'] = true;
-        $html = PMA_getHtmlForServerStatus($this->ServerStatusData);
+        $html = PMA_getHtmlForServerStatus($this->serverStatusData);

        $this->assertContains(
            'This MySQL server works as <b>slave</b>',
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@ -7,7 +7,7 @@
 */

 use PhpMyAdmin\Core;
-use PhpMyAdmin\ServerStatusData;
+use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;

 require_once 'libraries/server_status_variables.lib.php';
@ -26,7 +26,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
     *
     * @return void
     */
-    public $ServerStatusData;
+    public $serverStatusData;

    /**
     * Test for setUp
@ -63,7 +63,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
            ->disableOriginalConstructor()
            ->getMock();

-        //this data is needed when ServerStatusData constructs
+        //this data is needed when PhpMyAdmin\Server\Status\Data constructs
        $server_status = array(
            "Aborted_clients" => "0",
            "Aborted_connects" => "0",
@ -138,7 +138,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
            ->will($this->returnValueMap($fetchResult));

        $GLOBALS['dbi'] = $dbi;
-        $this->ServerStatusData = new ServerStatusData();
+        $this->serverStatusData = new Data();
    }

    /**
@ -149,7 +149,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForFilter()
    {
        //Call the test function
-        $html = PMA_getHtmlForFilter($this->ServerStatusData);
+        $html = PMA_getHtmlForFilter($this->serverStatusData);

        //validate 1: PMA_getHtmlForFilter
        $this->assertContains(
@ -188,7 +188,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForLinkSuggestions()
    {
        //Call the test function
-        $html = PMA_getHtmlForLinkSuggestions($this->ServerStatusData);
+        $html = PMA_getHtmlForLinkSuggestions($this->serverStatusData);

        //validate 1: PMA_getHtmlForLinkSuggestions
        $this->assertContains(
@ -219,7 +219,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
    public function testPMAGetHtmlForVariablesList()
    {
        //Call the test function
-        $html = PMA_getHtmlForVariablesList($this->ServerStatusData);
+        $html = PMA_getHtmlForVariablesList($this->serverStatusData);

        //validate 1: PMA_getHtmlForVariablesList
        $table = '<table class="data noclick" '