Commit 279232d1 authored by Adam G-H's avatar Adam G-H Committed by Hristo Chonov
Browse files

Issue #3286695: Automated Drupal 10 compatibility fixes

parent d1958eca

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  "description": "Find merge conflicts in entities, perform auto merge where possible or offer a way for resolving them.",

  "type": "drupal-module",

  "keywords": ["Drupal"],

  "license": "GPL-2.0+",

  "license": "GPL-2.0-or-later",

  "homepage": "https://www.drupal.org/project/conflict",

  "support": {

    "issues": "https://www.drupal.org/project/issues/conflict",

conflict.api.php

+2 −1
Original line number Diff line number Diff line 
<?php



use Drupal\Core\Form\FormStateInterface;

/**

 * @file

 * Hooks and documentation related to conflict module.
@@ -29,7 +30,7 @@ 
 * @param \Drupal\Core\Form\FormStateInterface $form_state

 *   The main form state.

 */

function hook_conflict_paths_alter(array &$conflict_paths, \Drupal\Core\Form\FormStateInterface $form_state) {}

function hook_conflict_paths_alter(array &$conflict_paths, FormStateInterface $form_state) {}



/**

 * @} End of "addtogroup hooks".

conflict.info.yml

+1 −2
Original line number Diff line number Diff line 
name: Conflict

description: Fieldwise conflict prevention and resolution.

type: module

core: 8.x

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

modules/conflict_paragraphs/conflict_paragraphs.info.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ name: Conflict Paragraphs 
description: Fieldwise conflict prevention and resolution support for Paragraphs.

type: module

package: Conflict (Experimental)

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.2 || ^10

dependencies:

  - conflict:conflict

  - paragraphs:paragraphs

src/ConflictResolver/ConflictResolverManager.php

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class ConflictResolverManager implements ConflictResolverManagerInterface { 
      $result = $result ?? $local;

      $event = new EntityConflictResolutionEvent($local, $remote, $base, $result, $conflicts, $context);

      // Fire an event to allow listeners to automatically resolve conflicts.

      $this->eventDispatcher->dispatch(EntityConflictEvents::ENTITY_CONFLICT_RESOLVE, $event);

      $this->eventDispatcher->dispatch($event, EntityConflictEvents::ENTITY_CONFLICT_RESOLVE);

      $conflicts = $event->getConflicts();

    }
@@ -56,7 +56,7 @@ class ConflictResolverManager implements ConflictResolverManagerInterface { 
    $event = new EntityConflictDiscoveryEvent($local, $remote, $base, $context);

    // Fire an event to allow listeners to build a list of conflicting

    // properties.

    $this->eventDispatcher->dispatch(EntityConflictEvents::ENTITY_CONFLICT_DISCOVERY, $event);

    $this->eventDispatcher->dispatch($event, EntityConflictEvents::ENTITY_CONFLICT_DISCOVERY);



    return $event->getConflicts();

  }