From 2bc09f9ad3bb607d00ae7d08b68fb4ac9cc9989c Mon Sep 17 00:00:00 2001
From: aaronbauman <aaronbauman@384578.no-reply.drupal.org>
Date: Mon, 5 Mar 2018 10:54:39 -0500
Subject: [PATCH] Issue #2949376 by aaronbauman: Update some documentation and
add pull examples to sf subscriber
---
modules/salesforce_mapping/src/Entity/MappedObject.php | 6 ++----
.../src/Entity/MappedObjectInterface.php | 7 +++++++
.../salesforce_mapping/src/Entity/SalesforceMapping.php | 1 +
.../salesforce_mapping/src/Event/SalesforceQueryEvent.php | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/modules/salesforce_mapping/src/Entity/MappedObject.php b/modules/salesforce_mapping/src/Entity/MappedObject.php
index 13930004..ae9457cf 100644
--- a/modules/salesforce_mapping/src/Entity/MappedObject.php
+++ b/modules/salesforce_mapping/src/Entity/MappedObject.php
@@ -154,7 +154,7 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject
return;
}
foreach ($vids_to_delete as $vid => $dummy) {
- $storage->deleteRevision($vid);
+ $storage->deleteRevision($vid);
}
return $this;
}
@@ -497,9 +497,7 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject
}
/**
- * Get the mapped Salesforce record.
- *
- * @return \Drupal\salesforce\SObject
+ * {@inheritdoc}
*/
public function getSalesforceRecord() {
return $this->sf_object;
diff --git a/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php b/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php
index 4fbe3be8..79cbec9b 100644
--- a/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php
+++ b/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php
@@ -52,6 +52,13 @@ interface MappedObjectInterface extends EntityChangedInterface, RevisionLogInter
public function getSalesforceUrl();
/**
+ * Get the mapped Salesforce record.
+ *
+ * @return \Drupal\salesforce\SObject
+ */
+ public function getSalesforceRecord();
+
+ /**
* @return string
* SFID
*/
diff --git a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php
index 3b2e9c7c..ec093dea 100644
--- a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php
+++ b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php
@@ -601,6 +601,7 @@ class SalesforceMapping extends ConfigEntityBase implements SalesforceMappingInt
if (!empty($this->pull_where_clause)) {
$soql->conditions[] = [$this->pull_where_clause];
}
+ $soql->order[$this->getPullTriggerDate()] = 'ASC';
return $soql;
}
diff --git a/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php b/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php
index 0e0f4df9..1a90635d 100644
--- a/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php
+++ b/modules/salesforce_mapping/src/Event/SalesforceQueryEvent.php
@@ -26,7 +26,7 @@ class SalesforceQueryEvent extends SalesforceBaseEvent {
}
/**
- * @return EntityInterface (from PushParams)
+ * @return SelectQuery
*/
public function getQuery() {
return $this->query;
--
GitLab