Skip to content
Snippets Groups Projects
Commit b27636d3 authored by Ted Bowman's avatar Ted Bowman
Browse files

Issue #3411392 by tedbow: tests fail on core merge requests

parent 68be08a5
No related branches found
No related tags found
2 merge requests!1100Issue #3436993: Ensure exceptions are shown if updating extensions and there...,!1054Resolve #3411392 "11 x"
Pipeline #142993 passed
...@@ -438,13 +438,15 @@ END; ...@@ -438,13 +438,15 @@ END;
// versions that are newer than the ones being polyfilled, which means we // 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 // 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 // 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( unset(
$requirements['symfony/polyfill-php72'], $requirements['symfony/polyfill-php72'],
$requirements['symfony/polyfill-php73'], $requirements['symfony/polyfill-php73'],
$requirements['symfony/polyfill-php74'], $requirements['symfony/polyfill-php74'],
$requirements['symfony/polyfill-php80'], $requirements['symfony/polyfill-php80'],
$requirements['symfony/polyfill-php81'], $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 // If this package requires any Drupal core packages, ensure it allows
// any version. // any version.
......
...@@ -230,6 +230,7 @@ class ConverterCommand extends Command { ...@@ -230,6 +230,7 @@ class ConverterCommand extends Command {
*/ */
private static function executeCommand(string $cmd): void { private static function executeCommand(string $cmd): void {
$result = NULL; $result = NULL;
self::info("Executing: $cmd");
system($cmd, $result); system($cmd, $result);
if ($result !== 0) { if ($result !== 0) {
throw new \Exception("Command failed: $cmd"); throw new \Exception("Command failed: $cmd");
...@@ -604,7 +605,7 @@ class ConverterCommand extends Command { ...@@ -604,7 +605,7 @@ class ConverterCommand extends Command {
$new_words = explode("\n", file_get_contents($dict_file_to_merge)); $new_words = explode("\n", file_get_contents($dict_file_to_merge));
$words = array_merge($words, $new_words); $words = array_merge($words, $new_words);
$words = array_filter(array_unique($words)); $words = array_filter(array_unique($words));
natcasesort($words); natsort($words);
file_put_contents($dict_file, implode("\n", $words) . "\n"); file_put_contents($dict_file, implode("\n", $words) . "\n");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment