Commit 1685124f authored by Yas Naoi's avatar Yas Naoi
Browse files

Issue #3326730 by yas: Refactor "${var}" and "${expr}" style interpolation to... 

Issue #3326730 by yas: Refactor "${var}" and "${expr}" style interpolation to "{$var}" and "{$expr}" instead
parent 38f2d1cf

cloud.install

+4 −4
Original line number Diff line number Diff line
@@ -634,8 +634,8 @@ function cloud_update_8134(): void { 
    $type = $definition_update_manager->getEntityType($entity);

    $label = $type->getLabel();

    $id = $type->id();

    $id_plural = "${id}s";

    $label_plural = "${label}s";

    $id_plural = "{$id}s";

    $label_plural = "{$label}s";

    $type->set('id_plural', $id_plural);

    $type->set('label_singular', $label);

    $type->set('label_plural', $label_plural);
@@ -831,8 +831,8 @@ function cloud_update_8144(): void { 
    $type = $definition_update_manager->getEntityType($entity);

    $label = $type->getLabel();

    $id = $type->id();

    $id_plural = "${id}s";

    $label_plural = "${label}s";

    $id_plural = "{$id}s";

    $label_plural = "{$label}s";

    $type->set('id_plural', $id_plural);

    $type->set('label_singular', $label);

    $type->set('label_plural', $label_plural);

cloud.module

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ function cloud_views_bulk_form_submit(array $form, FormStateInterface $form_stat 
  // Change the confirm form.

  // Format: 'entity.{entity_type}.{operation}_multiple_form'.

  $form_state->setRedirect(

    "entity.${entity_type}.${operation}_multiple_form",

    "entity.{$entity_type}.{$operation}_multiple_form",

    $entity_type !== 'cloud_store'

      ? ['cloud_context' => $request->get('cloud_context')]

      : ['cloud_store_type' => $request->get('display_id')]

modules/cloud_service_providers/aws_cloud/aws_cloud.install

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ function aws_cloud_update_8124(): void { 
    'field_vpc',

  ];

  foreach ($field_names ?: [] as $field_name) {

    $template->set("content.${field_name}.label", 'inline');

    $template->set("content.{$field_name}.label", 'inline');

  }

  $template->save(TRUE);

}

modules/cloud_service_providers/aws_cloud/aws_cloud.module

+16 −16
Original line number Diff line number Diff line
@@ -3644,7 +3644,7 @@ function aws_cloud_form_cloud_config_aws_cloud_add_form_submit_batch( 
    $entity->set('field_region', [$region_name]);



    // Set field_api_endpoint_uri and field_image_upload_url.

    $api_endpoint_uri = "https://ec2.${region_name}.amazonaws.com";

    $api_endpoint_uri = "https://ec2.{$region_name}.amazonaws.com";

    $entity->set('field_api_endpoint_uri', [$api_endpoint_uri]);

    $entity->set('field_image_upload_url', [$api_endpoint_uri]);

    // If user specified no_check, default to false.
@@ -3671,7 +3671,7 @@ function aws_cloud_form_cloud_config_aws_cloud_add_form_submit_batch( 
      $entity->set('field_system_vpc', $result['Vpcs'][0]['VpcId']);

      try {

        if (!$entity->save()) {

          throw new EntityStorageException("An error occurred while saving Cloud service provider ${region_display_name}");

          throw new EntityStorageException("An error occurred while saving Cloud service provider {$region_display_name}");

        }



        $link = [];
@@ -4058,30 +4058,30 @@ function aws_cloud_get_expired_instances($cloud_context): array { 
 */

function aws_cloud_notify_instance_owners_and_admins($notify_instance_status): void {

  $config = \Drupal::config('aws_cloud.settings');

  $emails = $config->get("aws_cloud_${notify_instance_status}_instance_notification_emails");

  $notification_flag = $config->get("aws_cloud_${notify_instance_status}_instance_notification");

  $emails = $config->get("aws_cloud_{$notify_instance_status}_instance_notification_emails");

  $notification_flag = $config->get("aws_cloud_{$notify_instance_status}_instance_notification");

  $frequency = $config->get('aws_cloud_notification_frequency');



  $last_notified = \Drupal::state()->get("aws_cloud_${notify_instance_status}_instance_last_notified");

  $last_notified = \Drupal::state()->get("aws_cloud_{$notify_instance_status}_instance_last_notified");

  $notification_time = new DrupalDateTime($config->get('aws_cloud_instance_notification_time'));



  // Run notification if set by user.

  if (aws_cloud_can_send_notification($notification_flag, $emails, $notification_time->getTimestamp(), $frequency, $last_notified)) {

    $get_instances_method_name = "aws_cloud_get_${notify_instance_status}_instances";

    $get_instances_method_name = "aws_cloud_get_{$notify_instance_status}_instances";

    $instances = $get_instances_method_name();



    // Send the notification to admins.

    $instance_message = aws_cloud_get_entity_notification_message(

      $instances,

      $config->get("aws_cloud_${notify_instance_status}_instance_notification_instance_info"),

      $config->get("aws_cloud_{$notify_instance_status}_instance_notification_instance_info"),

      'aws_cloud_instance',

      $config->get("aws_cloud_${notify_instance_status}_instance_notification_msg"),

      $config->get("aws_cloud_{$notify_instance_status}_instance_notification_msg"),

      'instances'

    );



    if (!empty($instance_message)) {

      aws_cloud_send_notification_email(

        $config->get("aws_cloud_${notify_instance_status}_instance_notification_subject"),

        $config->get("aws_cloud_{$notify_instance_status}_instance_notification_subject"),

        $instance_message,

        $emails,

        'notify_aws_entity_admins_users',
@@ -4090,7 +4090,7 @@ function aws_cloud_notify_instance_owners_and_admins($notify_instance_status): v 
    }



    // Create an array of instances grouped by email addresses.

    if ($config->get("aws_cloud_${notify_instance_status}_instance_notify_owner")) {

    if ($config->get("aws_cloud_{$notify_instance_status}_instance_notify_owner")) {

      $admin_emails = explode(',', $emails);

      $user_instances = [];
@@ -4105,15 +4105,15 @@ function aws_cloud_notify_instance_owners_and_admins($notify_instance_status): v 
        if (!in_array($email, $admin_emails)) {

          $instance_message = aws_cloud_get_entity_notification_message(

            $user_instances[$email],

            $config->get("aws_cloud_${notify_instance_status}_instance_notification_instance_info"),

            $config->get("aws_cloud_{$notify_instance_status}_instance_notification_instance_info"),

            'aws_cloud_instance',

            $config->get("aws_cloud_${notify_instance_status}_instance_notification_msg"),

            $config->get("aws_cloud_{$notify_instance_status}_instance_notification_msg"),

            'instances'

          );



          if (!empty($instance_message)) {

            aws_cloud_send_notification_email(

              $config->get("aws_cloud_${notify_instance_status}_instance_notification_subject"),

              $config->get("aws_cloud_{$notify_instance_status}_instance_notification_subject"),

              $instance_message,

              $email,

              'notify_aws_entity_admins_users',
@@ -4123,7 +4123,7 @@ function aws_cloud_notify_instance_owners_and_admins($notify_instance_status): v 
        }

      }

    }

    \Drupal::state()->set("aws_cloud_${notify_instance_status}_instance_last_notified", time());

    \Drupal::state()->set("aws_cloud_{$notify_instance_status}_instance_last_notified", time());

  }

}
@@ -5592,13 +5592,13 @@ function aws_cloud_query_all_aws_cloud_resource_views_access_alter(AlterableInte 
  }



  if (count($cloud_contexts)) {

    $query->condition("${table_name}.cloud_context", $cloud_contexts, 'IN');

    $query->condition("{$table_name}.cloud_context", $cloud_contexts, 'IN');

  }

  else {

    // No permissions, do not let them view any cloud context.

    // Return an empty page.  This is just a catch-all.  In

    // normal cases, users will have access to certain cloud context.

    $query->condition("${table_name}.cloud_context", '');

    $query->condition("{$table_name}.cloud_context", '');

  }

}

modules/cloud_service_providers/aws_cloud/src/Plugin/Block/AwsCloudResourcesBlock.php

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ class AwsCloudResourcesBlock extends CloudBaseResourcesBlock { 
    }

    $instance = count(aws_cloud_get_instance_types($cloud_context));

    $pricing_label = "$instance $label";

    $link = Link::createFromRoute($pricing_label, "aws_cloud.${resource_type}",

    $link = Link::createFromRoute($pricing_label, "aws_cloud.{$resource_type}",

      ['cloud_context' => $cloud_context]

    );