Skip to content

Removed Drupal 6 and 7 support and bumped composer constraints for 3.x.#336

Merged
AlexSkrypnyk merged 2 commits into
masterfrom
feature/drop-d6-d7
Apr 17, 2026
Merged

Removed Drupal 6 and 7 support and bumped composer constraints for 3.x.#336
AlexSkrypnyk merged 2 commits into
masterfrom
feature/drop-d6-d7

Conversation

@AlexSkrypnyk
Copy link
Copy Markdown
Collaborator

Note: This PR is only one part of the v3.x upgrade. See the
3.x epic #312
for the full scope and remaining work.

Part of #312

Summary

Drops all Drupal 6 and 7 code (core classes, field handlers, specs, and tests), raises composer.json constraints to require PHP 8.2+, Drupal 10 or 11, and updated Symfony packages. Expands the CI matrix from 5 to 10 entries so that each PHP/Drupal combination is now tested under both lowest and normal dependency resolutions, mirroring the Drupal Extension project's CI pattern. Updates README.md to reflect that master is now the active 3.x development branch while maintenance of the 2.x line moves to the new 2.x branch.

Changes

Removed legacy code

  • Deleted src/Drupal/Driver/Cores/Drupal6.php and Drupal7.php.
  • Deleted src/Drupal/Driver/Fields/Drupal6/ and Fields/Drupal7/ (11 handler files).
  • Deleted tests/Drupal/Tests/Driver/Drupal7FieldHandlerTest.php and the D7-only FieldHandlerAbstractTestBase.php.
  • Deleted spec/Drupal/Driver/Cores/Drupal6Spec.php and Drupal7Spec.php.

Simplified version detection

  • DrupalDriver::detectMajorVersion(): removed D6/D7 bootstrap paths (/modules/system/system.module, /includes/bootstrap.inc) and the < 8 mapping branch. Now throws an explicit BootstrapException when Drupal < 10 is detected.
  • DrupalDriver::readVersionConstant(): removed the legacy global VERSION constant fallback (D6/D7 only); now relies solely on \Drupal::VERSION.

Tooling

  • rector.php: removed the now-orphaned skip entry for Drupal7FieldHandlerTest.php.
  • phpunit.xml.dist: removed all D6/D7 <exclude> entries from <source>.

composer.json constraint bumps

  • php: >=7.4 -> ^8.2.
  • drupal/core-utility, drupal/core-composer-scaffold, drupal/core-recommended: ^8.4 || ^9 || ^10 || ^11 -> ^10 || ^11.
  • symfony/dependency-injection, symfony/process: dropped ^2.x/^3.x/^4.4; now ^6.4 || ^7.
  • symfony/phpunit-bridge: ^6.1 -> ^6.4 || ^7.
  • dms/phpunit-arraysubset-asserts: ^0.4.0 || ^0.5.0 -> ^0.5.0.
  • phpspec/phpspec: dropped ^2.0/^4.0/^6.1; now ^7.5 || dev-main.
  • phpunit/phpunit: ^6.0 || ^7.0 || ^9 || ^10 -> ^9.6 || ^10 || ^11.
  • Removed obsolete conflict.drupal/core block (>=8.0 <9.3).
  • Bumped extra.branch-alias.dev-master to 3.0.x-dev.

