Verified Commit 809e9d85 authored by Christian Fritsch's avatar Christian Fritsch Committed by Alex Pott
Browse files

Issue #3290238 by chr.fritsch, Project Update Bot: Automated Drupal 10 compatibility fixes

parent a67c76bc

.travis.yml

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
language: php

dist: xenial



php:

  - 7.3



services:

  - mysql



cache:

  apt: true

  directories:

  - "$HOME/.composer/cache"

  - "$HOME/.drush/cache"

  - "$HOME/.npm"



branches:

  only:

  - /^8\.([0-9]+|x)\-[0-9]+\.([0-9]+|x)$/



env:

  global:

    - PATH="$PATH:$HOME/.composer/vendor/bin"



before_install:

  - composer global require thunder/drupal-testing



before_script:

  - phpenv config-rm xdebug.ini



script:

  - test-drupal-project



notifications:

  email: false

composer.json

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ 
        }

    ],

    "require": {

        "drupal/config_update": "^1.5",

        "symfony/console": "^4.4.15 || ^5.1",

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

        "drupal/config_update": "^1.5 || ^2.0",

        "symfony/console": "^4.4.15 || ^5.1 || ^6.1",

        "chi-teck/drupal-code-generator": "^2.4"

    },

    "require-dev": {

modules/update_helper_checklist/tests/src/Kernel/UpdateChecklistTest.php

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class UpdateChecklistTest extends KernelTestBase { 
  /**

   * Install entity schema for Update entity.

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();



    $this->installEntitySchema('update_helper_checklist_update');

modules/update_helper_checklist/update_helper_checklist.info.yml

+1 −2
Original line number Diff line number Diff line 
name: 'Update Helper Checklist'

description: 'Provide integration of Update Helper module with checklist.'

type: module

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.4 || ^10

dependencies:

  - update_helper:update_helper

  - checklistapi:checklistapi

src/Generators/ConfigurationUpdate.php

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class ConfigurationUpdate extends DrupalGenerator { 
      // from 0001.

      /** @var \Drupal\Core\Update\UpdateRegistry $service */

      $service = \Drupal::service('update.post_update_registry');

      $updates = array_merge($service->getModuleUpdateFunctions($vars['module']), array_keys($service->getRemovedPostUpdates($vars['module'])));

      $updates = array_merge($service->getUpdateFunctions($vars['module']), array_keys($service->getRemovedPostUpdates($vars['module'])));

      $lastUpdate = 0;

      foreach($updates as $update) {

        if (preg_match('/^'. preg_quote($vars['module']) . '_post_update_(\d*)_.*$/', $update, $matches)) {