diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libraries/classes/Controllers/Table/GisVisualizationController.php | 2 | ||||
| -rw-r--r-- | libraries/classes/Dbal/MysqliResult.php | 2 | ||||
| -rw-r--r-- | libraries/classes/Dbal/ResultInterface.php | 2 | ||||
| -rwxr-xr-x | scripts/check-release-excludes.sh | 4 | ||||
| -rwxr-xr-x | scripts/create-release.sh | 10 | ||||
| -rw-r--r-- | test/classes/Stubs/DummyResult.php | 2 |
7 files changed, 18 insertions, 5 deletions
@@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog - issue Fix console toolbar UI when the bookmark feature is disabled and sql debug is enabled - issue #17543 Fix JS error on saving a new designer page - issue #17546 Fix JS error after using save as and open page operation on the designer +- issue Fix PHP warning on GIS visualization when there is only one GIS column 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index f07055ea0a..2cdfb6c691 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -171,7 +171,7 @@ final class GisVisualizationController extends AbstractController 'session_max_rows' => $rows, 'pos' => $pos, 'visualizationSettings[spatialColumn]' => $visualizationSettings['spatialColumn'], - 'visualizationSettings[labelColumn]' => $visualizationSettings['labelColumn'], + 'visualizationSettings[labelColumn]' => $visualizationSettings['labelColumn'] ?? null, ] )); diff --git a/libraries/classes/Dbal/MysqliResult.php b/libraries/classes/Dbal/MysqliResult.php index 987a84083b..a40c711049 100644 --- a/libraries/classes/Dbal/MysqliResult.php +++ b/libraries/classes/Dbal/MysqliResult.php @@ -44,7 +44,7 @@ final class MysqliResult implements ResultInterface * Returns a generator that traverses through the whole result set * and returns each row as an associative array * - * @return Generator<int, array<string, string|null>, mixed, void> + * @psalm-return Generator<int, array<string, string|null>, mixed, void> */ public function getIterator(): Generator { diff --git a/libraries/classes/Dbal/ResultInterface.php b/libraries/classes/Dbal/ResultInterface.php index 90ea9259c0..72092082c1 100644 --- a/libraries/classes/Dbal/ResultInterface.php +++ b/libraries/classes/Dbal/ResultInterface.php @@ -22,7 +22,7 @@ interface ResultInterface extends IteratorAggregate * Returns a generator that traverses through the whole result set * and returns each row as an associative array * - * @return Generator<int, array<string, string|null>, mixed, void> + * @psalm-return Generator<int, array<string, string|null>, mixed, void> */ public function getIterator(): Generator; diff --git a/scripts/check-release-excludes.sh b/scripts/check-release-excludes.sh index 8d3a95fb08..12ef39e25a 100755 --- a/scripts/check-release-excludes.sh +++ b/scripts/check-release-excludes.sh @@ -163,6 +163,8 @@ validateExtension() { ;; RELEASE-DATE-[1-9].[0-9].[0-9]-dev) ;; + RELEASE-DATE-[1-9].[0-9]+snapshot) + ;; CONTRIBUTING.md) ;; README) @@ -319,6 +321,8 @@ for filePath in ${FILE_LIST}; do foundFile;; *PERFORMANCE.md*) foundFile;; + *phar*) + foundFile;; *) ;; esac done diff --git a/scripts/create-release.sh b/scripts/create-release.sh index f7c2e746c9..9585461b38 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -201,9 +201,13 @@ cleanup_composer_vendors() { vendor/paragonie/constant_time_encoding/psalm.xml \ vendor/paragonie/constant_time_encoding/phpunit.xml.dist \ vendor/paragonie/constant_time_encoding/.travis.yml \ + vendor/paragonie/random_compat/other/build_phar.php \ + vendor/paragonie/random_compat/other \ vendor/paragonie/random_compat/build-phar.sh \ vendor/paragonie/random_compat/dist/random_compat.phar.pubkey \ vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc \ + vendor/paragonie/random_compat/dist \ + vendor/paragonie/random_compat/psalm-autoload.php \ vendor/paragonie/random_compat/psalm.xml \ vendor/paragonie/sodium_compat/.github/ \ vendor/paragonie/sodium_compat/dist/ \ @@ -218,11 +222,13 @@ cleanup_composer_vendors() { vendor/paragonie/sodium_compat/autoload-fast.php \ vendor/paragonie/sodium_compat/composer-php52.json \ vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php \ + vendor/paragonie/sodium_compat/src/PHP52 \ vendor/pragmarx/google2fa/phpstan.neon \ vendor/pragmarx/google2fa-qrcode/.scrutinizer.yml \ vendor/pragmarx/google2fa-qrcode/.travis.yml \ vendor/pragmarx/google2fa-qrcode/phpunit.xml \ vendor/pragmarx/google2fa-qrcode/tests \ + vendor/google/recaptcha/src/autoload.php \ vendor/google/recaptcha/app.yaml \ vendor/google/recaptcha/.travis.yml \ vendor/google/recaptcha/phpunit.xml.dist \ @@ -422,7 +428,7 @@ echo "* Removing unneeded files" rm -rf .github CODE_OF_CONDUCT.md DCO # Testsuite setup -rm -f .travis.yml .scrutinizer.yml .jshintrc .weblate codecov.yml +rm -f .scrutinizer.yml .weblate codecov.yml # Remove Doctum config file rm -f test/doctum-config.php @@ -538,6 +544,8 @@ for kit in $KITS ; do echo "* Removing source files" # Testsuite rm -rf test/ + # Template test files + rm -r templates/test/ rm phpunit.xml.* build.xml rm -f .editorconfig .browserslistrc .eslintignore .jshintrc .eslintrc.json .stylelintrc.json psalm.xml psalm-baseline.xml phpstan.neon.dist phpstan-baseline.neon phpcs.xml.dist jest.config.js infection.json.dist # Gettext po files diff --git a/test/classes/Stubs/DummyResult.php b/test/classes/Stubs/DummyResult.php index 1fa19296be..e062db7b69 100644 --- a/test/classes/Stubs/DummyResult.php +++ b/test/classes/Stubs/DummyResult.php @@ -46,7 +46,7 @@ class DummyResult implements ResultInterface * Returns a generator that traverses through the whole result set * and returns each row as an associative array * - * @return Generator<int, array<string, string|null>, mixed, void> + * @psalm-return Generator<int, array<string, string|null>, mixed, void> */ public function getIterator(): Generator { |