Skip to content

Commit 582809d

Browse files
MauricioFauthMauricioFauth
committed
Move Table class into Table namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 646b4ff commit 582809d

35 files changed

Lines changed: 556 additions & 545 deletions

‎phpstan-baseline.neon‎

Lines changed: 377 additions & 377 deletions
Large diffs are not rendered by default.

‎psalm-baseline.xml‎

Lines changed: 138 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -11807,7 +11807,143 @@
1180711807
<code><![CDATA[$dataRow['transformation_options']]]></code>
1180811808
</PossiblyNullArgument>
1180911809
</file>
11810-
<file src="src/Table.php">
11810+
<file src="src/Table/ColumnsDefinition.php">
11811+
<DeprecatedMethod>
11812+
<code>Config::getInstance()</code>
11813+
</DeprecatedMethod>
11814+
<InvalidArrayOffset>
11815+
<code><![CDATA[$GLOBALS['mime_map']]]></code>
11816+
</InvalidArrayOffset>
11817+
<MixedArgument>
11818+
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']] ?? []]]></code>
11819+
<code><![CDATA[$availableMime[$mimeType . '_file'][$mimekey]]]></code>
11820+
<code><![CDATA[$columnMeta['Default']]]></code>
11821+
<code><![CDATA[$columnMeta['DefaultValue']]]></code>
11822+
<code><![CDATA[$columnMeta['Field']]]></code>
11823+
<code><![CDATA[$columnMeta['Type']]]></code>
11824+
<code><![CDATA[$extractedColumnSpec['attribute'] ?? '']]></code>
11825+
<code><![CDATA[$formParams['db']]]></code>
11826+
<code><![CDATA[$formParams['table']]]></code>
11827+
<code>$type</code>
11828+
<code><![CDATA[Util::getValueByKey($_POST, 'field_key.' . $columnNumber, '')]]></code>
11829+
</MixedArgument>
11830+
<MixedArrayAccess>
11831+
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
11832+
<code><![CDATA[$availableMime[$mimeType . '_file'][$mimekey]]]></code>
11833+
</MixedArrayAccess>
11834+
<MixedArrayAssignment>
11835+
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
11836+
<code><![CDATA[$availableMime[$mimeType . '_file_quoted'][$mimekey]]]></code>
11837+
</MixedArrayAssignment>
11838+
<MixedArrayOffset>
11839+
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
11840+
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
11841+
<code><![CDATA[$commentsMap[$columnMeta['Field']]]]></code>
11842+
</MixedArrayOffset>
11843+
<MixedAssignment>
11844+
<code><![CDATA[$GLOBALS['mime_map']]]></code>
11845+
<code><![CDATA[$columnMeta['Default']]]></code>
11846+
<code><![CDATA[$columnMeta['Default']]]></code>
11847+
<code><![CDATA[$columnMeta['Expression']]]></code>
11848+
<code><![CDATA[$columnMeta['Key']]]></code>
11849+
<code><![CDATA[$commentsMap[$columnMeta['Field']]]]></code>
11850+
<code>$defaultValue</code>
11851+
<code><![CDATA[$formParams['field_length_orig[' . $columnNumber . ']']]]></code>
11852+
<code><![CDATA[$formParams['field_name[' . $columnNumber . ']']]]></code>
11853+
<code><![CDATA[$formParams['field_orig[' . $columnNumber . ']']]]></code>
11854+
<code><![CDATA[$formParams['selected[' . $oFldNr . ']']]]></code>
11855+
<code>$length</code>
11856+
<code>$length</code>
11857+
<code>$oFldVal</code>
11858+
<code>$submitAttribute</code>
11859+
<code>$type</code>
11860+
</MixedAssignment>
11861+
<PossiblyInvalidArgument>
11862+
<code><![CDATA[$formParams['db']]]></code>
11863+
<code><![CDATA[$formParams['table']]]></code>
11864+
</PossiblyInvalidArgument>
11865+
<PossiblyInvalidCast>
11866+
<code><![CDATA[$_POST['after_field']]]></code>
11867+
<code><![CDATA[$formParams['db']]]></code>
11868+
<code><![CDATA[$formParams['table']]]></code>
11869+
</PossiblyInvalidCast>
11870+
<PossiblyUndefinedArrayOffset>
11871+
<code><![CDATA[$columnMeta['Default']]]></code>
11872+
<code><![CDATA[$columnMeta['DefaultValue']]]></code>
11873+
</PossiblyUndefinedArrayOffset>
11874+
</file>
11875+
<file src="src/Table/Search.php">
11876+
<MixedArgument>
11877+
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
11878+
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
11879+
<code>$column</code>
11880+
<code>$criteriaValues</code>
11881+
<code>$criteriaValues</code>
11882+
<code>$criteriaValues</code>
11883+
<code>$criteriaValues</code>
11884+
<code>$criteriaValues</code>
11885+
<code>$criteriaValues</code>
11886+
<code>$criteriaValues</code>
11887+
<code>$criteriaValues[$e]</code>
11888+
<code>$criteriaValues[0]</code>
11889+
<code>$operator</code>
11890+
<code>$operator</code>
11891+
<code>$value</code>
11892+
</MixedArgument>
11893+
<MixedArgumentTypeCoercion>
11894+
<code>$values</code>
11895+
</MixedArgumentTypeCoercion>
11896+
<MixedAssignment>
11897+
<code>$column</code>
11898+
<code>$operator</code>
11899+
<code>$value</code>
11900+
</MixedAssignment>
11901+
<MixedOperand>
11902+
<code>$criteriaValues</code>
11903+
<code>$criteriaValues</code>
11904+
<code>$criteriaValues</code>
11905+
<code><![CDATA[$needsQuoting ? $this->dbi->quoteString($criteriaValues) : $criteriaValues]]></code>
11906+
<code><![CDATA[$values[0] ?? '']]></code>
11907+
<code><![CDATA[$values[1] ?? '']]></code>
11908+
</MixedOperand>
11909+
<PossiblyInvalidArgument>
11910+
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
11911+
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
11912+
<code><![CDATA[$_POST['customWhereClause']]]></code>
11913+
<code><![CDATA[$_POST['orderByColumn']]]></code>
11914+
<code><![CDATA[$_POST['table']]]></code>
11915+
<code>$operator</code>
11916+
<code>$operator</code>
11917+
<code>$tmpGeomFunc</code>
11918+
</PossiblyInvalidArgument>
11919+
<PossiblyInvalidArrayOffset>
11920+
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
11921+
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
11922+
<code><![CDATA[$_POST['criteriaValues'][$columnIndex]]]></code>
11923+
</PossiblyInvalidArrayOffset>
11924+
<PossiblyInvalidCast>
11925+
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
11926+
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
11927+
<code>$operator</code>
11928+
<code>$operator</code>
11929+
</PossiblyInvalidCast>
11930+
<PossiblyInvalidIterator>
11931+
<code><![CDATA[$_POST['criteriaColumnOperators']]]></code>
11932+
<code>$columnsToDisplay</code>
11933+
</PossiblyInvalidIterator>
11934+
<PossiblyInvalidOperand>
11935+
<code><![CDATA[$_POST['customWhereClause']]]></code>
11936+
<code><![CDATA[$_POST['order']]]></code>
11937+
</PossiblyInvalidOperand>
11938+
<PossiblyNullArrayOffset>
11939+
<code>$geomFuncs</code>
11940+
</PossiblyNullArrayOffset>
11941+
<PossiblyNullOperand>
11942+
<code>$geomFunc</code>
11943+
<code>$geomFunc</code>
11944+
</PossiblyNullOperand>
11945+
</file>
11946+
<file src="src/Table/Table.php">
1181111947
<DeprecatedMethod>
1181211948
<code>Config::getInstance()</code>
1181311949
<code>Config::getInstance()</code>
@@ -12081,142 +12217,6 @@
1208112217
<code>$maintainRelations</code>
1208212218
</UnusedVariable>
1208312219
</file>
12084-
<file src="src/Table/ColumnsDefinition.php">
12085-
<DeprecatedMethod>
12086-
<code>Config::getInstance()</code>
12087-
</DeprecatedMethod>
12088-
<InvalidArrayOffset>
12089-
<code><![CDATA[$GLOBALS['mime_map']]]></code>
12090-
</InvalidArrayOffset>
12091-
<MixedArgument>
12092-
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']] ?? []]]></code>
12093-
<code><![CDATA[$availableMime[$mimeType . '_file'][$mimekey]]]></code>
12094-
<code><![CDATA[$columnMeta['Default']]]></code>
12095-
<code><![CDATA[$columnMeta['DefaultValue']]]></code>
12096-
<code><![CDATA[$columnMeta['Field']]]></code>
12097-
<code><![CDATA[$columnMeta['Type']]]></code>
12098-
<code><![CDATA[$extractedColumnSpec['attribute'] ?? '']]></code>
12099-
<code><![CDATA[$formParams['db']]]></code>
12100-
<code><![CDATA[$formParams['table']]]></code>
12101-
<code>$type</code>
12102-
<code><![CDATA[Util::getValueByKey($_POST, 'field_key.' . $columnNumber, '')]]></code>
12103-
</MixedArgument>
12104-
<MixedArrayAccess>
12105-
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
12106-
<code><![CDATA[$availableMime[$mimeType . '_file'][$mimekey]]]></code>
12107-
</MixedArrayAccess>
12108-
<MixedArrayAssignment>
12109-
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
12110-
<code><![CDATA[$availableMime[$mimeType . '_file_quoted'][$mimekey]]]></code>
12111-
</MixedArrayAssignment>
12112-
<MixedArrayOffset>
12113-
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
12114-
<code><![CDATA[$GLOBALS['mime_map'][$columnMeta['Field']]]]></code>
12115-
<code><![CDATA[$commentsMap[$columnMeta['Field']]]]></code>
12116-
</MixedArrayOffset>
12117-
<MixedAssignment>
12118-
<code><![CDATA[$GLOBALS['mime_map']]]></code>
12119-
<code><![CDATA[$columnMeta['Default']]]></code>
12120-
<code><![CDATA[$columnMeta['Default']]]></code>
12121-
<code><![CDATA[$columnMeta['Expression']]]></code>
12122-
<code><![CDATA[$columnMeta['Key']]]></code>
12123-
<code><![CDATA[$commentsMap[$columnMeta['Field']]]]></code>
12124-
<code>$defaultValue</code>
12125-
<code><![CDATA[$formParams['field_length_orig[' . $columnNumber . ']']]]></code>
12126-
<code><![CDATA[$formParams['field_name[' . $columnNumber . ']']]]></code>
12127-
<code><![CDATA[$formParams['field_orig[' . $columnNumber . ']']]]></code>
12128-
<code><![CDATA[$formParams['selected[' . $oFldNr . ']']]]></code>
12129-
<code>$length</code>
12130-
<code>$length</code>
12131-
<code>$oFldVal</code>
12132-
<code>$submitAttribute</code>
12133-
<code>$type</code>
12134-
</MixedAssignment>
12135-
<PossiblyInvalidArgument>
12136-
<code><![CDATA[$formParams['db']]]></code>
12137-
<code><![CDATA[$formParams['table']]]></code>
12138-
</PossiblyInvalidArgument>
12139-
<PossiblyInvalidCast>
12140-
<code><![CDATA[$_POST['after_field']]]></code>
12141-
<code><![CDATA[$formParams['db']]]></code>
12142-
<code><![CDATA[$formParams['table']]]></code>
12143-
</PossiblyInvalidCast>
12144-
<PossiblyUndefinedArrayOffset>
12145-
<code><![CDATA[$columnMeta['Default']]]></code>
12146-
<code><![CDATA[$columnMeta['DefaultValue']]]></code>
12147-
</PossiblyUndefinedArrayOffset>
12148-
</file>
12149-
<file src="src/Table/Search.php">
12150-
<MixedArgument>
12151-
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
12152-
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
12153-
<code>$column</code>
12154-
<code>$criteriaValues</code>
12155-
<code>$criteriaValues</code>
12156-
<code>$criteriaValues</code>
12157-
<code>$criteriaValues</code>
12158-
<code>$criteriaValues</code>
12159-
<code>$criteriaValues</code>
12160-
<code>$criteriaValues</code>
12161-
<code>$criteriaValues[$e]</code>
12162-
<code>$criteriaValues[0]</code>
12163-
<code>$operator</code>
12164-
<code>$operator</code>
12165-
<code>$value</code>
12166-
</MixedArgument>
12167-
<MixedArgumentTypeCoercion>
12168-
<code>$values</code>
12169-
</MixedArgumentTypeCoercion>
12170-
<MixedAssignment>
12171-
<code>$column</code>
12172-
<code>$operator</code>
12173-
<code>$value</code>
12174-
</MixedAssignment>
12175-
<MixedOperand>
12176-
<code>$criteriaValues</code>
12177-
<code>$criteriaValues</code>
12178-
<code>$criteriaValues</code>
12179-
<code><![CDATA[$needsQuoting ? $this->dbi->quoteString($criteriaValues) : $criteriaValues]]></code>
12180-
<code><![CDATA[$values[0] ?? '']]></code>
12181-
<code><![CDATA[$values[1] ?? '']]></code>
12182-
</MixedOperand>
12183-
<PossiblyInvalidArgument>
12184-
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
12185-
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
12186-
<code><![CDATA[$_POST['customWhereClause']]]></code>
12187-
<code><![CDATA[$_POST['orderByColumn']]]></code>
12188-
<code><![CDATA[$_POST['table']]]></code>
12189-
<code>$operator</code>
12190-
<code>$operator</code>
12191-
<code>$tmpGeomFunc</code>
12192-
</PossiblyInvalidArgument>
12193-
<PossiblyInvalidArrayOffset>
12194-
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
12195-
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
12196-
<code><![CDATA[$_POST['criteriaValues'][$columnIndex]]]></code>
12197-
</PossiblyInvalidArrayOffset>
12198-
<PossiblyInvalidCast>
12199-
<code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
12200-
<code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
12201-
<code>$operator</code>
12202-
<code>$operator</code>
12203-
</PossiblyInvalidCast>
12204-
<PossiblyInvalidIterator>
12205-
<code><![CDATA[$_POST['criteriaColumnOperators']]]></code>
12206-
<code>$columnsToDisplay</code>
12207-
</PossiblyInvalidIterator>
12208-
<PossiblyInvalidOperand>
12209-
<code><![CDATA[$_POST['customWhereClause']]]></code>
12210-
<code><![CDATA[$_POST['order']]]></code>
12211-
</PossiblyInvalidOperand>
12212-
<PossiblyNullArrayOffset>
12213-
<code>$geomFuncs</code>
12214-
</PossiblyNullArrayOffset>
12215-
<PossiblyNullOperand>
12216-
<code>$geomFunc</code>
12217-
<code>$geomFunc</code>
12218-
</PossiblyNullOperand>
12219-
</file>
1222012220
<file src="src/Template.php">
1222112221
<DeprecatedMethod>
1222212222
<code>Config::getInstance()</code>
@@ -15749,7 +15749,7 @@
1574915749
<code>DatabaseInterface::getInstance()</code>
1575015750
</DeprecatedMethod>
1575115751
</file>
15752-
<file src="test/classes/TableTest.php">
15752+
<file src="test/classes/Table/TableTest.php">
1575315753
<DeprecatedMethod>
1575415754
<code>Config::getInstance()</code>
1575515755
<code>Config::getInstance()</code>

