Commit Graph

127558 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
5dce8f151f
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-31 16:38:40 -03:00
Maurício Meneghini Fauth
00ac9e5741
Update JavaScript dependencies
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-31 16:27:32 -03:00
Maurício Meneghini Fauth
115160e2e7
Merge branch 'QA_5_2'
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/18769

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-31 15:39:16 -03:00
Dmitrii Kustov
4bdf519588
Improve collations support for MariaDB 10.10+ (#18760)
* Added new charset queries

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Improve collations support for MariaDB 10.10+

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Using dbi to check for MariaDB

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Removed unnecessary query

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Cleanup

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Whitespaces

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Whitespaces

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Switched to getVersion()

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Removed use of version_compare

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Test for MariaDB 10.10+

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Update test/classes/CharsetsTest.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/18769

---------

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit ef92f1f484)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-31 15:28:20 -03:00
Dmitrii Kustov
ef92f1f484
Improve collations support for MariaDB 10.10+ (#18760)
* Added new charset queries

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Improve collations support for MariaDB 10.10+

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Using dbi to check for MariaDB

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Removed unnecessary query

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Cleanup

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Whitespaces

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Whitespaces

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Switched to getVersion()

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Removed use of version_compare

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Test for MariaDB 10.10+

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Update test/classes/CharsetsTest.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

---------

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-31 15:14:29 -03:00
Kristijan \"Fremen\" Velkovski
437d751163
Translated using Weblate (Macedonian)
Currently translated at 27.1% (929 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com>
2023-10-31 16:04:20 +01:00
Kristijan \"Fremen\" Velkovski
270a40f7c0
Translated using Weblate (Macedonian)
Currently translated at 25.8% (878 of 3403 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/
Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com>
2023-10-31 16:04:19 +01:00
phpMyAdmin bot
cbfb41cd76 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2023-10-29 00:18:16 +00:00
Maurício Meneghini Fauth
5379d443d3
Remove motranslator functions file from composer.json
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-27 18:20:12 -03:00
Maurício Meneghini Fauth
8d982e3ae2
Merge pull request #18781 from MauricioFauth/shellcheck-action
Add ShellCheck to CI
2023-10-27 08:08:46 -03:00
Maurício Meneghini Fauth
cd883c6d76
Fix issues reported by shellcheck
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-26 19:48:14 -03:00
Maurício Meneghini Fauth
5d6d2f512b
Add shellcheck to CI
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-25 15:17:22 -03:00
Maurício Meneghini Fauth
98b7f38d22
Merge pull request #18780 from MauricioFauth/js-dir
Move ./js directory to ./resources/js
2023-10-25 12:51:51 -03:00
Maurício Meneghini Fauth
d888c29e0d
Move ./js directory to ./resources/js
- Related to https://github.com/phpmyadmin/phpmyadmin/issues/18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-25 11:24:14 -03:00
Maurício Meneghini Fauth
36a22cb722
Merge pull request #18779 from MauricioFauth/composer-update
Update PHP dependencies
2023-10-25 09:09:04 -03:00
Maurício Meneghini Fauth
6a9034b46f
Update PHP dependencies
- Upgrading php-webdriver/webdriver (1.15.0 => 1.15.1)
- Upgrading phpmyadmin/sql-parser (dev-master 46ff7ec => dev-master 08f465a)
- Upgrading roave/security-advisories (dev-latest 26c07e7 => dev-latest 66671a6)
- Upgrading symfony/cache (v6.3.5 => v6.3.6)
- Upgrading symfony/var-exporter (v6.3.4 => v6.3.6)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-25 08:55:03 -03:00
Maurício Meneghini Fauth
7036da2128
Merge pull request #18778 from MauricioFauth/app-dir
Rename ./libraries directory to ./app
2023-10-24 18:58:53 -03:00
Maurício Meneghini Fauth
941c795085
Move ./cache directory to ./app/cache
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-24 17:24:06 -03:00
Maurício Meneghini Fauth
87c494fa5f
Rename ./libraries directory to ./app
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-24 16:58:48 -03:00
Pavol Linet
93143c487c
Translated using Weblate (Slovak)
Currently translated at 72.8% (2498 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/sk/
Signed-off-by: Pavol Linet <linet.pavol@gmail.com>
2023-10-24 13:03:44 +02:00
Pavol Linet
28bae97484
Translated using Weblate (Slovak)
Currently translated at 70.2% (2392 of 3403 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sk/
Signed-off-by: Pavol Linet <linet.pavol@gmail.com>
2023-10-24 11:03:13 +00:00
Maurício Meneghini Fauth
a02223f010
Fix unneeded consts in UtilTest
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-23 15:32:41 -03:00
Maurício Meneghini Fauth
4342b4293d
Merge pull request #18774 from kamil-tekiela/Display-Results-class
Refactor Results class
2023-10-23 14:53:12 -03:00
Kamil Tekiela
461655f4c1 Apply suggestions from code review
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-23 17:31:04 +01:00
phpMyAdmin bot
a3e21177a6 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2023-10-22 00:18:48 +00:00
Kamil Tekiela
2e81a808f7 Create UniqueCondition class
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 21:18:48 +01:00
Kamil Tekiela
b230b1ae31 Remove 1st param in getUniqueCondition()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 19:56:08 +01:00
Kamil Tekiela
d3b1714593 Remove $properties
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 19:46:24 +01:00
Kamil Tekiela
ba61dee11f Simplify getColumnParams()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 10:11:23 +01:00
Kamil Tekiela
62738f59c6 Fix param type in getSpecialLinkUrl()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 10:11:23 +01:00
Maurício Meneghini Fauth
0da07211aa
Merge pull request #18770 from kamil-tekiela/Fix-getSpecialLinkUrl
Fix param type in getSpecialLinkUrl()
2023-10-21 04:03:35 -03:00
Vlăduț Ilie
5a9cf9486a
Translated using Weblate (Romanian)
Currently translated at 91.8% (3146 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ro/
Signed-off-by: Vlăduț Ilie <vladilie94@gmail.com>
2023-10-21 05:00:42 +02:00
Vlăduț Ilie
ec5c8adfb1
Translated using Weblate (Romanian)
Currently translated at 90.6% (3085 of 3403 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ro/
Signed-off-by: Vlăduț Ilie <vladilie94@gmail.com>
2023-10-21 05:00:39 +02:00
Maurício Meneghini Fauth
e3f8168d75
Merge pull request #18772 from MauricioFauth/ChangeTableInfoActionTest
Add test for Zoom Search's change table info action
2023-10-20 23:14:55 -03:00
Maurício Meneghini Fauth
dd79dd46bb
Add test for Zoom Search's change table info action
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-20 18:48:52 -03:00
Kamil Tekiela
073a940d34 Fix param type in getSpecialLinkUrl()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-20 13:30:24 +01:00
Daniel Dimitrov
df6a7ccd35
Translated using Weblate (Macedonian)
Currently translated at 26.9% (922 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Daniel Dimitrov <dimitrov.daniel@hotmail.com>
2023-10-19 17:01:10 +02:00
Kristijan \"Fremen\" Velkovski
cdab0d5be0
Translated using Weblate (Macedonian)
Currently translated at 26.9% (922 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com>
2023-10-19 17:01:09 +02:00
Kristijan \"Fremen\" Velkovski
4a7f07b268
Translated using Weblate (Macedonian)
Currently translated at 25.5% (871 of 3403 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/
Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com>
2023-10-19 17:01:07 +02:00
Maurício Meneghini Fauth
1c54fb853e
Merge pull request #18768 from MauricioFauth/resources-sql-dir
Move ./sql directory to ./resources/sql
2023-10-18 14:58:08 -03:00
Maurício Meneghini Fauth
e10961d56b
Merge pull request #18767 from MauricioFauth/schema-tests
Add some basic unit tests to schema plugins
2023-10-18 14:51:56 -03:00
Maurício Meneghini Fauth
a4fad2488d
Move ./sql directory to ./resources/sql
- Related to https://github.com/phpmyadmin/phpmyadmin/issues/18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-18 13:40:38 -03:00
Maurício Meneghini Fauth
6620108700
Merge pull request #18765 from MauricioFauth/resources-templates
Move ./templates directory to ./resources/templates
2023-10-18 12:03:40 -03:00
Maurício Meneghini Fauth
c803c139e7
Add some basic unit tests to schema plugins
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-18 12:00:25 -03:00
Maurício Meneghini Fauth
984ca84bc5
Merge pull request #18766 from MauricioFauth/db-designer-export-errors
Fix some type errors when exporting from db designer
2023-10-17 17:34:29 -03:00
Maurício Meneghini Fauth
25beca2266
Fix some type errors when exporting from db designer
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-17 16:51:44 -03:00
Maurício Meneghini Fauth
b2b53c6e18
Move ./templates directory to ./resources/templates
- Related to https://github.com/phpmyadmin/phpmyadmin/issues/18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-17 13:57:07 -03:00
Maurício Meneghini Fauth
d43dbfc5b4
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-17 13:46:46 -03:00
Maurício Meneghini Fauth
dcaf778ef8
Update PHPStan baseline
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-17 13:11:03 -03:00
Maurício Meneghini Fauth
c3a489e441
Update Composer dependencies
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-17 12:58:31 -03:00