Commit ba865cc9 authored by Primoz Hmeljak's avatar Primoz Hmeljak Committed by Brendan J
Browse files

Issue #3042765 by Primsi, Tolyan4ik, Berdir: Drupal 9 Deprecated Code Report

parent caa1f384

mailchimp.info.yml

+1 −1
Changes for mailchimp.info.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ name: Mailchimp 
type: module

description: Mailchimp email service integration.

package: Mailchimp

core: 8.x

core_version_requirement: ^8.7.7 || ^9

configure: mailchimp.admin

mailchimp.install

+1 −1
Changes for mailchimp.install: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ function mailchimp_requirements($phase) { 
    $config = \Drupal::config('mailchimp.settings');



    // Check for Mailchimp library.

    if (ClassLoader::classExists($config->get('api_classname'))) {

    if (class_exists($config->get('api_classname'))) {

      $requirements['mailchimp']['description'] = t('The Mailchimp MCAPI wrapper library is installed correctly.');

      $requirements['mailchimp']['severity'] = REQUIREMENT_OK;

    }

mailchimp.module

+3 −1
Changes for mailchimp.module: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ function _mailchimp_get_user_agent() { 
  $version = '8.x-1.x';



  if (\Drupal::moduleHandler()->moduleExists('system')) {

    $info = system_get_info('module', 'mailchimp');

    /** @var \Drupal\Core\Extension\ModuleExtensionList $extension_list */

    $extension_list = \Drupal::service('extension.list.module');

    $info = $extension_list->getExtensionInfo('mailchimp');

    if (!empty($info['version'])) {

      $version = $info['version'];

    }

modules/mailchimp_campaign/mailchimp_campaign.info.yml

+1 −1
Changes for modules/mailchimp_campaign/mailchimp_campaign.info.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ name: Mailchimp Campaign 
type: module

description: Create, send and import Mailchimp campaigns.

package: Mailchimp

core: 8.x

core_version_requirement: ^8.7.7 || ^9

configure: mailchimp_campaign.overview



files:

modules/mailchimp_campaign/src/Controller/MailchimpCampaignController.php

+3 −8
Changes for modules/mailchimp_campaign/src/Controller/MailchimpCampaignController.php: 3 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ use Drupal\Core\Messenger\MessengerInterface; 
use Drupal\Core\Url;

use Drupal\mailchimp_campaign\Entity\MailchimpCampaign;

use Mailchimp\MailchimpAPIException;

use Drupal\Core\Entity\Query\QueryFactory;

use Psr\Log\LoggerInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Symfony\Component\HttpFoundation\JsonResponse;
@@ -69,8 +68,6 @@ class MailchimpCampaignController extends ControllerBase { 
   *

   * @param \Symfony\Component\HttpFoundation\Request $request

   *   The current request.

   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query

   *   The entity query object.

   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter

   *   The date formatter service.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
@@ -80,9 +77,8 @@ class MailchimpCampaignController extends ControllerBase { 
   * @param \Psr\Log\LoggerInterface $logger

   *   A logger instance.

   */

  public function __construct(Request $request, QueryFactory $entity_query, DateFormatterInterface $date_formatter, EntityTypeManagerInterface $entityTypeManager, MessengerInterface $messenger, LoggerInterface $logger) {

  public function __construct(Request $request, DateFormatterInterface $date_formatter, EntityTypeManagerInterface $entityTypeManager, MessengerInterface $messenger, LoggerInterface $logger) {

    $this->request = $request;

    $this->entityQuery = $entity_query;

    $this->dateFormatter = $date_formatter;

    $this->entityTypeManager = $entityTypeManager;

    $this->messenger = $messenger;
@@ -95,7 +91,6 @@ class MailchimpCampaignController extends ControllerBase { 
  public static function create(ContainerInterface $container) {

    return new static(

          $container->get('request_stack')->getCurrentRequest(),

          $container->get('entity.query'),

          $container->get('date.formatter'),

          $container->get('entity_type.manager'),

          $container->get('messenger'),
@@ -372,7 +367,7 @@ class MailchimpCampaignController extends ControllerBase { 
  public function entityAutocomplete($entity_type) {

    $q = $this->request->get('q');



    $query = $this->entityQuery->get($entity_type)

    $query = $this->entityTypeManager->getStorage($entity_type)->getQuery()

      ->condition('title', $q, 'CONTAINS')

      ->range(0, 10);
@@ -381,7 +376,7 @@ class MailchimpCampaignController extends ControllerBase { 
    $entities = [];



    if (!empty($entity_ids)) {

      $entities_data = entity_load_multiple($entity_type, $entity_ids);

      $entities_data = $this->entityTypeManager->getStorage($entity_type)->loadMultiple($entity_ids);



      if (!empty($entities_data)) {

        /* @var $entity \Drupal\Core\Entity\EntityInterface */