Commit 27257be8 authored by Dominic Tubach's avatar Dominic Tubach
Browse files

Rename class and fix typo in log statement

parent 5e439b90

cmrf_views/cmrf_views.module

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



use Drupal\cmrf_views\Util\CMRFFieldNameUtil;

use Drupal\cmrf_views\Util\CMRFViewsFieldNameUtil;

use Drupal\views\Views;



/**
@@ -53,7 +53,7 @@ function cmrf_views_update_80201(): void { 
      /** @var string $fieldName */

      /** @phpstan-var array<string, mixed> $field */

      foreach ($display['display_options']['fields'] ?? [] as $fieldName => $field) {

        $normalizedFieldName = CMRFFieldNameUtil::normalize($fieldName);

        $normalizedFieldName = CMRFViewsFieldNameUtil::normalize($fieldName);

        if ($normalizedFieldName === $fieldName) {

          $normalizedFields[$fieldName] = $field;

        }

cmrf_views/src/CMRFViews.php

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ use Drupal\cmrf_core\Call; 
use Drupal\cmrf_core\Core;

use Drupal\cmrf_views\Entity\CMRFDataset;

use Drupal\cmrf_views\Entity\CMRFDatasetRelationship;

use Drupal\cmrf_views\Util\CMRFFieldNameUtil;

use Drupal\cmrf_views\Util\CMRFViewsFieldNameUtil;

use Psr\Log\LoggerInterface;



class CMRFViews {
@@ -171,11 +171,11 @@ class CMRFViews { 
      $views_fields = [];

      foreach ($fields['values'] as $field_name => $field_prop) {

        $original_field_name = $field_name;

        $field_name = CMRFFieldNameUtil::normalize($field_name);

        $field_name = CMRFViewsFieldNameUtil::normalize($field_name);

        if (isset($views_fields[$field_name])) {

          $this->logger->warning(

            'The CiviCRM fields "@firstFieldName" and "@secondFieldName" of entity "@entityName" are mapped to '

            . 'the same Views field "@normalizeFieldName". The second field won\'t be available in the View.',

            . 'the same Views field "@normalizedFieldName". The second field won\'t be available in the View.',

            [

              '@firstFieldName' => $views_fields[$field_name]['cmrf_original_definition']['name'],

              '@secondFieldName' => $original_field_name,

cmrf_views/src/Plugin/views/query/API.php

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Drupal\cmrf_core\Call; 
use Drupal\cmrf_core\Core;

use Drupal\cmrf_views\CMRFViewsResultRow;

use Drupal\cmrf_views\Entity\CMRFDataset;

use Drupal\cmrf_views\Util\CMRFFieldNameUtil;

use Drupal\cmrf_views\Util\CMRFViewsFieldNameUtil;

use Drupal\views\Plugin\views\query\QueryPluginBase;

use Drupal\views\ResultRow;

use Drupal\views\ViewExecutable;
@@ -143,7 +143,7 @@ class API extends QueryPluginBase { 
   * @see \Drupal\cmrf_views\Plugin\views\query\API::addField()

   */

  protected function getFieldAlias($table_alias, $field) {

    $field = CMRFFieldNameUtil::normalize($field);

    $field = CMRFViewsFieldNameUtil::normalize($field);

    return isset($this->fieldAliases[$table_alias][$field]) ? $this->fieldAliases[$table_alias][$field] : FALSE;

  }

cmrf_views/src/Plugin/views/query/API4.php

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Drupal\cmrf_core\Call; 
use Drupal\cmrf_core\Core;

use Drupal\cmrf_views\CMRFViewsResultRow;

use Drupal\cmrf_views\Entity\CMRFDataset;

use Drupal\cmrf_views\Util\CMRFFieldNameUtil;

use Drupal\cmrf_views\Util\CMRFViewsFieldNameUtil;

use Drupal\views\Plugin\views\query\QueryPluginBase;

use Drupal\views\ResultRow;

use Drupal\views\ViewExecutable;
@@ -158,7 +158,7 @@ class API4 extends QueryPluginBase { 
   * @see \Drupal\cmrf_views\Plugin\views\query\API4::addField()

   */

  protected function getFieldAlias($table_alias, $field) {

    $field = CMRFFieldNameUtil::normalize($field);

    $field = CMRFViewsFieldNameUtil::normalize($field);

    return isset($this->fieldAliases[$table_alias][$field]) ? $this->fieldAliases[$table_alias][$field] : FALSE;

  }

cmrf_views/src/Util/CMRFFieldNameUtil.php→cmrf_views/src/Util/CMRFViewsFieldNameUtil.php

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ declare(strict_types = 1); 


namespace Drupal\cmrf_views\Util;



final class CMRFFieldNameUtil {

final class CMRFViewsFieldNameUtil {



  public static function normalize(string $fieldName): string {

    // Field names have to be valid (Twig) variable names.