Merge pull request #381 from semseysandor/convert-entities

upgrade/24.09.1, convert-entity: adds entity-types-php@2 mixin even the extension doesn't define new entities
totten · Jan 18, 2025 · 95b9357 · 95b9357
2 parents 351e988 + fc87235
commit 95b9357
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/CRM/CivixBundle/Command/ConvertEntityCommand.php b/src/CRM/CivixBundle/Command/ConvertEntityCommand.php
@@ -31,7 +31,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     Civix::boot(['output' => $output]);
     $this->assertCurrentFormat();
 
-    \Civix::io()->note("Finding entities");
+    \Civix::io()->note('Finding legacy xml entities');
 
     $isCore = $input->getOption('core-style');
 
@@ -46,7 +46,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
       $xmlFiles = $input->getArgument('xmlFiles');
     }
 
-    static::convertEntities($xmlFiles, $isCore);
+    if (!empty($xmlFiles)) {
+      static::convertEntities($xmlFiles, $isCore);
+    } else {
+      \Civix::io()->note('No legacy xml entities found');
+    }
 
     return 0;
   }
@@ -57,6 +61,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
    * @throws \Exception
    */
   public static function convertEntities(array $xmlFiles, bool $isCore): void {
+    if (empty($xmlFiles)) {
+      return;
+    }
     $xmlFiles = preg_grep('/files.xml$/', $xmlFiles, PREG_GREP_INVERT);
     $xmlFiles = preg_grep('/Schema.xml$/', $xmlFiles, PREG_GREP_INVERT);
 

diff --git a/upgrades/24.09.1.up.php b/upgrades/24.09.1.up.php
@@ -84,6 +84,7 @@
   }
 
   Civix::boot(['output' => Civix::output()]);
-  \CRM\CivixBundle\Command\ConvertEntityCommand::convertEntities($xmlSchemaFiles, FALSE);
-
+  if (!empty($xmlSchemaFiles)) {
+    \CRM\CivixBundle\Command\ConvertEntityCommand::convertEntities($xmlSchemaFiles, FALSE);
+  }
 };