Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 945d887a1046b3f607e68d95d5d6360364d43017
https://github.com/phpmyadmin/phpmyadmin/commit/945d887a1046b3f607e68d95d5d…
Author: Kamil Tekiela <tekiela246(a)gmail.com>
Date: 2021-12-09 (Thu, 12 December 2021) +00:00
Changed paths:
M libraries/classes/Charsets.php
M libraries/classes/Charsets/Charset.php
M libraries/classes/Charsets/Collation.php
M libraries/classes/Controllers/Database/ImportController.php
M libraries/classes/Controllers/HomeController.php
M libraries/classes/Controllers/Server/CollationsController.php
M libraries/classes/Controllers/Server/DatabasesController.php
M libraries/classes/Controllers/Server/ImportController.php
M libraries/classes/Controllers/Table/ImportController.php
M libraries/classes/Database/CentralColumns.php
M libraries/classes/Database/Routines.php
M libraries/classes/Normalization.php
M libraries/classes/Table/ColumnsDefinition.php
M phpstan-baseline.neon
M psalm-baseline.xml
M templates/import.twig
Log Message:
-----------
Fix var annotation for Charset and Collation
Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com>
Commit: e68c26672c78bee45903f68db3a23c36ec76979c
https://github.com/phpmyadmin/phpmyadmin/commit/e68c26672c78bee45903f68db3a…
Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev>
Date: 2021-12-10 (Fri, 12 December 2021) -03:00
Changed paths:
M libraries/classes/Charsets.php
M libraries/classes/Charsets/Charset.php
M libraries/classes/Charsets/Collation.php
M libraries/classes/Controllers/Database/ImportController.php
M libraries/classes/Controllers/HomeController.php
M libraries/classes/Controllers/Server/CollationsController.php
M libraries/classes/Controllers/Server/DatabasesController.php
M libraries/classes/Controllers/Server/ImportController.php
M libraries/classes/Controllers/Table/ImportController.php
M libraries/classes/Database/CentralColumns.php
M libraries/classes/Database/Routines.php
M libraries/classes/Normalization.php
M libraries/classes/Table/ColumnsDefinition.php
M phpstan-baseline.neon
M psalm-baseline.xml
M templates/import.twig
Log Message:
-----------
Merge pull request #17235 from kamil-tekiela/Fix-var-annotation-for-Charset-and-Collation
Fix var annotation for Charset and Collation