Commit f8910001 authored by Artem Sylchuk's avatar Artem Sylchuk
Browse files

Issue #3297889 by id.conky, Project Update Bot, artem_sylchuk: Drupal 10... 

Issue #3297889 by id.conky, Project Update Bot, artem_sylchuk: Drupal 10 compatibility fixes + minor codebase improvements
parent 0f211449

composer.json

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
  "license": "GPL-2.0-or-later",

  "minimum-stability": "dev",

  "require": {

    "php": ">=7.1",

    "php": ">=7.4",

    "drupal/message": "^1.0",

    "drupal/message_notify": "^1.0",

    "drupal/core": "^8.8.0 || ^9.0"

    "drupal/core": "^8.8.0 || ^9.0 || ^10.0"

  },

  "suggest": {

    "drush/drush": "^9 || ^10"

modules/private_message_notify/private_message_notify.info.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ name: Private Message Notify 
type: module

description: Implements new message notifications.

package: Private Message

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^8.8 || ^9 || ^10

dependencies:

  - message_notify:message_notify

  - private_message:private_message

modules/private_message_notify/src/Service/PrivateMessageNotifier.php

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,13 @@ class PrivateMessageNotifier implements PrivateMessageNotifierInterface { 
   */

  protected $messageNotifier;



  /**

   * The module handler.

   *

   * @var \Drupal\Core\Extension\ModuleHandlerInterface

   */

  protected $moduleHandler;



  /**

   * Constructs a new PrivateMessageNotifier object.

   *

private_message.info.yml

+1 −1
Original line number Diff line number Diff line 
name: Private Message

description: A private message system for users to send messages to each other

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^8.8 || ^9 || ^10

type: module

package: Private Message

private_message.module

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ function private_message_private_message_thread_view(array &$build, EntityInterf 
        ->getFormObject('private_message', 'add')

        ->setEntity($private_message);



      $build['private_message_form'] = Drupal::formBuilder()

      $build['private_message_form'] = \Drupal::formBuilder()

        ->getForm($form_object, $entity);

    }

  }