‎src/ConfigStorage/Relation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use PhpMyAdmin\SqlParser\Parser;
1515
use PhpMyAdmin\SqlParser\Statements\CreateStatement;
1616
use PhpMyAdmin\SqlParser\Utils\Table as TableUtils;
17-
use PhpMyAdmin\Table;
17+
use PhpMyAdmin\Table\Table;
1818
use PhpMyAdmin\Util;
1919
use PhpMyAdmin\Version;
2020

‎src/Controllers/Database/Structure/CopyTableController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpMyAdmin\Message;
1111
use PhpMyAdmin\Operations;
1212
use PhpMyAdmin\ResponseRenderer;
13-
use PhpMyAdmin\Table;
13+
use PhpMyAdmin\Table\Table;
1414
use PhpMyAdmin\Template;
1515

1616
use function count;

‎src/Controllers/Database/Structure/CopyTableWithPrefixController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use PhpMyAdmin\Http\ServerRequest;
1010
use PhpMyAdmin\Message;
1111
use PhpMyAdmin\ResponseRenderer;
12-
use PhpMyAdmin\Table;
12+
use PhpMyAdmin\Table\Table;
1313
use PhpMyAdmin\Template;
1414

1515
use function count;

‎src/Controllers/Database/Structure/EmptyTableController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use PhpMyAdmin\Operations;
1717
use PhpMyAdmin\ResponseRenderer;
1818
use PhpMyAdmin\Sql;
19-
use PhpMyAdmin\Table;
19+
use PhpMyAdmin\Table\Table;
2020
use PhpMyAdmin\Template;
2121
use PhpMyAdmin\Transformations;
2222
use PhpMyAdmin\Util;

