From b27636d35aa2170af71ab2c294453132f9fba7ca Mon Sep 17 00:00:00 2001
From: Ted Bowman <41201-tedbow@users.noreply.drupalcode.org>
Date: Wed, 10 Apr 2024 15:14:28 +0000
Subject: [PATCH] Issue #3411392 by tedbow: tests fail on core merge requests
---
package_manager/tests/src/Build/TemplateProjectTestBase.php | 4 +++-
scripts/src/ConverterCommand.php | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package_manager/tests/src/Build/TemplateProjectTestBase.php b/package_manager/tests/src/Build/TemplateProjectTestBase.php
index 1b66daefb8..e6b3a46664 100644
--- a/package_manager/tests/src/Build/TemplateProjectTestBase.php
+++ b/package_manager/tests/src/Build/TemplateProjectTestBase.php
@@ -438,13 +438,15 @@ END;
// versions that are newer than the ones being polyfilled, which means we
// won't be able to build our test project because these polyfills aren't
// available in the local code base. Since we're guaranteed to be on PHP
- // 8.1 or later, no package should need to polyfill older versions.
+ // 8.3 or later, no package should need to polyfill older versions.
unset(
$requirements['symfony/polyfill-php72'],
$requirements['symfony/polyfill-php73'],
$requirements['symfony/polyfill-php74'],
$requirements['symfony/polyfill-php80'],
$requirements['symfony/polyfill-php81'],
+ // CORE_MR_ONLY:$requirements['symfony/polyfill-php82'],
+ // CORE_MR_ONLY:$requirements['symfony/polyfill-php83'],
);
// If this package requires any Drupal core packages, ensure it allows
// any version.
diff --git a/scripts/src/ConverterCommand.php b/scripts/src/ConverterCommand.php
index 33fae529ed..d3be95ff66 100644
--- a/scripts/src/ConverterCommand.php
+++ b/scripts/src/ConverterCommand.php
@@ -230,6 +230,7 @@ class ConverterCommand extends Command {
*/
private static function executeCommand(string $cmd): void {
$result = NULL;
+ self::info("Executing: $cmd");
system($cmd, $result);
if ($result !== 0) {
throw new \Exception("Command failed: $cmd");
@@ -604,7 +605,7 @@ class ConverterCommand extends Command {
$new_words = explode("\n", file_get_contents($dict_file_to_merge));
$words = array_merge($words, $new_words);
$words = array_filter(array_unique($words));
- natcasesort($words);
+ natsort($words);
file_put_contents($dict_file, implode("\n", $words) . "\n");
}
--
GitLab