From a9b847ea7d8cdfc828310aa1d6221c3c2eecc922 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 7 Jul 2021 18:48:21 -0700
Subject: [PATCH] set-version.php - Fix autocommit for 'info.xml'

The 'set-version.php' script has an option `--commit` which should commit any updated files.

Before: Fails to commit changes to `ext/*/info.xml`

After: Does ocmmit changes to `ext/*/info.xml`
---
 tools/bin/scripts/set-version.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/bin/scripts/set-version.php b/tools/bin/scripts/set-version.php
index ef309e2f6a..b4be5a31ca 100755
--- a/tools/bin/scripts/set-version.php
+++ b/tools/bin/scripts/set-version.php
@@ -74,7 +74,8 @@ updateFile("sql/test_data_second_domain.mysql", function ($content) use ($newVer
   return str_replace($oldVersion, $newVersion, $content);
 });
 
-foreach (findCoreInfoXml() as $infoXml) {
+$infoXmls = findCoreInfoXml();
+foreach ($infoXmls as $infoXml) {
   updateXmlFile($infoXml, function (DOMDocument $dom) use ($newVersion) {
     foreach ($dom->getElementsByTagName('version') as $tag) {
       /** @var \DOMNode $tag */
@@ -85,7 +86,7 @@ foreach (findCoreInfoXml() as $infoXml) {
 
 if ($doCommit) {
   $files = array_filter(
-    ['xml/version.xml', 'sql/civicrm_generated.mysql', 'sql/test_data_second_domain.mysql', $phpFile, @$sqlFile],
+    array_merge(['xml/version.xml', 'sql/civicrm_generated.mysql', 'sql/test_data_second_domain.mysql', $phpFile, @$sqlFile], $infoXmls),
     'file_exists'
   );
   $filesEsc = implode(' ', array_map('escapeshellarg', $files));
-- 
2.25.1