Skip to content

Conversation

@stephen-cox
Copy link
Member

@stephen-cox stephen-cox commented Feb 14, 2025

Fixes #221

What does this change?

Updates the patch from this issue https://www.drupal.org/project/tablefield/issues/3441319

How to test

Testing instructions on #213 apply to this PR as well.

@ekes
Copy link
Member

ekes commented Feb 18, 2025

Doesn't apply to 2.4

❯ patch -p 1 < 3441319-19.patch
patching file src/Element/Tablefield.php
Hunk #1 succeeded at 82 with fuzz 1.
Hunk #2 FAILED at 109.
1 out of 3 hunks FAILED -- saving rejects to file src/Element/Tablefield.php.rej

@stephen-cox
Copy link
Member Author

Doesn't apply to 2.4

That's annoying. It applies fine to the 8.x-2.x branch which 2.4 is based off; although this release is now 2 years old.

Not sure what to do about this then. The current patch doesn't work with the Tablefield 3 which is required for Drupal 11 support.

Can we drop Tablefield 2 and require version 3 which supports Drupal 10 and 11, but only has a beta release?

@stephen-cox
Copy link
Member Author

Patch does apply to Tablefield 2.5-RC2, so we could use this rather than drop support for version 2 entirely.

@stephen-cox
Copy link
Member Author

@ekes
Copy link
Member

ekes commented Feb 25, 2025

https://git.drupalcode.org/project/tablefield/-/compare/8.x-2.x...3.0.x

It'd be nice to drop 2.x, it's a straightforward update, but it would mean only supporting for 10.3. Is 10.2 out of support already, I've lost track of the best place to see this.

@finnlewis
Copy link
Member

finnlewis commented Feb 25, 2025

So if we wait another week, we should have a 2.5 RC release of Table Field, and a 3.0.0 RC.

Or we just target the beta now?

@ekes
Copy link
Member

ekes commented Feb 25, 2025

I guess we can wait another week, but it sounds like targeting the 3.x beta is probably fine in reality.

@finnlewis
Copy link
Member

Discussing in Merge Tuesday, @ekes points out that the diff between 2.x and 3.x is not that large.

So suggesting we target 3.0.0-beta2 to support Drupal 11 and then move ahead to RC and stable when released soon.

@finnlewis finnlewis merged commit b929a94 into 2.x Feb 25, 2025
13 of 17 checks passed
@finnlewis finnlewis mentioned this pull request Feb 25, 2025
finnlewis added a commit that referenced this pull request Feb 25, 2025
…222) (#224)

* Update Tablefield patch so that it works with Tablefield 2.x and 3.x #221

* Update composer.json to taget 3.0@beta

---------

Co-authored-by: Stephen Cox <stephen-cox@users.noreply.github.com>
finnlewis added a commit that referenced this pull request Mar 18, 2025
* Update Tablefield patch so that it works with Tablefield 2.x and 3.x (#222) (#224)

* Update Tablefield patch so that it works with Tablefield 2.x and 3.x #221

* Update composer.json to taget 3.0@beta

---------

Co-authored-by: Stephen Cox <stephen-cox@users.noreply.github.com>

* Remove version: VERSION from libraries

---------

Co-authored-by: ekes <ekes@iskra.net>
Co-authored-by: Finn Lewis <finn@opencode.uk>
Co-authored-by: Stephen Cox <stephen-cox@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Patch included with #213 fails with Tablefield 3.x

4 participants