Move CentralColumns to the Database namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth
parent
355d9de1ad
commit
ea163ffcae
@ -7,8 +7,8 @@ declare(strict_types=1);
|
||||
|
||||
namespace PhpMyAdmin\Controllers\Database;
|
||||
|
||||
use PhpMyAdmin\CentralColumns;
|
||||
use PhpMyAdmin\Core;
|
||||
use PhpMyAdmin\Database\CentralColumns;
|
||||
use PhpMyAdmin\DatabaseInterface;
|
||||
use PhpMyAdmin\Message;
|
||||
use PhpMyAdmin\Response;
|
||||
|
||||
@ -4,12 +4,12 @@ declare(strict_types=1);
|
||||
|
||||
namespace PhpMyAdmin\Controllers\Database;
|
||||
|
||||
use PhpMyAdmin\CentralColumns;
|
||||
use PhpMyAdmin\Charsets;
|
||||
use PhpMyAdmin\CheckUserPrivileges;
|
||||
use PhpMyAdmin\Common;
|
||||
use PhpMyAdmin\Config\PageSettings;
|
||||
use PhpMyAdmin\Core;
|
||||
use PhpMyAdmin\Database\CentralColumns;
|
||||
use PhpMyAdmin\DatabaseInterface;
|
||||
use PhpMyAdmin\Html\Generator;
|
||||
use PhpMyAdmin\Message;
|
||||
|
||||
@ -4,7 +4,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace PhpMyAdmin\Controllers\Table;
|
||||
|
||||
use PhpMyAdmin\CentralColumns;
|
||||
use PhpMyAdmin\Charsets;
|
||||
use PhpMyAdmin\CheckUserPrivileges;
|
||||
use PhpMyAdmin\Common;
|
||||
@ -12,6 +11,7 @@ use PhpMyAdmin\Config\PageSettings;
|
||||
use PhpMyAdmin\Controllers\SqlController;
|
||||
use PhpMyAdmin\Core;
|
||||
use PhpMyAdmin\CreateAddField;
|
||||
use PhpMyAdmin\Database\CentralColumns;
|
||||
use PhpMyAdmin\DatabaseInterface;
|
||||
use PhpMyAdmin\Engines\Innodb;
|
||||
use PhpMyAdmin\Html\Generator;
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
<?php
|
||||
/**
|
||||
* Functions for displaying user preferences pages
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace PhpMyAdmin;
|
||||
namespace PhpMyAdmin\Database;
|
||||
|
||||
use PhpMyAdmin\Charsets;
|
||||
use PhpMyAdmin\Charsets\Charset;
|
||||
use PhpMyAdmin\Charsets\Collation;
|
||||
use PhpMyAdmin\DatabaseInterface;
|
||||
use PhpMyAdmin\Message;
|
||||
use PhpMyAdmin\Relation;
|
||||
use PhpMyAdmin\Template;
|
||||
use PhpMyAdmin\Util;
|
||||
use function array_unique;
|
||||
use function bin2hex;
|
||||
use function ceil;
|
||||
@ -23,9 +26,6 @@ use function mb_strtoupper;
|
||||
use function sprintf;
|
||||
use function trim;
|
||||
|
||||
/**
|
||||
* PhpMyAdmin\CentralColumns class
|
||||
*/
|
||||
class CentralColumns
|
||||
{
|
||||
/**
|
||||
@ -20,7 +20,7 @@ return [
|
||||
'arguments' => [CONFIG_FILE],
|
||||
],
|
||||
'central_columns' => [
|
||||
'class' => PhpMyAdmin\CentralColumns::class,
|
||||
'class' => PhpMyAdmin\Database\CentralColumns::class,
|
||||
'arguments' => ['@dbi'],
|
||||
],
|
||||
'check_user_privileges' => [
|
||||
|
||||
@ -1,20 +1,5 @@
|
||||
parameters:
|
||||
ignoreErrors:
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Message\\:\\:rawError\\(\\) expects string, bool\\|string given\\.$#"
|
||||
count: 2
|
||||
path: libraries/classes/CentralColumns.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$string of static method PhpMyAdmin\\\\Message\\:\\:error\\(\\) expects string, bool\\|string given\\.$#"
|
||||
count: 2
|
||||
path: libraries/classes/CentralColumns.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$message of method PhpMyAdmin\\\\Message\\:\\:addText\\(\\) expects string, bool\\|string given\\.$#"
|
||||
count: 1
|
||||
path: libraries/classes/CentralColumns.php
|
||||
|
||||
-
|
||||
message: "#^Strict comparison using \\=\\=\\= between array\\<int, string\\> and false will always evaluate to false\\.$#"
|
||||
count: 1
|
||||
@ -465,6 +450,21 @@ parameters:
|
||||
count: 1
|
||||
path: libraries/classes/CreateAddField.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Message\\:\\:rawError\\(\\) expects string, bool\\|string given\\.$#"
|
||||
count: 2
|
||||
path: libraries/classes/Database/CentralColumns.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$string of static method PhpMyAdmin\\\\Message\\:\\:error\\(\\) expects string, bool\\|string given\\.$#"
|
||||
count: 2
|
||||
path: libraries/classes/Database/CentralColumns.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$message of method PhpMyAdmin\\\\Message\\:\\:addText\\(\\) expects string, bool\\|string given\\.$#"
|
||||
count: 1
|
||||
path: libraries/classes/Database/CentralColumns.php
|
||||
|
||||
-
|
||||
message: "#^Offset 'DTN' does not exist on array\\('C_NAME' \\=\\> array\\<int, string\\>, \\?'DCN' \\=\\> array\\<int, string\\>, \\?'DTN' \\=\\> array\\<int, string\\>, \\?'SCN' \\=\\> array\\<int, string\\>, \\?'STN' \\=\\> array\\<int, string\\>\\)\\.$#"
|
||||
count: 1
|
||||
|
||||
@ -1,20 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<files psalm-version="3.16@d03e5ef057d6adc656c0ff7e166c50b73b4f48f3">
|
||||
<file src="libraries/classes/CentralColumns.php">
|
||||
<InvalidScalarArgument occurrences="1">
|
||||
<code>$tn_pageNow</code>
|
||||
</InvalidScalarArgument>
|
||||
<PossiblyInvalidArgument occurrences="5">
|
||||
<code>$this->dbi->getError()</code>
|
||||
<code>$this->dbi->getError()</code>
|
||||
<code>$this->dbi->getError(DatabaseInterface::CONNECT_CONTROL)</code>
|
||||
<code>$this->dbi->getError(DatabaseInterface::CONNECT_CONTROL)</code>
|
||||
<code>$this->dbi->getError(DatabaseInterface::CONNECT_CONTROL)</code>
|
||||
</PossiblyInvalidArgument>
|
||||
<TypeDoesNotContainType occurrences="1">
|
||||
<code>$table == ''</code>
|
||||
</TypeDoesNotContainType>
|
||||
</file>
|
||||
<file src="libraries/classes/Charsets.php">
|
||||
<TypeDoesNotContainType occurrences="1">
|
||||
<code>$pieces === false</code>
|
||||
@ -598,6 +583,21 @@
|
||||
<code>$_POST['field_extra'][$i] ?? false</code>
|
||||
</PossiblyFalseArgument>
|
||||
</file>
|
||||
<file src="libraries/classes/Database/CentralColumns.php">
|
||||
<InvalidScalarArgument occurrences="1">
|
||||
<code>$tn_pageNow</code>
|
||||
</InvalidScalarArgument>
|
||||
<PossiblyInvalidArgument occurrences="5">
|
||||
<code>$this->dbi->getError()</code>
|
||||
<code>$this->dbi->getError()</code>
|
||||
<code>$this->dbi->getError(DatabaseInterface::CONNECT_CONTROL)</code>
|
||||
<code>$this->dbi->getError(DatabaseInterface::CONNECT_CONTROL)</code>
|
||||
<code>$this->dbi->getError(DatabaseInterface::CONNECT_CONTROL)</code>
|
||||
</PossiblyInvalidArgument>
|
||||
<TypeDoesNotContainType occurrences="1">
|
||||
<code>$table == ''</code>
|
||||
</TypeDoesNotContainType>
|
||||
</file>
|
||||
<file src="libraries/classes/Database/DatabaseList.php">
|
||||
<PossiblyNullPropertyAssignmentValue occurrences="1">
|
||||
<code>null</code>
|
||||
|
||||
@ -1,21 +1,16 @@
|
||||
<?php
|
||||
/**
|
||||
* tests for PhpMyAdmin\CentralColumns
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace PhpMyAdmin\Tests;
|
||||
namespace PhpMyAdmin\Tests\Database;
|
||||
|
||||
use PhpMyAdmin\CentralColumns;
|
||||
use PhpMyAdmin\Database\CentralColumns;
|
||||
use PhpMyAdmin\DatabaseInterface;
|
||||
use PhpMyAdmin\Message;
|
||||
use PhpMyAdmin\Tests\AbstractTestCase;
|
||||
use PhpMyAdmin\Types;
|
||||
use function array_slice;
|
||||
|
||||
/**
|
||||
* tests for PhpMyAdmin\CentralColumns
|
||||
*/
|
||||
class CentralColumnsTest extends AbstractTestCase
|
||||
{
|
||||
/** @var CentralColumns */
|
||||
Loading…
Reference in New Issue
Block a user
