Manual fix for Drupal 10 compatibility

Need to check compatbility against a D10 compatible environment.

Added test with PHP 8.1 & MySQL 8, D10.1

I have scanned components 8.x-2.4 with Upgrade Status → . The report shows 4 errors, which are all addressed by MR !35:

Thanks! Attached is a static copy of MR !35 so it can be easily referenced in composer.json.

I've updated some function signatures to resolve PHP 8 fatal errors.

I'm not sure about applying this to 2.x when the 3.x branch already targets Drupal 9/10. Make the upgrade to 3.x instead.

Please review patch.

The last submitted patch, 8: 3390999-8.patch, failed testing. View results →

Patch for 3.x version.

Thanks for the patch @chaitanyadessai , I applied 3390999-9.patch on the 8.x-2.x branch and it gave the following error:

Checking patch components.services.yml...
error: while searching for:
    arguments: ['@extension.list.module', '@extension.list.theme', '@module_handler', '@theme.manager', '@cache.default', '@file_system']

  components.twig.loader:
    class: Drupal\components\Template\Loader\ComponentsLoader
    arguments: ['@components.registry']
    tags:
      - { name: twig.loader, priority: 200 }

  components.twig.extension:
    class: Drupal\components\Template\TwigExtension
    tags:
      - { name: twig.extension, priority: 150 }

error: patch failed: components.services.yml:4
error: components.services.yml: patch does not apply
Checking patch src/Template/Loader/ComponentsLoader.php => src/Template/Loader/ComponentLoader.php...
error: while searching for:
 * loader so that templates can be referenced by namespace, like
 * \@mycomponents/box.html.twig or \@mythemeComponents/page.html.twig.
 */
class ComponentsLoader extends FilesystemLoader {

  /**
   * The components registry service.

error: patch failed: src/Template/Loader/ComponentsLoader.php:13
error: src/Template/Loader/ComponentsLoader.php: patch does not apply
Checking patch src/Template/TwigExtension.php => src/Template/TwigExtensions.php...
error: while searching for:
  public function getFilters(): array {
    return [
      'recursive_merge' => new TwigFilter('recursive_merge', [
        'Drupal\components\Template\TwigExtension', 'recursiveMergeFilter',
      ]),
      'set' => new TwigFilter('set', [
        'Drupal\components\Template\TwigExtension', 'setFilter',
      ]),
      'add' => new TwigFilter('add', [
        'Drupal\components\Template\TwigExtension', 'addFilter',
      ]),
    ];
  }

error: patch failed: src/Template/TwigExtension.php:27
error: src/Template/TwigExtension.php: patch does not apply
Checking patch tests/src/Kernel/TwigExtensionTest.php...
Checking patch tests/src/Unit/ComponentsLoaderTest.php...
Hunk #2 succeeded at 28 (offset 7 lines).
error: while searching for:
      ->method('getTemplate')
      ->willReturn($getTemplate);

    $this->systemUnderTest = new ComponentsLoader($componentsRegistry);

    try {
      // Use reflection to test protected methods and properties.

error: patch failed: tests/src/Unit/ComponentsLoaderTest.php:61
error: tests/src/Unit/ComponentsLoaderTest.php: patch does not apply
Checking patch tests/src/Unit/TwigExtensionFiltersTest.php...
error: while searching for:
  public function testSetFilter(array $element, string $at, $value, array $expected) {
    $result = NULL;
    try {
      $result = TwigExtension::setFilter($element, $at, $value);
    }
    catch (\Exception $e) {
      $this->fail('No Exception expected; "' . $e->getMessage() . '" thrown during: ' . $this->getName());

error: patch failed: tests/src/Unit/TwigExtensionFiltersTest.php:173
error: tests/src/Unit/TwigExtensionFiltersTest.php: patch does not apply
Checking patch tests/src/Unit/TwigExtensionFunctionsTest.php...
error: while searching for:
    $dateFormatter = $this->createMock('\Drupal\Core\Datetime\DateFormatterInterface');
    $fileURLGenerator = $this->createMock('\Drupal\Core\File\FileUrlGeneratorInterface');

    $this->systemUnderTest = new TwigExtension();
    $coreTwigExtension = new CoreTwigExtension($this->renderer, $urlGenerator, $themeManager, $dateFormatter, $fileURLGenerator);

    $loader = new StringLoader();

error: patch failed: tests/src/Unit/TwigExtensionFunctionsTest.php:47
error: tests/src/Unit/TwigExtensionFunctionsTest.php: patch does not apply