‎src/Controllers/Sql/ColumnPreferencesController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpMyAdmin\Http\ServerRequest;
1111
use PhpMyAdmin\Message;
1212
use PhpMyAdmin\ResponseRenderer;
13-
use PhpMyAdmin\Table;
13+
use PhpMyAdmin\Table\Table;
1414
use PhpMyAdmin\Template;
1515

1616
use function array_map;

‎src/Controllers/Table/RelationController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use PhpMyAdmin\Http\ServerRequest;
1616
use PhpMyAdmin\Index;
1717
use PhpMyAdmin\ResponseRenderer;
18-
use PhpMyAdmin\Table;
18+
use PhpMyAdmin\Table\Table;
1919
use PhpMyAdmin\Template;
2020
use PhpMyAdmin\Util;
2121
use PhpMyAdmin\Utils\ForeignKey;

‎src/Controllers/Table/ReplaceController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use PhpMyAdmin\Plugins\IOTransformationsPlugin;
2121
use PhpMyAdmin\Query\Generator as QueryGenerator;
2222
use PhpMyAdmin\ResponseRenderer;
23-
use PhpMyAdmin\Table;
23+
use PhpMyAdmin\Table\Table;
2424
use PhpMyAdmin\Template;
2525
use PhpMyAdmin\Transformations;
2626
use PhpMyAdmin\Util;

‎src/Controllers/Table/Structure/MoveColumnsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use PhpMyAdmin\Http\ServerRequest;
1010
use PhpMyAdmin\Message;
1111
use PhpMyAdmin\ResponseRenderer;
12-
use PhpMyAdmin\Table;
12+
use PhpMyAdmin\Table\Table;
1313
use PhpMyAdmin\Template;
1414
use PhpMyAdmin\Util;
1515

0 commit comments

Comments
 (0)