Commit c566a682 authored by Eleo Basili's avatar Eleo Basili
Browse files

Issue #3276126 by eleonel: Code refactoring using PR feedback.

parent 7a740f5f

modules/convivial_enricher_mailchimp/README.txt

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ CONTENTS OF THIS FILE 


 * Introduction

 * Requirements

 * Recommended modules

 * Installation

 * Configuration

 * Troubleshooting

modules/convivial_enricher_mailchimp/config/schema/convivial_enricher_mailchimp.schema.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ convivial_enricher.datasource.mailchimp: 
  type: mapping

  label: 'Mailchimp'

  mapping:

    mailchimp_list:

    mailchimp_list_id:

      label: 'Mailchimp list ID'

      type: string

modules/convivial_enricher_mailchimp/src/Plugin/EnricherDatasource/MailchimpEnricherDatasource.php

+5 −5
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class MailchimpEnricherDatasource extends EnricherDatasourceBase implements Cont 
   */

  public function defaultConfiguration() {

    return parent::defaultConfiguration() + [

      'mailchimp_list' => NULL,

      'mailchimp_list_id' => NULL,

    ];

  }
@@ -77,11 +77,11 @@ class MailchimpEnricherDatasource extends EnricherDatasourceBase implements Cont 
   * {@inheritdoc}

   */

  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {

    $form['mailchimp_list'] = [

    $form['mailchimp_list_id'] = [

      '#type' => 'textfield',

      '#title' => $this->t('Mailchimp list ID'),

      '#description' => $this->t('The Mailchimp list ID.'),

      '#default_value' => $this->configuration['mailchimp_list'],

      '#default_value' => $this->configuration['mailchimp_list_id'],

      '#required' => TRUE,

    ];

    return $form;
@@ -92,7 +92,7 @@ class MailchimpEnricherDatasource extends EnricherDatasourceBase implements Cont 
   */

  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {

    parent::submitConfigurationForm($form, $form_state);

    $this->configuration['mailchimp_list'] = $form_state->getValue('mailchimp_list');

    $this->configuration['mailchimp_list_id'] = $form_state->getValue('mailchimp_list_id');

  }



  /**
@@ -110,7 +110,7 @@ class MailchimpEnricherDatasource extends EnricherDatasourceBase implements Cont 
    $return_cookies = [];



    try {

      $list_id = $this->configuration['mailchimp_list'];

      $list_id = $this->configuration['mailchimp_list_id'];

      $this->listMember = $this->getListMemberInfoById($list_id, $key);

    }

    catch (\Exception $exception) {