Commit Graph

3925 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
afcb4e406d
Add Config\Settings\SqlQueryBox::asArray() method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 15:22:56 -03:00
Maurício Meneghini Fauth
51a20c09fc
Add Config\Settings\Server::asArray() method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 15:16:26 -03:00
Maurício Meneghini Fauth
7fde991c6a
Add Config\Settings\Schema::asArray() method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 15:01:53 -03:00
Maurício Meneghini Fauth
2ef2e44201
Add Config\Settings\Import::asArray() method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 14:54:28 -03:00
Maurício Meneghini Fauth
395e46d637
Add Config\Settings\Export::asArray() method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 14:45:38 -03:00
Maurício Meneghini Fauth
50f9a90275
Add Config\Settings\Debug::asArray() method
Refactor the test to test each property individually.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 14:28:01 -03:00
Maurício Meneghini Fauth
7f5a1b799f
Add Config\Settings\Console::asArray() method
Refactor the test to test each property individually.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-28 17:52:40 -03:00
Maurício Meneghini Fauth
25cce47ae2
Merge config.default.php with Config\Settings classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-28 12:19:02 -03:00
Kamil Tekiela
276577ca2a
Remove $GLOBALS['PMA_PHP_SELF'] (#18149)
* Remove $GLOBALS['PMA_PHP_SELF']

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove $GLOBALS['PMA_PHP_SELF'] from tests

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Moved cleanupPathInfo to Routing

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove parse_url from getRootPath

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update baselines

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove invalid tests

Surely, we never expect PATH to be backslash delimited. The code is not designed to handle this and the tests for this don't make much sense.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix trailing slash in path

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-27 17:56:27 -03:00
Maurício Meneghini Fauth
342ab3f67a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 14:36:32 -03:00
Maurício Meneghini Fauth
f9c8035768
Add native parameter types to test classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 01:54:03 -03:00
Maurício Meneghini Fauth
16a0660a78
Add native property types to test classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 01:17:22 -03:00
Kamil Tekiela
0bdcaba2d2
Add native property types (#18143)
* Add native property types

Includes TypeHints.UnionTypeHintFormat

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Set some default values for properties

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Format and promote properties

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove redundant asserts

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant cast

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $tmanager->theme is never null

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant variable

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix empty on $statementInfo bool

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant casts

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant issets

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* getPacked() returns nullable string

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant if

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $this->content can be null

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Simplify ThemeManager::getInstance()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use isset for checking if property is initialized

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use nullable instead of uninitialized property

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* password is no longer nullable

I can't verify that none of the globals ever tried to set it to null, but the variable should never be nullable.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update baselines

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $same_wide_width param can be float or int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update Message.php

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Cast Sub_part to int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix one line doc comments

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-26 23:30:41 -03:00
William Desportes
f3aa3639b3
Remove chdir from GitTest after fixing #18112
Ref: d9a6f82bc1

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-26 23:57:54 +01:00
Maurício Meneghini Fauth
b07f039578
Add missing native return types
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 21:22:24 -03:00
Maurício Meneghini Fauth
556594b4cd
Fix coding standard spacing issues
- Fixes one line doc comments
- Fixes parent call spacing
- Fixes constant spacing

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 21:06:17 -03:00
Maurício Meneghini Fauth
77957a69a5
Add trailing comma for multi-line functions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 20:48:46 -03:00
Kamil Tekiela
e8c5eef6f8
Remove annoying empty statements (#18114)
* Remove annoying empty statements

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Make $extra strict and stop passing false to it

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Make $page strict and stop passing null

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-24 20:11:37 -03:00
Maurício Meneghini Fauth
a7dd3bd380
Merge pull request #18118 from MoonE/gis-generate-params
Proper method inheritance for gis generateParams
2023-02-24 19:35:09 -03:00
Maurício Meneghini Fauth
38f6b238db
Move public files to the public directory
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 15:36:31 -03:00
Maurício Meneghini Fauth
bfd5db406d
Improve array type inference for some tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-23 17:02:54 -03:00
Maximilian Krög
818c2d99d6
Reduce code duplication in gis generateParams
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-02-23 20:01:12 +01:00
Maximilian Krög
dabfdab390
Proper method inheritance for gis generateParams
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-02-23 20:01:07 +01:00
Kamil Tekiela
902d1a1e77
Add native return type hints (#18126)
* Add remaining native return type hints to flush out bugs

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Cast the mixed value to int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix tests

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* getAutoIncrement() is supposed to return string

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Cast values to string in DummyResult

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Make getCollation() return non-nullable string

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Cast seqInIndex to int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Cast $cardinality to int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* createFile may return false

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove redundant cast

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update baselines

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-23 15:43:36 -03:00
Maurício Meneghini Fauth
efb0c451cd
Upgrade PHPUnit to version 10.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-22 17:19:20 -03:00
Maurício Meneghini Fauth
ceaee6ccb8
Remove call to PHPUnit's internal method setOutputCallback()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-22 15:17:02 -03:00
Maurício Meneghini Fauth
9be8f67aeb
Add static for Display\ResultsTest::dataProviderSortOrder()
PHPUnit 10 warns that data providers should be static methods.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-22 14:27:07 -03:00
Maurício Meneghini Fauth
aac7aab196
Remove withConsecutive() from VersionInformationTest
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-22 14:15:17 -03:00
Maurício Meneghini Fauth
3a5a385551
Refactor ExportSqlTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-22 13:11:31 -03:00
Kamil Tekiela
17e89ad0dc Set types in OptionsPropertySubgroup
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 23:55:14 +00:00
Kamil Tekiela
e545af4bee Use SplObjectStorage instead of an array
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 23:55:09 +00:00
Maurício Meneghini Fauth
cb67fa306d
Remove Reflection's setAccessible() method
This method is no-op since PHP 8.1.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 20:35:45 -03:00
Maurício Meneghini Fauth
f2bdca0439
Refactor some Command tests to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 19:52:17 -03:00
Maurício Meneghini Fauth
d5b068b8e3
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 19:32:32 -03:00
Maurício Meneghini Fauth
1ffd881fb4
Refactor ConfigStorage\RelationCleanup::user()
- Replaces escapeString() with quoteString()

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 18:22:39 -03:00
Maurício Meneghini Fauth
b4f9063ceb
Refactor ConfigStorage\RelationCleanup::database()
- Replaces escapeString() with quoteString()

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 17:54:20 -03:00
Maurício Meneghini Fauth
bddaa399af
Refactor ConfigStorage\RelationCleanup::table()
- Replaces escapeString() with quoteString()

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 17:19:10 -03:00
Maurício Meneghini Fauth
c4a5440cf0
Refactor ConfigStorage\RelationCleanup::column()
- Replaces escapeString() with quoteString()

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 15:51:24 -03:00
Maurício Meneghini Fauth
e7a5cc897a
Refactor Server\PrivilegesTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 14:56:25 -03:00
Maurício Meneghini Fauth
0ba371f921
Refactor ConfigStorage\UserGroups::delete()
- Extracts dbi global variable
- Replaces escapeString with quoteString

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 14:40:25 -03:00
Maurício Meneghini Fauth
19762dbf75
Refactor TrackerTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 14:09:05 -03:00
Maurício Meneghini Fauth
2722ea717d
Replace escapeString with quoteString in AccountLocking class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 13:43:14 -03:00
Maurício Meneghini Fauth
5cf1ec8bc3
Refactor UtilTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 13:22:30 -03:00
Kamil Tekiela
54e4ec68fd
Stop using PHP_EOL (#18101)
* s/PHP_EOL/"\n"

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* PHP_EOL seems to have been intentional here

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Merge concats together

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 11:58:56 -03:00
Maurício Meneghini Fauth
47846068fa
Remove some useless comments
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 23:45:06 -03:00
Maurício Meneghini Fauth
4ff3724c3f
Use union with null instead of short nullable type
Since union type are now possible, using union with null makes more
clear that it is a union type.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 21:48:19 -03:00
Maurício Meneghini Fauth
8eb1cef07d
Use generic template for ExportRelationSchema::$diagram
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 21:18:39 -03:00
Maurício Meneghini Fauth
772648a97b
Use DatabaseName object for ExportRelationSchema::$db
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 20:30:29 -03:00
William Desportes
9743c82ba3
Write tests for #16851
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-20 23:52:40 +01:00
Maurício Meneghini Fauth
bd095c7bb4
Merge pull request #18132 from kamil-tekiela/fix-after-merge
Fix merge issues
2023-02-20 18:24:18 -03:00