Commit eda8beb8 authored by Jakob P's avatar Jakob P
Browse files

Issue #3272682 by japerry, n4r3n, Berdir: Make module compatible with Drupal 10

parent 09cfe2ed

composer.json

+4 −2
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ 
    "issues": "https://www.drupal.org/project/issues/ctools",

    "source": "https://git.drupalcode.org/project/ctools"

  },

  "require": {

    "drupal/core": "^9 || ^10"

  "extra": {

    "branch-alias": {

      "dev-4.x": "4.x-dev"

    }

  }

}

ctools.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ name: Chaos Tools 
type: module

description: 'Provides a number of utility and helper APIs for Drupal developers and site builders.'

package: Chaos tool suite

core_version_requirement: ^9 || ^10
 
core_version_requirement: ^9.2 || ^10

ctools.services.yml

+0 −5
Original line number Diff line number Diff line
@@ -31,8 +31,3 @@ services: 
  ctools.context_mapper:

    class: Drupal\ctools\ContextMapper

    arguments: ['@entity.repository']
 
  ctools.serializable.tempstore.factory:

    class: Drupal\ctools\SerializableTempstoreFactory

    arguments: ['@keyvalue.expirable', '@lock', '@request_stack', '%tempstore.expire%', '@current_user']

    tags:

      - { name: backend_overridable }

modules/ctools_block/ctools_block.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ name: Chaos Tools Blocks 
type: module

description: 'Provides improvements to blocks that will one day be added to Drupal core.'

package: Chaos tool suite (Experimental)

core_version_requirement: ^9 || ^10

core_version_requirement: ^9.2 || ^10

dependencies:

  - ctools:ctools

modules/ctools_block/tests/src/Functional/EntityFieldBlockTest.php

+9 −2
Original line number Diff line number Diff line
@@ -83,8 +83,15 @@ class EntityFieldBlockTest extends BrowserTestBase { 
    $this->drupalGet('node/' . $node->id());



    $url = $file->getFileUri();

    $url = file_create_url($url);

    $url = file_url_transform_relative($url);

    // @todo Delete this when dropping Drupal 9.2 support in https://www.drupal.org/node/2940031.

    if ($this->container->has('file_url_generator')) {

      $url = $this->container->get('file_url_generator')->generateAbsoluteString($url);

      $url = $this->container->get('file_url_generator')->transformRelative($url);

    }

    else {

      $url = file_create_url($url); // @phpstan-ignore-line

      $url = file_url_transform_relative($url); // @phpstan-ignore-line

    }

    $this->assertSession()->responseContains('src="' . $url . '"');

  }