[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 7c5319: Fix merge issues (#18289)

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7c531997024626b378c9a9ec9106166654749df1 https://github.com/phpmyadmin/phpmyadmin/commit/7c531997024626b378c9a9ec9106... Author: Kamil Tekiela tekiela246@gmail.com Date: 2023-03-25 (Sat, 03 March 2023) -03:00

Changed paths: M libraries/classes/DatabaseInterface.php M phpstan-baseline.neon M psalm-baseline.xml M test/classes/Stubs/DbiDummy.php

Log Message: ----------- Fix merge issues (#18289)

* Fix type issues after merge

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

* Update DbiDummy.php

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

---------

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