Commit 71e0f19a authored by xjm's avatar xjm
Browse files

Issue #2600282 by dawehner, alexpott: PHP7 fails on Drupal\system\Tests\Update\UpdatePostUpdateTest

parent a7212fcf
...@@ -112,6 +112,8 @@ protected function getAvailableUpdateFunctions() { ...@@ -112,6 +112,8 @@ protected function getAvailableUpdateFunctions() {
} }
} }
// Ensure that the update order is deterministic.
sort($updates);
return $updates; return $updates;
} }
......
...@@ -34,7 +34,7 @@ protected function doSelectionTest() { ...@@ -34,7 +34,7 @@ protected function doSelectionTest() {
// Ensure that normal and post_update updates are merged together on the // Ensure that normal and post_update updates are merged together on the
// selection page. // selection page.
$this->assertRaw('<ul><li>8001 - Normal update_N() function. </li><li>First update.</li><li>Second update.</li><li>Test1 update.</li><li>Test0 update.</li><li>Testing batch processing in post updates update.</li></ul>'); $this->assertRaw('<ul><li>8001 - Normal update_N() function. </li><li>First update.</li><li>Second update.</li><li>Test0 update.</li><li>Test1 update.</li><li>Testing batch processing in post updates update.</li></ul>');
} }
/** /**
...@@ -58,8 +58,8 @@ public function testPostUpdate() { ...@@ -58,8 +58,8 @@ public function testPostUpdate() {
$updates = [ $updates = [
'update_test_postupdate_post_update_first', 'update_test_postupdate_post_update_first',
'update_test_postupdate_post_update_second', 'update_test_postupdate_post_update_second',
'update_test_postupdate_post_update_test1',
'update_test_postupdate_post_update_test0', 'update_test_postupdate_post_update_test0',
'update_test_postupdate_post_update_test1',
'update_test_postupdate_post_update_test_batch-1', 'update_test_postupdate_post_update_test_batch-1',
'update_test_postupdate_post_update_test_batch-2', 'update_test_postupdate_post_update_test_batch-2',
'update_test_postupdate_post_update_test_batch-3', 'update_test_postupdate_post_update_test_batch-3',
......
...@@ -55,15 +55,15 @@ protected function setupBasicModules() { ...@@ -55,15 +55,15 @@ protected function setupBasicModules() {
<?php <?php
/** /**
* Module A update A. * Module A update B.
*/ */
function module_a_post_update_a() { function module_a_post_update_b() {
} }
/** /**
* Module A update B. * Module A update A.
*/ */
function module_a_post_update_b() { function module_a_post_update_a() {
} }
EOS; EOS;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment