From 634c05a91e4b3a449f904b2d136dae56e41f0e56 Mon Sep 17 00:00:00 2001
From: Aaron Bauman <aaron@messageagency.com>
Date: Mon, 25 Feb 2019 17:06:57 -0500
Subject: [PATCH] Purge drupal_set_message and urlInfo deprecated functions
---
.../EventSubscriber/SalesforceExampleSubscriber.php | 4 ++--
.../src/Form/MappedObjectDeleteForm.php | 2 +-
.../salesforce_mapping/src/Form/MappedObjectForm.php | 10 +++++-----
.../src/Form/SalesforceMappingDeleteForm.php | 2 +-
.../src/Form/SalesforceMappingFormBase.php | 4 ++--
modules/salesforce_mapping/src/MappedObjectList.php | 2 +-
.../salesforce_mapping/src/SalesforceMappingList.php | 2 +-
modules/salesforce_push/src/PushQueue.php | 2 +-
salesforce.install | 4 ++--
salesforce.module | 11 -----------
src/Form/SettingsForm.php | 2 +-
src/SalesforceAuthProviderPluginBase.php | 11 -----------
12 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/modules/salesforce_example/src/EventSubscriber/SalesforceExampleSubscriber.php b/modules/salesforce_example/src/EventSubscriber/SalesforceExampleSubscriber.php
index c8389b57..3b34f3c8 100644
--- a/modules/salesforce_example/src/EventSubscriber/SalesforceExampleSubscriber.php
+++ b/modules/salesforce_example/src/EventSubscriber/SalesforceExampleSubscriber.php
@@ -75,7 +75,7 @@ class SalesforceExampleSubscriber implements EventSubscriberInterface {
// Do Y.
break;
}
- drupal_set_message('push success example subscriber!: ' . $event->getMappedObject()->sfid());
+ \Drupal::messenger()->addStatus('push success example subscriber!: ' . $event->getMappedObject()->sfid());
}
/**
@@ -85,7 +85,7 @@ class SalesforceExampleSubscriber implements EventSubscriberInterface {
* The event.
*/
public function pushFail(SalesforcePushOpEvent $event) {
- drupal_set_message('push fail example: ' . $event->getMappedObject()->id());
+ \Drupal::messenger()->addStatus('push fail example: ' . $event->getMappedObject()->id());
}
/**
diff --git a/modules/salesforce_mapping/src/Form/MappedObjectDeleteForm.php b/modules/salesforce_mapping/src/Form/MappedObjectDeleteForm.php
index 21a2cb9d..d2afe45c 100644
--- a/modules/salesforce_mapping/src/Form/MappedObjectDeleteForm.php
+++ b/modules/salesforce_mapping/src/Form/MappedObjectDeleteForm.php
@@ -27,7 +27,7 @@ class MappedObjectDeleteForm extends ContentEntityConfirmFormBase {
* If the delete command is canceled, return to the contact list.
*/
public function getCancelUrl() {
- return $this->getEntity()->urlInfo();
+ return $this->getEntity()->toUrl();
}
/**
diff --git a/modules/salesforce_mapping/src/Form/MappedObjectForm.php b/modules/salesforce_mapping/src/Form/MappedObjectForm.php
index 86b1b4be..b4cc9af0 100644
--- a/modules/salesforce_mapping/src/Form/MappedObjectForm.php
+++ b/modules/salesforce_mapping/src/Form/MappedObjectForm.php
@@ -198,13 +198,13 @@ class MappedObjectForm extends ContentEntityForm {
catch (\Exception $e) {
$mapped_object->delete();
$this->eventDispatcher->dispatch(SalesforceEvents::ERROR, new SalesforceErrorEvent($e));
- drupal_set_message(t('Push failed with an exception: %exception', ['%exception' => $e->getMessage()]), 'error');
+ $this->messenger()->addError(t('Push failed with an exception: %exception', ['%exception' => $e->getMessage()]));
$form_state->setRebuild();
return;
}
// @TODO: more verbose feedback for successful push.
- drupal_set_message('Push successful.');
+ $this->messenger()->addStatus('Push successful.');
$form_state->setRedirect('entity.salesforce_mapped_object.canonical', ['salesforce_mapped_object' => $mapped_object->id()]);
}
@@ -240,13 +240,13 @@ class MappedObjectForm extends ContentEntityForm {
}
catch (\Exception $e) {
$this->eventDispatcher->dispatch(SalesforceEvents::ERROR, new SalesforceErrorEvent($e));
- drupal_set_message(t('Pull failed with an exception: %exception', ['%exception' => $e->getMessage()]), 'error');
+ $this->messenger()->addError(t('Pull failed with an exception: %exception', ['%exception' => $e->getMessage()]));
$form_state->setRebuild();
return;
}
// @TODO: more verbose feedback for successful pull.
- drupal_set_message('Pull successful.');
+ $this->messenger()->addStatus('Pull successful.');
$form_state->setRedirect('entity.salesforce_mapped_object.canonical', ['salesforce_mapped_object' => $mapped_object->id()]);
}
@@ -255,7 +255,7 @@ class MappedObjectForm extends ContentEntityForm {
*/
public function save(array $form, FormStateInterface $form_state) {
$this->getEntity()->save();
- drupal_set_message($this->t('The mapping has been successfully saved.'));
+ $this->messenger()->addStatus($this->t('The mapping has been successfully saved.'));
$form_state->setRedirect('entity.salesforce_mapped_object.canonical', ['salesforce_mapped_object' => $this->getEntity()->id()]);
}
diff --git a/modules/salesforce_mapping/src/Form/SalesforceMappingDeleteForm.php b/modules/salesforce_mapping/src/Form/SalesforceMappingDeleteForm.php
index ec011e9b..1c8eb92c 100644
--- a/modules/salesforce_mapping/src/Form/SalesforceMappingDeleteForm.php
+++ b/modules/salesforce_mapping/src/Form/SalesforceMappingDeleteForm.php
@@ -39,7 +39,7 @@ class SalesforceMappingDeleteForm extends EntityConfirmFormBase {
$this->entity->delete();
// Set a message that the entity was deleted.
- drupal_set_message($this->t('Salesforce %label was deleted.', [
+ $this->messenger()->addStatus($this->t('Salesforce %label was deleted.', [
'%label' => $this->entity->label(),
]));
diff --git a/modules/salesforce_mapping/src/Form/SalesforceMappingFormBase.php b/modules/salesforce_mapping/src/Form/SalesforceMappingFormBase.php
index 1c4a88d5..146144a2 100644
--- a/modules/salesforce_mapping/src/Form/SalesforceMappingFormBase.php
+++ b/modules/salesforce_mapping/src/Form/SalesforceMappingFormBase.php
@@ -108,11 +108,11 @@ abstract class SalesforceMappingFormBase extends EntityForm {
*/
public function save(array $form, FormStateInterface $form_state) {
if (!$this->entity->save()) {
- drupal_set_message($this->t('An error occurred while trying to save the mapping.'));
+ $this->messenger()->addError($this->t('An error occurred while trying to save the mapping.'));
return;
}
- drupal_set_message($this->t('The mapping has been successfully saved.'));
+ $this->messenger()->addStatus($this->t('The mapping has been successfully saved.'));
}
/**
diff --git a/modules/salesforce_mapping/src/MappedObjectList.php b/modules/salesforce_mapping/src/MappedObjectList.php
index 1638e9ca..a0caf474 100644
--- a/modules/salesforce_mapping/src/MappedObjectList.php
+++ b/modules/salesforce_mapping/src/MappedObjectList.php
@@ -118,7 +118,7 @@ class MappedObjectList extends EntityListBuilder {
$operations['view'] = [
'title' => $this->t('View'),
'weight' => -100,
- 'url' => $entity->urlInfo('canonical'),
+ 'url' => $entity->toUrl(),
];
$operations += parent::getDefaultOperations($entity);
return $operations;
diff --git a/modules/salesforce_mapping/src/SalesforceMappingList.php b/modules/salesforce_mapping/src/SalesforceMappingList.php
index 09ea98d0..9e9ec8db 100644
--- a/modules/salesforce_mapping/src/SalesforceMappingList.php
+++ b/modules/salesforce_mapping/src/SalesforceMappingList.php
@@ -63,7 +63,7 @@ class SalesforceMappingList extends DraggableListBuilder {
public function submitForm(array &$form, FormStateInterface $form_state) {
parent::submitForm($form, $form_state);
- drupal_set_message(t('The configuration options have been saved.'));
+ $this->messenger()->addStatus(t('The configuration options have been saved.'));
}
/**
diff --git a/modules/salesforce_push/src/PushQueue.php b/modules/salesforce_push/src/PushQueue.php
index a21f7334..2732a96a 100644
--- a/modules/salesforce_push/src/PushQueue.php
+++ b/modules/salesforce_push/src/PushQueue.php
@@ -611,7 +611,7 @@ class PushQueue extends DatabaseQueue implements PushQueueInterface {
'expire' => 0,
])
->condition('expire', 0, '<>')
- ->condition('expire', REQUEST_TIME, '<')
+ ->condition('expire', $this->time->getRequestTime(), '<')
->execute();
$this->garbageCollected = TRUE;
}
diff --git a/salesforce.install b/salesforce.install
index 5907ac99..ee0413e3 100644
--- a/salesforce.install
+++ b/salesforce.install
@@ -49,7 +49,7 @@ function salesforce_requirements($phase) {
}
$requirements['salesforce_tls'] = salesforce_get_tls_requirements();
- if ($last < REQUEST_TIME - (60 * 60 * 24) || empty($requirements['salesforce_tls'])) {
+ if ($last < time() - (60 * 60 * 24) || empty($requirements['salesforce_tls'])) {
salesforce_fetch_new_tls();
$requirements['salesforce_tls'] = salesforce_get_tls_requirements();
}
@@ -112,7 +112,7 @@ function salesforce_fetch_new_tls() {
try {
// Ping the howsmyssl web service to check TLS version support for this
// client.
- \Drupal::state()->set('salesforce.last_requirements_check', REQUEST_TIME);
+ \Drupal::state()->set('salesforce.last_requirements_check', time());
$raw_response = \Drupal::service('http_client')->get('https://www.howsmyssl.com/a/check', ['json' => TRUE, 'timeout' => 5]);
$body = $raw_response->getBody();
if (!empty($body)) {
diff --git a/salesforce.module b/salesforce.module
index 97a01b89..ede2f192 100644
--- a/salesforce.module
+++ b/salesforce.module
@@ -68,14 +68,3 @@ function salesforce_help($route_name, RouteMatchInterface $route_match) {
return '<p>' . t('Visit <a href=":help">the Salesforce module help page</a> if you need help obtaining a consumer key and secret.', [':help' => (new Url('help.page', ['name' => 'salesforce']))->toString()]) . '</p>';
}
}
-
-/**
- * Salesforce set message.
- *
- * Wrapper around drupal_set_message(), checks for proper permissions.
- */
-function salesforce_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
- if (Drupal::currentUser()->hasPermission('administer salesforce')) {
- drupal_set_message($message, $type, $repeat);
- }
-}
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index fa66665e..bc370cb2 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -94,7 +94,7 @@ class SettingsForm extends ConfigFormBase {
}
catch (\Exception $e) {
$href = new Url('salesforce.admin_config_salesforce');
- drupal_set_message($this->t('Error when connecting to Salesforce. Please <a href="@href">check your credentials</a> and try again: %message', ['@href' => $href->toString(), '%message' => $e->getMessage()]), 'error');
+ $this->messenger()->addError($this->t('Error when connecting to Salesforce. Please <a href="@href">check your credentials</a> and try again: %message', ['@href' => $href->toString(), '%message' => $e->getMessage()]));
}
$form['rest_api_version'] = [
diff --git a/src/SalesforceAuthProviderPluginBase.php b/src/SalesforceAuthProviderPluginBase.php
index 9a78f65e..9a7b0f7e 100644
--- a/src/SalesforceAuthProviderPluginBase.php
+++ b/src/SalesforceAuthProviderPluginBase.php
@@ -124,17 +124,6 @@ abstract class SalesforceAuthProviderPluginBase extends Salesforce implements Sa
$identity = $this->parseIdentityResponse($response);
$this->storage->storeIdentity($this->service(), $identity);
return TRUE;
-
- parent::save($form, $form_state);
- try {
- $this->setConfiguration($form_state->getValues());
-
- \Drupal::messenger()->addStatus(t('Successfully connected to Salesforce as user %name.', ['%name' => $this->getIdentity()['display_name']]));
- }
- catch (\Exception $e) {
- $form_state->setError($form, $this->t('Failed to connect to Salesforce: %message', ['%message' => $e->getMessage()]));
- }
-
}
/**
--
GitLab