Automated Drupal 10 compatibility fixes

Note that it looks like Domain will be supporting D10 only in version 2 📌 Automated Drupal 10 compatibility fixes Needs review , so the "drupal/domain": "^1.0" version constraint in this modules composer.json will need to be bumped to go to D10.

This is an automated patch generated by Drupal Rector. Please see the issue summary for more details.

It is important that any automated tests available are run with this patch and that you manually test this patch.

Drupal 10 Compatibility

According to the Upgrade Status module → , even with this patch, this module is not yet compatible with Drupal 10.

Currently Drupal Rector, version 0.15.1, cannot fix all Drupal 10 compatibility problems.

Therefore this patch does not update the info.yml file for Drupal 10 compatibility.

Leaving this issue open, even after committing the current patch, will allow the Project Update Bot → to post additional Drupal 10 compatibility fixes as they become available in Drupal Rector.

Debug info

This patch was created using these packages:

1. mglaman/phpstan-drupal: 1.1.35
2. palantirnet/drupal-rector: 0.15.1

Will these changes along with the drupal/domain version requirement in composer.json be made into a beta or stable release soon? I'm attempting to update drupal/domain to a D10 compatible version (2.0.0-beta1), but this project's composer.json as of 8.x-1.4 has a requirement of "drupal/domain": "^1.0" which is preventing my update:

Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - Root composer.json requires drupal/domain ^2.0@beta, found drupal/domain[2.0.0-beta1] but these were not loaded, likely because it conflicts with another require.
  Problem 2
    - drupal/domain_path_redirect is locked to version 1.4.0 and an update of this package was not requested.
    - drupal/domain_path_redirect 1.4.0 requires drupal/domain ^1.0 -> found drupal/domain[1.0.0-beta1, ..., 1.0.0-beta8] but it conflicts with your root composer.json require (^2.0@beta).


Installation failed, reverting ./composer.json and ./composer.lock to their original content.

Upgrade status is showing a couple more issues outstanding against latest 8.x-1.x-dev (#bd3dc55737c817bb3bfe6f12810bc293e1837e73). The warnings in the test class are not specifically D10 related and can be done later. Created an MR for the entity query changes to add access checks, which are done the same way in the Redirect module.

Domain Path Redirect
Scanned on Thu, 10/26/2023 - 22:41.

9 warnings found.

web/modules/contrib/domain_path_redirect/src/DomainPathRedirectRepository.php:
┌──────────┬──────┬──────────────────────────────────────────────────────────────┐
│  STATUS  │ LINE │                           MESSAGE                            │
├──────────┼──────┼──────────────────────────────────────────────────────────────┤
│ Check    │ 161  │ Relying on entity queries to check access by default is      │
│ manually │      │ deprecated in drupal:9.2.0 and an error will be thrown from  │
│          │      │ drupal:10.0.0. Call                                          │
│          │      │ \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with │
│          │      │ TRUE or FALSE to specify whether access should be checked.   │
│          │      │                                                              │
│ Check    │ 178  │ Relying on entity queries to check access by default is      │
│ manually │      │ deprecated in drupal:9.2.0 and an error will be thrown from  │
│          │      │ drupal:10.0.0. Call                                          │
│          │      │ \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with │
│          │      │ TRUE or FALSE to specify whether access should be checked.   │
│          │      │                                                              │
└──────────┴──────┴──────────────────────────────────────────────────────────────┘

web/modules/contrib/domain_path_redirect/tests/src/Unit/DomainPathRedirectReques
tSubscriberTest.php:
┌──────────┬──────┬──────────────────────────────────────────────────┐
│  STATUS  │ LINE │                     MESSAGE                      │
├──────────┼──────┼──────────────────────────────────────────────────┤
│ Check    │ 170  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
│ Check    │ 173  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
│ Check    │ 211  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
│ Check    │ 219  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
│ Check    │ 267  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
│ Check    │ 288  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
│ Check    │ 339  │ Call to deprecated method returnValue() of class │
│ manually │      │ PHPUnit\Framework\TestCase: Use                  │
│          │      │ $double->willReturn() instead of    │
│          │      │ $double->will($this->returnValue()) │
│          │      │                                                  │
└──────────┴──────┴──────────────────────────────────────────────────┘

The MR fixes the access checks but the test deprecations from the comment above still need to be fixed

Replaced deprecated PHPUnit returnValue() method with the willReturn() method in the module's tests.

Got a deprecation notice running the test, so it probably makes sense to fix that here as well.

Tests pass now without deprecation notice. I think this can go to RTBC, but I have commits in the MR, so probably best for someone else to mark it RTBC.

I have tested the MR and Patch , and module is compatible with d10. +RTBC

Thanks to all! Fixed it back to Active.

webflo → closed merge request !6