CI matrix

  • Expanded tests job matrix from 5 to 10 entries: each PHP/Drupal combo now runs both deps: lowest and deps: normal (mirrors Drupal Extension's CI pattern).
  • Conditional install step: composer update --prefer-lowest --prefer-stable for lowest, composer update --with-all-dependencies for normal.
  • Job name now includes Deps ${{ matrix.deps }} for clarity.

Documentation

  • README.md: replaced the 3.x note. New text states master is under heavy 3.x development, D6/D7 has been dropped, and points to the 2.x branch for the maintenance line.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 17, 2026

Warning

Rate limit exceeded

@AlexSkrypnyk has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 10 minutes and 20 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 10 minutes and 20 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 68e7f477-77ec-40a9-bed6-642a4f8588fb

📥 Commits

Reviewing files that changed from the base of the PR and between 284b0bd and 7955688.

📒 Files selected for processing (23)
  • .github/workflows/ci.yml
  • README.md
  • composer.json
  • phpunit.xml.dist
  • rector.php
  • spec/Drupal/Driver/Cores/Drupal6Spec.php
  • spec/Drupal/Driver/Cores/Drupal7Spec.php
  • src/Drupal/Driver/Cores/Drupal6.php
  • src/Drupal/Driver/Cores/Drupal7.php
  • src/Drupal/Driver/DrupalDriver.php
  • src/Drupal/Driver/Fields/Drupal6/TaxonomyHandler.php
  • src/Drupal/Driver/Fields/Drupal7/AbstractHandler.php
  • src/Drupal/Driver/Fields/Drupal7/DatetimeHandler.php
  • src/Drupal/Driver/Fields/Drupal7/DefaultHandler.php
  • src/Drupal/Driver/Fields/Drupal7/EntityreferenceHandler.php
  • src/Drupal/Driver/Fields/Drupal7/FileHandler.php
  • src/Drupal/Driver/Fields/Drupal7/ImageHandler.php
  • src/Drupal/Driver/Fields/Drupal7/LinkFieldHandler.php
  • src/Drupal/Driver/Fields/Drupal7/ListBooleanHandler.php
  • src/Drupal/Driver/Fields/Drupal7/ListTextHandler.php
  • src/Drupal/Driver/Fields/Drupal7/TaxonomyTermReferenceHandler.php
  • tests/Drupal/Tests/Driver/Drupal7FieldHandlerTest.php
  • tests/Drupal/Tests/Driver/FieldHandlerAbstractTestBase.php
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feature/drop-d6-d7

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link
Copy Markdown

Code coverage (threshold: 35%)



Code Coverage Report Summary:
  Classes: 54.17% (13/24)
  Methods: 31.84% (57/179)
  Lines:   40.41% (297/735)

Per-class coverage
Drupal\Driver\BaseDriver                                      96.77%
Drupal\Driver\BlackboxDriver                                 100.00%
Drupal\Driver\Cores\AbstractCore                              23.81%
Drupal\Driver\Cores\Drupal8                                   11.16%
Drupal\Driver\DrupalDriver                                     0.00%
Drupal\Driver\DrushDriver                                     23.24%
Drupal\Driver\Exception\BootstrapException                   100.00%
Drupal\Driver\Exception\Exception                            100.00%
Drupal\Driver\Exception\UnsupportedDriverActionException     100.00%
Drupal\Driver\Fields\Drupal8\AbstractHandler                   0.00%
Drupal\Driver\Fields\Drupal8\AddressHandler                  100.00%
Drupal\Driver\Fields\Drupal8\DaterangeHandler                100.00%
Drupal\Driver\Fields\Drupal8\DatetimeHandler                  46.67%
Drupal\Driver\Fields\Drupal8\DefaultHandler                  100.00%
Drupal\Driver\Fields\Drupal8\EmbridgeAssetItemHandler          0.00%
Drupal\Driver\Fields\Drupal8\EntityReferenceHandler           79.31%
Drupal\Driver\Fields\Drupal8\FileHandler                      94.44%
Drupal\Driver\Fields\Drupal8\ImageHandler                     92.86%
Drupal\Driver\Fields\Drupal8\LinkHandler                     100.00%
Drupal\Driver\Fields\Drupal8\ListFloatHandler                  0.00%
Drupal\Driver\Fields\Drupal8\ListHandlerBase                 100.00%
Drupal\Driver\Fields\Drupal8\ListIntegerHandler                0.00%
Drupal\Driver\Fields\Drupal8\ListStringHandler                 0.00%
Drupal\Driver\Fields\Drupal8\NameHandler                     100.00%
Drupal\Driver\Fields\Drupal8\OgStandardReferenceHandler        0.00%
Drupal\Driver\Fields\Drupal8\SupportedImageHandler            95.83%
Drupal\Driver\Fields\Drupal8\TaxonomyTermReferenceHandler    100.00%
Drupal\Driver\Fields\Drupal8\TextWithSummaryHandler          100.00%
Drupal\Driver\Fields\Drupal8\TimeHandler                     100.00%

@AlexSkrypnyk AlexSkrypnyk mentioned this pull request Apr 17, 2026
44 tasks
@AlexSkrypnyk AlexSkrypnyk merged commit 48dccba into master Apr 17, 2026
12 checks passed
@AlexSkrypnyk AlexSkrypnyk deleted the feature/drop-d6-d7 branch April 17, 2026 07:51
@AlexSkrypnyk AlexSkrypnyk added this to the 3.0 milestone May 4, 2026
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.

1 participant