Support from Acquia helps fund testing for Drupal Acquia logo

Comments

dawehner’s picture

FileSize
97.6 KB

Here is a first patch, which is for sure not testable yet.

damiankloip’s picture

Status: Active » Needs review
FileSize
95.61 KB

Rerolled.

tim.plunkett’s picture

To make sure we got them all, you can remove the ArrayAccess parts from PluginBag and see what blows up :)

Status: Needs review » Needs work

The last submitted patch, 1876942-2.patch, failed testing.

damiankloip’s picture

Status: Needs work » Needs review
FileSize
100.19 KB
98.74 KB

Yeah, why not. This patch should actually work. Also attached one with the ArrayAccess methods removed from PluginBag.

Status: Needs review » Needs work

The last submitted patch, 1876942-5-aa-removed.patch, failed testing.

dawehner’s picture

Status: Needs work » Needs review
FileSize
718 bytes
718 bytes

Some serious bug fix ;)

dawehner’s picture

FileSize
98.74 KB

Wrong patch

Status: Needs review » Needs work

The last submitted patch, drupal-1876942-7.patch, failed testing.

damiankloip’s picture

FileSize
715 bytes
99.44 KB

We could do this? Although I don't think it's a great idea. This should work, but we have to initDisplay(). This should show that ht erest of your patch works atleast.

I would sooner wait for #1867304: Assess newDisplay method on ViewExecutable to get in, then I think the current patch will be ok.

damiankloip’s picture

Status: Needs work » Needs review

Oops

Status: Needs review » Needs work

The last submitted patch, drupal-1876942-10.patch, failed testing.

dawehner’s picture

Yeah let's wait and then fix the remaining ones.

damiankloip’s picture

Status: Needs work » Needs review
FileSize
97.49 KB

Ok, rerolled. I ran some of the previously failing tests and they pass. So I think this patch might be good now.

Status: Needs review » Needs work

The last submitted patch, drupal-1876942-14.patch, failed testing.

damiankloip’s picture

Status: Needs work » Needs review
FileSize
97.18 KB

That last patch was all messed up, it was chnaging back changes made from recent commits! Not sure how or why it got so messed up Let's try this.

I also changed the get method on the PluginBag to return by reference. Review carefully :)

Status: Needs review » Needs work

The last submitted patch, 1876942-16.patch, failed testing.

damiankloip’s picture

Status: Needs work » Needs review
FileSize
1.05 KB
97.16 KB

And maybe now this; destroy() is unsetting displayHandlers, so we can't use has() to check displays. So I've Just changed the assertions to match the others...

tim.plunkett’s picture

Status: Needs review » Needs work
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.phpundefined
@@ -38,15 +31,10 @@ public function testViewsFetchData() {
-    $data = $this->viewsDataCache->get($this->randomName());
-    $this->assertTrue(empty($data), 'Make sure fetching views data for an invalid table returns empty.');

We're losing one assertion here, any particular reason? In fact, this whole hunk doesn't look related to the issue.

+++ b/core/modules/user/user.installundefined
@@ -690,7 +690,7 @@ function user_update_8009(&$sandbox) {
-function user_update_8011() {
+function user_update_8010() {
   global $user;
 
   // User pictures can only be migrated to the new user picture image field
@@ -846,7 +846,7 @@ function user_update_8011() {

@@ -846,7 +846,7 @@ function user_update_8011() {
 /**
  * Migrate {users}.picture to 'user_picture' image field.
  */
-function user_update_8012(&$sandbox) {
+function user_update_8011(&$sandbox) {
   // Initialize total values to process.
   if (!isset($sandbox['total'])) {
     $sandbox['total'] = (int) db_query('SELECT COUNT(picture) FROM {users} WHERE picture > 0')->fetchField();
@@ -914,7 +914,7 @@ function user_update_8012(&$sandbox) {

@@ -914,7 +914,7 @@ function user_update_8012(&$sandbox) {
 /**
  * Deletes {users}.picture field.
  */
-function user_update_8013() {
+function user_update_8012() {

These look like stray changes.

---

Can we also lump in the ArrayAccess removal from PluginBag again? We might as well kill it before others try to use it, and we can be sure we've 100% converted everything.

damiankloip’s picture

Good points, If no one else does first, I will look at this in about an hour. I knew there was some crazy stuff going on with the changes, indeed unrelated, that's why I said review carefully :) Good job.

damiankloip’s picture

Status: Needs work » Needs review
FileSize
95.79 KB

Made those changes. Sorry I've just realised I forgot an interdiff, how rude.

tim.plunkett’s picture

As a punishment for forgetting an interdiff, you have to reroll!

You missed removing implements \ArrayAccess from the class definition, as well as the comment above it.

damiankloip’s picture

FileSize
96.11 KB

Ahahaha, fair IS fair. Here you go.

Status: Needs review » Needs work

The last submitted patch, 1876942-23.patch, failed testing.

tim.plunkett’s picture

Status: Needs work » Reviewed & tested by the community
FileSize
492 bytes
96.21 KB

Ah, we just missed one direct call to offsetGet() that should never have existed.

I've reviewed the entire patch several times, and this is done.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, vdc-1876942-25.patch, failed testing.

dawehner’s picture

Status: Needs work » Needs review
FileSize
4.79 KB
99.95 KB

Mh, I seemed to have missed some of the places.

Don't take patches to serious at 5 am, but at least this fixes hopefully the tests :)

Status: Needs review » Needs work

The last submitted patch, drupal-1876942-27.patch, failed testing.

tim.plunkett’s picture

In PluginBagTest::testPluginBag()

      $this->assertTrue(isset($plugin_bag[$instance_id]), format_string('Plugin instance @instance_id exits on the bag', array('@instance_id' => $instance_id)));
      $this->assertTrue($plugin_bag->has($instance_id), format_string('Plugin instance @instance_id exits on the bag', array('@instance_id' => $instance_id)));

Delete the first one, and s/exits/exists/ on the second

Not sure about the other failure

dawehner’s picture

Status: Needs work » Needs review
FileSize
3.29 KB
103.23 KB

Hey, we also have to clean up some tests :)

Status: Needs review » Needs work

The last submitted patch, drupal-1876942-29.patch, failed testing.

damiankloip’s picture

Status: Needs work » Needs review
FileSize
102.69 KB

Sorry, I think is still from the messed up diff I provided earlier in the issue. This should be good now.

dawehner’s picture

Status: Needs review » Reviewed & tested by the community
FileSize
373 bytes

Just for other people :) This has been part of another patch.

catch’s picture

Issue tags: -VDC

#32: drupal-1876942-32.patch queued for re-testing.

Status: Reviewed & tested by the community » Needs work
Issue tags: +VDC

The last submitted patch, drupal-1876942-32.patch, failed testing.

tim.plunkett’s picture

Status: Needs work » Reviewed & tested by the community
FileSize
102.72 KB

Just a patch context conflict with #1821524: Decouple use of default views in ViewStorageTest, no changes.

catch’s picture

Status: Reviewed & tested by the community » Fixed

Committed/pushed to 8.x, thanks!

damiankloip’s picture

Super.

Automatically closed -- issue fixed for 2 weeks with no activity.