[D7] Fix Weight form element behavior

Thanks !

Looks good

Bumping to 7.61, this didn't make it into 7.60

1) The patch looks good but we need to backport the D8 weight tests from here: / #565220: Fix Weight form element behavior
2) To increase our confidence in the test results for the above issue, these two should go in first so we can re-queue php 7.3 and php 5.3 tests.
#3047844: [Regression] Tests fail on PHP 5.3
#3025335: session_id() cannot be changed after session is started

For the fame and glory, anyone want to backport the tests from here?

the tests to backport are from D8, this D8 commit:

here's the patch with the tests we need to backport to D7:

see comment #565220-38: Fix Weight form element behavior

Does this test or it's equivalent (something similar) exist in D7? If so, then no need to backport.

+++ b/core/tests/Drupal/Tests/Core/Render/Element/WeightTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\Tests\Core\Render\Element;
+
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Render\Element\Weight;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Render\Element\Weight
+ * @group Render
+ */
+class WeightTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['system']);
+  }
+
+  /**
+   * Test existing #default_value value in #options list.
+   *
+   * @covers ::processWeight
+   */
+  public function testProcessWeight() {
+    $element = [];
+    $form_state = new FormState();
+    $complete_form = [];
+
+    $element_object = new Weight([], 'weight', []);
+    $info = $element_object->getInfo();
+    $element += $info;
+
+    $element['#default_value'] = $element['#delta'] + 5;
+
+    Weight::processWeight($element, $form_state, $complete_form);
+
+    $this->assertTrue(
+      isset($element['#options'][$element['#default_value']]),
+      'Default value exists in the #options list'
+    );
+  }
+
+}

Ah ok sorry yes we have tests, see voleger comment #20 #2946801-20: [D7] Fix Weight form element behavior

Thanks

Justification:

1) This fix is in D8 already
2) The patch has tests.
3) No change record is required (this is a bug fix)

Copies of test only patch from #5 and patch from #10 for a fresh round of tests.

Sorry, I've not had a chance to learn my way around merge requests on d.o yet.

Erm the test only patch looks a bit broken actually.

Here's another which is just the test from #10.

It's a shame this is so laborious to test manually ("add 40 blocks..." ;)

However the patch makes sense and matches what was committed to D8, plus test looks good.

Hmm we don't want the test only patch to keep failing. Copy of #10 again which should pass and keep this at RTBC.

RTBM, +1 from me for merge

Not seeing any conflicts that could arise except for hidden elements to suddenly show up.

Needs a good release notes notice.

Thank you!