Make tests pass

They don't have to pass. They just have to run at all, rather than crapping out due to interface mismatches or syntax errors. Getting the tests passing can be done in other issues. I'd be fine merging this if they run but fail -- baby steps.

joseph.olstad → made their first commit to this issue’s fork.

phpcs fixes are just noise that will break EVERYONES patches. I'd suggest avoid doing useless changes like this:

/**
 *
 */

14 Failures

There are a lot of PHPCS fixes in here. That directly goes against what I'd like to do in this issue. Let the coding standards fixes stay here for now and fix them in a different issue. Please revert all that. I'd only like to have the bare minimum needed to get the tests to run.

Yes, some phpcs changes don't do much, but getting them all done at once gets the pain over with and going forward, everything follows the standards.

I don't think commit 41af061 is correct. The parent method doesn't return anything. It should probably call it but not return.

I know they're a pain, but fix them -- and ONLY them -- in another issue. I'll even commit that before this one, if it will help you.

commit 41af0616 is correct

Okay, then please git reset --hard 41af0616 and force push so I can review.

Reverted the phpcs changes

No need to rebase, keep all the commit history in this merge request. I believe it's possible to squash all the commits upon merge.

ok so we've got 14 fails here and my merge request in the upgrade branch has only 7 failures.

Thanks for the noise removal. Couple of questions.

Tests are basically running with minimal changes.

14 Failures.

My concern with commit 41af061 is that parent::save() is BlockContentForm::save(), which does not return anything, so it seems pointless to return that value which will always be null.

 @liam morland,

1. BlockContentForm extends ContentEntityForm
2. ContentEntityForm extends EntityForm
3. EntityForm extends FormBase and implements EntityFormInterface
4. EntityFormInterface save returns int.

Yes, I see that. I am observing that the code for BlockContentForm::save() does not contain a return statement. Perhaps that is a bug.

@phenaproxima

I removed ALL of the extra changes except the single PHPStan fix for the form.

I can revert that also if you want.

There's no improvement in the tests with this, still 14 Failures but at least the tests will run.

Perfect!

Merged into 8.x-1.x. Thanks!

Next step: let's get those PHPCS failures fixed. We can do that all at once in another issue. Onward!

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