Merge branch '5.54' of github.com:civicrm/civicrm-core

diff --cc CRM/Contribute/Import/Parser/Contribution.php
Simple merge

diff --cc CRM/Core/DAO.php
Simple merge

diff --cc CRM/Import/DataSource.php
Simple merge

diff --cc CRM/Import/Parser.php
Simple merge

diff --cc ext/civiimport/Civi/Api4/Import.php
index 8a5d22f7231b4497728a91755a9be94d3eeb6664,c68f42fd5888e7e7305c10f1150d47e336a758ec..e5ac05749a82efcd8152f47b6b8b18df89bb6cd3
--- 1/ext/civiimport/Civi/Api4/Import.php
--- 2/ext/civiimport/Civi/Api4/Import.php
+++ b/ext/civiimport/Civi/Api4/Import.php
@@@ -63,8 -73,9 +73,10 @@@ class Import 
    /**
     * @param int $userJobID
     * @param bool $checkPermissions
-    * @return \Civi\Api4\Generic\DAOCreateAction
+    *
+    * @return \Civi\Api4\Import\Create
 -   * @throws \API_Exception
++   *
 +   * @throws \CRM_Core_Exception
     */
    public static function create(int $userJobID, bool $checkPermissions = TRUE): Create {
      return (new Create('Import_' . $userJobID, __FUNCTION__))

diff --cc ext/civiimport/Civi/Api4/Service/Spec/Provider/ImportSpecProvider.php
Simple merge

diff --cc tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php
Simple merge