gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove useless comments, mark final and readonly

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-02-06 16:40:57 +01:00
parent 8973a9dd2d
commit de970d2291
2 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
psalm-baseline.xml
View File

@ -11016,13 +11016,6 @@
<PossiblyInvalidArgument>
<code><![CDATA[$_POST['primary_connection'] ?? null]]></code>
</PossiblyInvalidArgument>
<PossiblyUnusedMethod>
<code>__set</code>
</PossiblyUnusedMethod>
<PossiblyUnusedParam>
<code>$a</code>
<code>$b</code>
</PossiblyUnusedParam>
<UnusedProperty>
<code>$dbi</code>
</UnusedProperty>
@ -13370,6 +13363,10 @@
<code>DatabaseInterface::getInstance()</code>
<code>DatabaseInterface::getInstance()</code>
</DeprecatedMethod>
<InaccessibleProperty>
<code><![CDATA[$this->data->dataLoaded]]></code>
<code><![CDATA[$this->data->dataLoaded]]></code>
</InaccessibleProperty>
</file>
<file src="tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php">
<DeprecatedMethod>
@ -13434,6 +13431,10 @@
<code>Config::getInstance()</code>
<code>DatabaseInterface::getInstance()</code>
</DeprecatedMethod>
<InaccessibleProperty>
<code><![CDATA[$this->data->status]]></code>
<code><![CDATA[$this->data->usedQueries]]></code>
</InaccessibleProperty>
<MixedArgument>
<code>$totalQueries * $hourFactor</code>
<code><![CDATA[$totalQueries * 60 / $this->data->status['Uptime']]]></code>
@ -13455,6 +13456,14 @@
<code>DatabaseInterface::getInstance()</code>
<code>DatabaseInterface::getInstance()</code>
</DeprecatedMethod>
<InaccessibleProperty>
<code><![CDATA[$data->status]]></code>
<code><![CDATA[$data->status]]></code>
<code><![CDATA[$data->status]]></code>
<code><![CDATA[$data->status]]></code>
<code><![CDATA[$data->status]]></code>
<code><![CDATA[$data->status]]></code>
</InaccessibleProperty>
</file>
<file src="tests/classes/Controllers/Server/Status/VariablesControllerTest.php">
<DeprecatedMethod>

65
src/Server/Status/Data.php
View File

@ -1,8 +1,4 @@
<?php
/**
* PhpMyAdmin\Server\Status\Data class
* Used by server_status_*.php pages
*/
declare(strict_types=1);
@ -20,18 +16,17 @@ use function str_contains;
/**
* This class provides data about the server status
*
* All properties of the class are read-only
*
* TODO: Use lazy initialisation for some of the properties
* since not all of the server_status_*.php pages need
* all the data that this class provides.
*/
class Data
final class Data
{
/**
* variable name => section
* variable names match when they begin with the given string
*/
private const ALLOCATIONS = [
// variable name => section
// variable names match when they begin with the given string
'Com_' => 'com',
'Innodb_' => 'innodb',
'Ndb_' => 'ndb',
@ -74,32 +69,39 @@ class Data
'Opened_files' => 'files',
];
/** @var mixed[] */
/**
* @var mixed[]
* @readonly
* */
public array $status;
/** @var array<string, string> */
public array $sections;
public readonly array $sections;
/** @var mixed[] */
public array $variables;
public readonly array $variables;
/** @var mixed[] */
/**
* @var mixed[]
* @readonly
*/
public array $usedQueries;
/** @var string[] */
public array $allocationMap;
public readonly array $allocationMap;
/** @var mixed[] */
public array $links;
public readonly array $links;
public bool $dbIsLocal;
public readonly bool $dbIsLocal;
/** @var true[] */
public array $sectionUsed;
public readonly array $sectionUsed;
/** @readonly */
public bool $dataLoaded;
private ReplicationInfo $replicationInfo;
private readonly ReplicationInfo $replicationInfo;
public function getReplicationInfo(): ReplicationInfo
{
@ -107,25 +109,13 @@ class Data
}
/**
* An empty setter makes the above properties read-only
*
* @param string $a key
* @param mixed $b value
*/
public function __set(string $a, mixed $b): void
{
// Discard everything
}
/**
* Gets the sections for constructor
* Returns the map of section => section name (description)
*
* @return array<string, string>
*/
private function getSections(): array
{
return [
// section => section name (description)
'com' => 'Com',
'query' => __('SQL query'),
'innodb' => 'InnoDB',
@ -359,17 +349,10 @@ class Data
// which is excluded from $server_status['Questions'])
unset($usedQueries['Com_admin_commands']);
// Set all class properties
$this->dbIsLocal = false;
// can be null if $cfg['ServerDefault'] = 0;
$serverHostToLower = mb_strtolower($config->selectedServer['host']);
if (
$serverHostToLower === 'localhost'
$this->dbIsLocal = $serverHostToLower === 'localhost'
|| $config->selectedServer['host'] === '127.0.0.1'
|| $config->selectedServer['host'] === '::1'
) {
$this->dbIsLocal = true;
}
|| $config->selectedServer['host'] === '::1';
$this->status = $serverStatus;
$this->sections = $this->getSections();