Commit e634c323 authored by Kevin Funk's avatar Kevin Funk
Browse files

Issue #3286682 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent f48023d2

composer.json

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
    "source": "http://cgit.drupalcode.org/config_rewrite"

  },

  "require": {

    "drupal/core": "^8.6 || ^9",

    "php": ">=7.1"

    "php": ">=7.1",

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

  }

}

config_rewrite.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ name: Configuration Rewrite 
type: module

description: Rewrites existing configuration on module installation via using a "rewrite" folder in the config directory.

php: 7.1

core_version_requirement: ^8.7.7 || ^9

core_version_requirement: ^8.7.7 || ^9 || ^10

package: Configuration

tests/src/Kernel/ConfigRewriteTest.php

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class ConfigRewriteTest extends KernelTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();



    $this->configRewriter = $this->container->get('config_rewrite.config_rewriter');
@@ -67,8 +67,8 @@ class ConfigRewriteTest extends KernelTestBase { 


    // Verify that the original configuration data exists.

    $data = $this->activeConfigStorage->read('user.role.test1');

    $this->assertIdentical($data['label'], $expected_original_data['label']);

    $this->assertIdentical($data['permissions'], $expected_original_data['permissions']);

    $this->assertSame($data['label'], $expected_original_data['label']);

    $this->assertSame($data['permissions'], $expected_original_data['permissions']);



    // Rewrite configuration.

    $this->configRewriter->rewriteModuleConfig('config_rewrite_test_rewrite');

tests/src/Kernel/NonexistentInitialConfigTest.php

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\config_rewrite\Kernel;



use Drupal\config_rewrite\Exception\NonexistentInitialConfigException;

use Drupal\KernelTests\KernelTestBase;



/**
@@ -41,7 +42,7 @@ class NonexistentInitialConfigTest extends KernelTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();



    $this->configRewriter = $this->container->get('config_rewrite.config_rewriter');
@@ -54,9 +55,9 @@ class NonexistentInitialConfigTest extends KernelTestBase { 
  /**

   * @covers ::rewriteModuleConfig

   * @covers ::rewriteConfig

   * @expectedException \Drupal\config_rewrite\Exception\NonexistentInitialConfigException

   */

  function testConfigRewrite() {

    $this->expectException(NonexistentInitialConfigException::class);

    $this->configRewriter->rewriteModuleConfig('config_rewrite_nonexisting');

  }