make sure we store changes in PC when catching

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Fixed a bug where non-admin users weren’t able to view Single section entries. ([#12838](https://github.com/craftcms/cms/issues/12838))
 - Fixed an error that could occur when saving an element with eager-loaded relations. ([#12839](https://github.com/craftcms/cms/issues/12839))
 - Fixed a bug where Customize Sources modals weren’t showing source headings with no subsequent sources. ([#12840](https://github.com/craftcms/cms/issues/12840))
+- Fixed a bug where `entrify` commands could leave the database and project config data in inconsistent states, if aborted prematurely. ([#12850](https://github.com/craftcms/cms/pull/12850))
 - Added `craft\db\Connection::getDriverLabel()`.
 
 ## 4.4.0 - 2023-03-08

src/console/controllers/EntrifyController.php

@@ -104,6 +104,7 @@ public function actionCategories(string $categoryGroup): int
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
+        $projectConfigService = Craft::$app->getProjectConfig();
         $projectConfigChanged = false;
 
         if (
@@ -127,6 +128,9 @@ public function actionCategories(string $categoryGroup): int
             $author = $this->_author();
         } catch (InvalidConfigException $e) {
             $this->stderr($e->getMessage() . PHP_EOL, Console::FG_RED);
+            if ($projectConfigChanged) {
+                $projectConfigService->saveModifiedConfigData();
+            }
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
@@ -217,7 +221,6 @@ public function actionCategories(string $categoryGroup): int
 
         $this->success('Categories converted.');
 
-        $projectConfigService = Craft::$app->getProjectConfig();
         if (!$projectConfigService->readOnly) {
             if (!$categoryGroup->dateDeleted && $this->confirm("Delete the “{$categoryGroup}” category group?", true)) {
                 $this->do('Deleting category group', function() use ($categoryGroup) {
@@ -279,6 +282,7 @@ public function actionTags(string $tagGroup): int
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
+        $projectConfigService = Craft::$app->getProjectConfig();
         $projectConfigChanged = false;
 
         if (
@@ -302,6 +306,9 @@ public function actionTags(string $tagGroup): int
             $author = $this->_author();
         } catch (InvalidConfigException $e) {
             $this->stderr($e->getMessage() . PHP_EOL, Console::FG_RED);
+            if ($projectConfigChanged) {
+                $projectConfigService->saveModifiedConfigData();
+            }
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
@@ -353,7 +360,6 @@ public function actionTags(string $tagGroup): int
 
         $this->success('Tags converted.');
 
-        $projectConfigService = Craft::$app->getProjectConfig();
         if (!$projectConfigService->readOnly) {
             if (!$tagGroup->dateDeleted && $this->confirm("Delete the “{$tagGroup}” tag group?", true)) {
                 $this->do('Deleting tag group', function() use ($tagGroup) {
@@ -436,6 +442,9 @@ public function actionGlobalSet(string $globalSet): int
             $entryType = $this->_entryType();
         } catch (InvalidConfigException $e) {
             $this->stderr($e->getMessage() . PHP_EOL, Console::FG_RED);
+            if ($projectConfigChanged) {
+                Craft::$app->getProjectConfig()->saveModifiedConfigData();
+            }
             return ExitCode::UNSPECIFIED_ERROR;
         }