diff --git a/modules/salesforce_encrypt/salesforce_encrypt.install b/modules/salesforce_encrypt/salesforce_encrypt.install
index d7f1eee1e850c94b07978b4eda84d7c04698409d..f8a774eb159bf71c526d68ee511d9b3770d60cbf 100644
--- a/modules/salesforce_encrypt/salesforce_encrypt.install
+++ b/modules/salesforce_encrypt/salesforce_encrypt.install
@@ -42,4 +42,3 @@ function salesforce_encrypt_requirements($phase) {
}
return $requirements;
}
-
diff --git a/modules/salesforce_encrypt/salesforce_encrypt.module b/modules/salesforce_encrypt/salesforce_encrypt.module
index 96658c1fb3a7da24a9bb6c4e700f167be33d0ffa..1f2314123c54ecfd4e1d34850c9c3cdc3ab90099 100644
--- a/modules/salesforce_encrypt/salesforce_encrypt.module
+++ b/modules/salesforce_encrypt/salesforce_encrypt.module
@@ -65,8 +65,6 @@ function salesforce_encrypt_local_tasks_alter(&$local_tasks) {
'provider' => 'salesforce_encrypt',
'id' => 'entity.salesforce_auth.encryption',
]);
-
-
}
/**
diff --git a/modules/salesforce_encrypt/src/Form/SalesforceAuthEncryptForm.php b/modules/salesforce_encrypt/src/Form/SalesforceAuthEncryptForm.php
index b03babaace03758f95682e5e2ae8f32001870a56..e8b974d1d798142d0391afacfa2286d72bad1897 100644
--- a/modules/salesforce_encrypt/src/Form/SalesforceAuthEncryptForm.php
+++ b/modules/salesforce_encrypt/src/Form/SalesforceAuthEncryptForm.php
@@ -8,6 +8,9 @@ use Drupal\Core\Url;
use Drupal\salesforce\Entity\SalesforceAuthConfig;
use Drupal\salesforce_encrypt\SalesforceEncryptTrait;
+/**
+ * Auth encryption form.
+ */
class SalesforceAuthEncryptForm extends EntityConfirmFormBase {
/**
@@ -49,4 +52,4 @@ class SalesforceAuthEncryptForm extends EntityConfirmFormBase {
$form_state->setRedirectUrl($this->getCancelUrl());
}
-}
\ No newline at end of file
+}
diff --git a/modules/salesforce_encrypt/src/Form/SettingsForm.php b/modules/salesforce_encrypt/src/Form/SettingsForm.php
index c8cfbfb279de4343426ecf84236910f8d9c9cef8..c80accb9c401dbd290cfaee4681cd8f775fb73ea 100644
--- a/modules/salesforce_encrypt/src/Form/SettingsForm.php
+++ b/modules/salesforce_encrypt/src/Form/SettingsForm.php
@@ -59,11 +59,6 @@ class SettingsForm extends FormBase {
/**
* SettingsForm constructor.
- *
- * @param \Drupal\Core\State\StateInterface $state
- * State service.
- * @param \Drupal\encrypt\EncryptionProfileManagerInterface $encryptionProfileManager
- * Encryption profile manager service.
*/
public function __construct(StateInterface $state, EncryptionProfileManagerInterface $encryptionProfileManager, SalesforceAuthTokenStorage $authTokenStorage, EntityTypeManagerInterface $etm, SalesforceEncrypt $salesforceEncrypt) {
$this->encryptionProfileManager = $encryptionProfileManager;
diff --git a/modules/salesforce_encrypt/src/SalesforceEncrypt.php b/modules/salesforce_encrypt/src/SalesforceEncrypt.php
index 242e8cb56c09b90009c1676585dd08105b1a6b84..2743b803b094d78d94b25e97463d9a18d3927ba8 100644
--- a/modules/salesforce_encrypt/src/SalesforceEncrypt.php
+++ b/modules/salesforce_encrypt/src/SalesforceEncrypt.php
@@ -10,10 +10,14 @@ use Drupal\key\Entity\KeyConfigOverride;
use Drupal\key\KeyConfigOverrides;
use Drupal\salesforce\Entity\SalesforceAuthConfig;
+/**
+ * Class SalesforceEncrypt.
+ */
class SalesforceEncrypt {
- final
-
+ /**
+ * SalesforceEncrypt constructor.
+ */
public function __construct(EncryptionProfileManagerInterface $encryptionProfileManager, KeyConfigOverrides $keyConfigOverrides, ConfigFactoryInterface $configFactory, StateInterface $state) {
$this->encryptionProfileManager = $encryptionProfileManager;
$this->keyConfigOverrides = $keyConfigOverrides;
@@ -24,7 +28,7 @@ class SalesforceEncrypt {
/**
* TRUE if the given authconfig is overridden with encrypted values.
*
- * @param \Drupal\salesforce\Entity\SalesforceAuthConfig $authConfig
+ * @param \Drupal\salesforce\Entity\SalesforceAuthConfig $auth
* The given auth config.
*
* @return bool
@@ -43,6 +47,15 @@ class SalesforceEncrypt {
$this->keyConfigOverrides->loadOverrides("$configName.provider_settings");
}
+ /**
+ * Encrypt auth config.
+ *
+ * @param \Drupal\salesforce\Entity\SalesforceAuthConfig $auth
+ * Auth config.
+ *
+ * @throws \Drupal\Core\Entity\EntityStorageException
+ * Exception.
+ */
public function encryptAuthConfig(SalesforceAuthConfig $auth) {
if ($this->isEncrypted($auth)) {
throw new \Exception('Auth is already encrypted');
@@ -85,7 +98,7 @@ class SalesforceEncrypt {
/**
* Get the assigned encryption profile, or NULL.
*
- * @return \Drupal\encrypt\EncryptionProfileInterface|NULL
+ * @return \Drupal\encrypt\EncryptionProfileInterface|null
* The assigned encryption profile, or NULL.
*/
public function getProfile() {
@@ -96,12 +109,11 @@ class SalesforceEncrypt {
/**
* Get the assigned encryption profile id, or NULL.
*
- * @return string|NULL
+ * @return string|null
* The assigned encryption profile id, or NULL.
*/
public function getProfileId() {
return $this->state->get('salesforce_encrypt.profile');
}
-
-}
\ No newline at end of file
+}
diff --git a/modules/salesforce_encrypt/src/SalesforceEncryptServiceProvider.php b/modules/salesforce_encrypt/src/SalesforceEncryptServiceProvider.php
index e75e85b08b4d92b5476cbdab97e1ab84a43d3936..0d2a9ac0c95771cc6acdfc535d8d3993335aa787 100644
--- a/modules/salesforce_encrypt/src/SalesforceEncryptServiceProvider.php
+++ b/modules/salesforce_encrypt/src/SalesforceEncryptServiceProvider.php
@@ -16,11 +16,11 @@ class SalesforceEncryptServiceProvider {
*/
public function alter(ContainerBuilder $container) {
// Add a normalizer service for file entities.
- $service_definition = new Definition('Drupal\salesforce_encrypt\Storage\SalesforceEncryptedAuthTokenStorage', array(
+ $service_definition = new Definition('Drupal\salesforce_encrypt\Storage\SalesforceEncryptedAuthTokenStorage', [
new Reference('state'),
new Reference('encryption'),
new Reference('encrypt.encryption_profile.manager'),
- ));
+ ]);
$container->setDefinition('salesforce.auth_token_storage', $service_definition);
}
diff --git a/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthStorage.php b/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthStorage.php
index e712e436064685d861804a8b6b4a3fcfa47c2da4..5b50d9c05aa8350616f3c90a33b10a9c71b8ec4b 100644
--- a/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthStorage.php
+++ b/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthStorage.php
@@ -6,6 +6,9 @@ use Drupal\Core\Config\Entity\ConfigEntityStorage;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityMalformedException;
+/**
+ * Class SalesforceEncryptedAuthStorage.
+ */
class SalesforceEncryptedAuthStorage extends ConfigEntityStorage {
/**
@@ -19,11 +22,13 @@ class SalesforceEncryptedAuthStorage extends ConfigEntityStorage {
return parent::save($entity);
}
+ /**
+ * {@inheritdoc}
+ */
protected function doLoadMultiple(array $ids = NULL) {
$entities = parent::doLoadMultiple($ids);
- // Decrypt the sensitive values and return
+ // Decrypt the sensitive values and return.
return $entities;
}
-
-}
\ No newline at end of file
+}
diff --git a/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthTokenStorage.php b/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthTokenStorage.php
index 7b4bef26c65f307ac7c95a577077c50c891f8b87..3065e34c6d79d8e26e75dafa82ba6ef443c06e2a 100644
--- a/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthTokenStorage.php
+++ b/modules/salesforce_encrypt/src/Storage/SalesforceEncryptedAuthTokenStorage.php
@@ -69,8 +69,4 @@ class SalesforceEncryptedAuthTokenStorage extends SalesforceAuthTokenStorage {
return $identity;
}
- public function storeAuthorizationState($service, $state) {
- return parent::storeAuthorizationState($service, $state); // TODO: Change the autogenerated stub
- }
-
}
diff --git a/modules/salesforce_jwt/src/Plugin/SalesforceAuthProvider/SalesforceJWTPlugin.php b/modules/salesforce_jwt/src/Plugin/SalesforceAuthProvider/SalesforceJWTPlugin.php
index 16b9d0674b146dab4e8e78df1865d9d783d5d4db..c2a6f6d23d6be00e188ee7a3ec503e623ba670ad 100644
--- a/modules/salesforce_jwt/src/Plugin/SalesforceAuthProvider/SalesforceJWTPlugin.php
+++ b/modules/salesforce_jwt/src/Plugin/SalesforceAuthProvider/SalesforceJWTPlugin.php
@@ -59,6 +59,8 @@ class SalesforceJWTPlugin extends SalesforceAuthProviderPluginBase {
* Http client wrapper.
* @param \Drupal\salesforce\Storage\SalesforceAuthTokenStorageInterface $storage
* Token storage.
+ * @param \Drupal\key\KeyRepositoryInterface $keyRepository
+ * Key repository.
*
* @throws \OAuth\OAuth2\Service\Exception\InvalidScopeException
* On error.
@@ -164,10 +166,11 @@ class SalesforceJWTPlugin extends SalesforceAuthProviderPluginBase {
*
* @param string $assertion
* The JWT assertion.
- * @param string $loginUrl
+ * @param string $state
* Not used.
*
- * @return TokenInterface $token
+ * @return \OAuth\Common\Token\TokenInterface
+ * Access Token.
*
* @throws \OAuth\Common\Http\Exception\TokenResponseException
*/
diff --git a/modules/salesforce_mapping/src/Controller/AutocompleteController.php b/modules/salesforce_mapping/src/Controller/AutocompleteController.php
index 3437e2375e0c2f309b546d3049d80496f9dead2c..870f24413fa68a00a3f4bf3300f400a9059c0cc7 100644
--- a/modules/salesforce_mapping/src/Controller/AutocompleteController.php
+++ b/modules/salesforce_mapping/src/Controller/AutocompleteController.php
@@ -34,6 +34,8 @@ class AutocompleteController extends ControllerBase {
*
* @param \Drupal\Core\Entity\EntityFieldManagerInterface $field_manager
* Entity field manager.
+ * @param \Drupal\typed_data\DataFetcherInterface $dataFetcher
+ * Data fetcher.
*/
public function __construct(EntityFieldManagerInterface $field_manager, DataFetcherInterface $dataFetcher) {
$this->fieldManager = $field_manager;
diff --git a/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php b/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php
index f5ba65efda08be101a0527383d3a574531887982..44e35d35efcd32fa068878f193d9e7827726d7b8 100644
--- a/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php
+++ b/modules/salesforce_mapping/src/Entity/MappedObjectInterface.php
@@ -67,7 +67,7 @@ interface MappedObjectInterface extends EntityChangedInterface, RevisionLogInter
*/
public function authMan();
- /**
+ /**
* Get a salesforce url for the linked record.
*
* @return string
diff --git a/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/PropertiesExtended.php b/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/PropertiesExtended.php
index 09516b3b5023b2fafdb0201fbcf6420493920f66..41387038b2b389736d4d091496298337ec406cfe 100644
--- a/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/PropertiesExtended.php
+++ b/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/PropertiesExtended.php
@@ -74,6 +74,8 @@ class PropertiesExtended extends SalesforceMappingFieldPluginBase {
* Event dispatcher service.
* @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler
* Module handler service.
+ * @param \Drupal\typed_data\DataFetcherInterface $dataFetcher
+ * Data fetcher.
*
* @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
* @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
diff --git a/modules/salesforce_oauth/src/Controller/SalesforceOAuthController.php b/modules/salesforce_oauth/src/Controller/SalesforceOAuthController.php
index 7bc291cd49b6f37d21c6244d8865addf0a412d21..364d7e4a2532b6729e3a0f69e43ca0e26adf4444 100644
--- a/modules/salesforce_oauth/src/Controller/SalesforceOAuthController.php
+++ b/modules/salesforce_oauth/src/Controller/SalesforceOAuthController.php
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
/**
- *
+ * SalesforceOAuthController.
*/
class SalesforceOAuthController extends ControllerBase {
diff --git a/modules/salesforce_push/src/Plugin/SalesforcePushQueueProcessor/Rest.php b/modules/salesforce_push/src/Plugin/SalesforcePushQueueProcessor/Rest.php
index 2da7a43f6d4b4cb81cb417a85ce698ac1465f4b8..91f256ae10aa7f96979c4422c0e3f4b37d5cd87d 100644
--- a/modules/salesforce_push/src/Plugin/SalesforcePushQueueProcessor/Rest.php
+++ b/modules/salesforce_push/src/Plugin/SalesforcePushQueueProcessor/Rest.php
@@ -84,7 +84,7 @@ class Rest extends PluginBase implements PushQueueProcessorInterface {
* ETM service.
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
* Event dispatcher service.
- * @param \Drupal\salesforce\SalesforceAuthProviderPluginManager
+ * @param \Drupal\salesforce\SalesforceAuthProviderPluginManager $authMan
* Auth manager.
*
* @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
diff --git a/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php b/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php
index 676a7003614b3ac83cdf8254758b74be1dbf3957..c34adcd63e03b55ed407be4544d36cfa73115651 100644
--- a/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php
+++ b/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php
@@ -79,7 +79,6 @@ class SalesforcePushQueueProcessorRestTest extends UnitTestCase {
->method('getToken')
->willReturn($this->authToken);
-
$container = new ContainerBuilder();
$container->set('queue.salesforce_push', $this->queue);
$container->set('salesforce.client', $this->client);
@@ -144,7 +143,6 @@ class SalesforcePushQueueProcessorRestTest extends UnitTestCase {
$this->handler->process([(object) [1]]);
}
-
/**
* @covers ::processItem
*/
diff --git a/modules/salesforce_soap/src/Soap/SoapClient.php b/modules/salesforce_soap/src/Soap/SoapClient.php
index 31d955af66290b99b317dc690ce56608b6c7a4d7..6389c896f341e386d511fc7524df2d60992c1155 100644
--- a/modules/salesforce_soap/src/Soap/SoapClient.php
+++ b/modules/salesforce_soap/src/Soap/SoapClient.php
@@ -44,6 +44,8 @@ class SoapClient extends SforcePartnerClient implements SoapClientInterface {
*
* @param \Drupal\salesforce\Rest\RestClientInterface $rest_api
* The Salesforce REST API client.
+ * @param \Drupal\salesforce\SalesforceAuthProviderPluginManager $authMan
+ * Auth manager.
* @param string $wsdl
* (Optional) Path to the WSDL that should be used. Defaults to using the
* partner WSDL from the developerforce/force.com-toolkit-for-php package.
diff --git a/salesforce.info.yml b/salesforce.info.yml
index 5efe50b742413824805020456f8bea99d8c9b251..3be778fa1f91571ddac9fa5aa1be1abd2f84ecbe 100644
--- a/salesforce.info.yml
+++ b/salesforce.info.yml
@@ -5,4 +5,4 @@ package: Salesforce
core: 8.x
configure: salesforce.admin_config_salesforce
dependencies:
- typed_data:typed_data
\ No newline at end of file
+ typed_data:typed_data
diff --git a/salesforce.install b/salesforce.install
index ce87a7b05e49921a90b46755e9ac6684156ce1ba..1efe47fd21a2cd2751f428ecbdcfdc47aab5b3b9 100644
--- a/salesforce.install
+++ b/salesforce.install
@@ -267,9 +267,6 @@ function salesforce_update_8004() {
\Drupal::cache()->delete('salesforce:objects');
}
-/**
- * Convert legacy oauth credentials to new auth plugin config.
- */
/**
* Convert legacy oauth credentials to new auth plugin config.
*/
@@ -317,13 +314,15 @@ function salesforce_update_8006() {
}
}
+/**
+ * Enable salesforce_oauth module and purge legacy settings.
+ */
function salesforce_update_8401() {
// Enable salesforce_oauth module.
\Drupal::service('module_installer')->install(['salesforce_oauth']);
- // purge old stateful values.
- // clear old config.
throw new \Exception('foo');
+ // Purge old stateful values and config.
\Drupal::configFactory()->getEditable('salesforce.settings')
->clear('consumer_key')
->clear('consumer_secret')
diff --git a/src/Consumer/SalesforceCredentials.php b/src/Consumer/SalesforceCredentials.php
index d521eded9a0db0e64225a9a4fb5633c50f365a00..533a987190d185ed4a9949126efc66e0477c04d1 100644
--- a/src/Consumer/SalesforceCredentials.php
+++ b/src/Consumer/SalesforceCredentials.php
@@ -4,6 +4,9 @@ namespace Drupal\salesforce\Consumer;
use OAuth\Common\Consumer\Credentials;
+/**
+ * Class SalesforceCredentials.
+ */
abstract class SalesforceCredentials extends Credentials implements SalesforceCredentialsInterface {
/**
@@ -20,7 +23,7 @@ abstract class SalesforceCredentials extends Credentials implements SalesforceCr
*/
protected $consumerKey;
-/**
+ /**
* {@inheritdoc}
*/
public function getConsumerKey() {
@@ -34,4 +37,4 @@ abstract class SalesforceCredentials extends Credentials implements SalesforceCr
return $this->loginUrl;
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/SalesforceAuthDeleteForm.php b/src/Form/SalesforceAuthDeleteForm.php
index 048ba71d8b024770bfcd8c4e877555ad24529d97..90e719072d668302aadea04100860ed0885c2769 100644
--- a/src/Form/SalesforceAuthDeleteForm.php
+++ b/src/Form/SalesforceAuthDeleteForm.php
@@ -6,7 +6,11 @@ use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
+/**
+ * Class SalesforceAuthDeleteForm.
+ */
class SalesforceAuthDeleteForm extends EntityConfirmFormBase {
+
/**
* {@inheritdoc}
*/
@@ -55,4 +59,4 @@ class SalesforceAuthDeleteForm extends EntityConfirmFormBase {
$form_state->setRedirectUrl($this->getCancelUrl());
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/SalesforceAuthForm.php b/src/Form/SalesforceAuthForm.php
index 27db7a577a0782f7c0e2f5ae0b9a840a81f2b496..77fe127fd085c5cd378030b20f91cfa8a13dcb30 100644
--- a/src/Form/SalesforceAuthForm.php
+++ b/src/Form/SalesforceAuthForm.php
@@ -20,8 +20,6 @@ class SalesforceAuthForm extends EntityForm {
*/
protected $entity;
-
-
/**
* {@inheritdoc}
*/
@@ -129,6 +127,9 @@ class SalesforceAuthForm extends EntityForm {
}
}
+ /**
+ * {@inheritdoc}
+ */
public function save(array $form, FormStateInterface $form_state) {
parent::save($form, $form_state);
$this->entity->getPlugin()->save($form, $form_state);
diff --git a/src/Form/SalesforceAuthRevokeForm.php b/src/Form/SalesforceAuthRevokeForm.php
index 4463ba9a135be0ac8233d2b6c7ba104ca11ed728..d848e0057e5a322a3be9344be206a4a8da51591c 100644
--- a/src/Form/SalesforceAuthRevokeForm.php
+++ b/src/Form/SalesforceAuthRevokeForm.php
@@ -7,7 +7,11 @@ use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\salesforce\Entity\SalesforceAuthConfig;
+/**
+ * Class SalesforceAuthRevokeForm.
+ */
class SalesforceAuthRevokeForm extends EntityConfirmFormBase {
+
/**
* {@inheritdoc}
*/
@@ -46,4 +50,4 @@ class SalesforceAuthRevokeForm extends EntityConfirmFormBase {
$form_state->setRedirectUrl($this->getCancelUrl());
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/SalesforceAuthSettings.php b/src/Form/SalesforceAuthSettings.php
index aca5f81bd0dbf093e9602a47760f7f1aae61b3a7..05c0ed34baad5805bf1435cf5c82f694e89cb529 100644
--- a/src/Form/SalesforceAuthSettings.php
+++ b/src/Form/SalesforceAuthSettings.php
@@ -12,6 +12,9 @@ use Drupal\salesforce\SalesforceAuthProviderPluginManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+/**
+ * Class SalesforceAuthSettings.
+ */
class SalesforceAuthSettings extends ConfigFormBase {
protected $salesforceAuth;
@@ -21,7 +24,11 @@ class SalesforceAuthSettings extends ConfigFormBase {
* Constructs a \Drupal\system\ConfigFormBase object.
*
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
- * The factory for configuration objects.
+ * Config.
+ * @param \Drupal\salesforce\SalesforceAuthProviderPluginManager $salesforceAuth
+ * Authman.
+ * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
+ * Events.
*/
public function __construct(ConfigFactoryInterface $config_factory, SalesforceAuthProviderPluginManager $salesforceAuth, EventDispatcherInterface $eventDispatcher) {
parent::__construct($config_factory);
@@ -40,7 +47,6 @@ class SalesforceAuthSettings extends ConfigFormBase {
);
}
-
/**
* {@inheritdoc}
*/
@@ -60,17 +66,16 @@ class SalesforceAuthSettings extends ConfigFormBase {
*/
public function buildForm(array $form, FormStateInterface $form_state) {
if (!$this->salesforceAuth->hasProviders()) {
- return ['#markup'=> 'No auth providers have been enabled. Please enable an auth provider and create an auth config before continuing.'];
+ return ['#markup' => 'No auth providers have been enabled. Please enable an auth provider and create an auth config before continuing.'];
}
$config = $this->config('salesforce.settings');
$form = parent::buildForm($form, $form_state);
$options = [];
- /** @var \Drupal\salesforce\Entity\SalesforceAuthConfig $provider **/
- foreach($this->salesforceAuth->getProviders() as $provider) {
+ foreach ($this->salesforceAuth->getProviders() as $provider) {
$options[$provider->id()] = $provider->label() . ' (' . $provider->getPlugin()->label() . ')';
}
if (empty($options)) {
- return ['#markup'=> 'No auth providers found. Please add an auth provider before continuing.'];
+ return ['#markup' => 'No auth providers found. Please add an auth provider before continuing.'];
}
$options = ['' => '- None -'] + $options;
$form['provider'] = [
@@ -95,4 +100,4 @@ class SalesforceAuthSettings extends ConfigFormBase {
$this->eventDispatcher->dispatch(SalesforceEvents::NOTICE, new SalesforceNoticeEvent(NULL, "Authorization provider changed to %provider.", ['%provider' => $form_state->getValue('provider')]));
}
-}
\ No newline at end of file
+}
diff --git a/src/Rest/RestClient.php b/src/Rest/RestClient.php
index a07f6d41718f7c625446f1a7c6fae598d2b25b16..490cec045bde19f8500186268ecaee87ab253aa3 100644
--- a/src/Rest/RestClient.php
+++ b/src/Rest/RestClient.php
@@ -126,6 +126,8 @@ class RestClient implements RestClientInterface {
* The JSON serializer service.
* @param \Drupal\Component\Datetime\TimeInterface $time
* The Time service.
+ * @param \Drupal\salesforce\SalesforceAuthProviderPluginManager $authManager
+ * Auth manager service.
*/
public function __construct(ClientInterface $http_client, ConfigFactoryInterface $config_factory, StateInterface $state, CacheBackendInterface $cache, Json $json, TimeInterface $time, SalesforceAuthProviderPluginManager $authManager) {
$this->configFactory = $config_factory;
diff --git a/src/Rest/RestResponse.php b/src/Rest/RestResponse.php
index a7d2f50b7be0b9d684c48d234f365f9808f404b3..da9af3c1de2e2b374a7b84b343da3c7f315fa4d1 100644
--- a/src/Rest/RestResponse.php
+++ b/src/Rest/RestResponse.php
@@ -32,7 +32,7 @@ class RestResponse extends Response {
/**
* RestResponse constructor.
*
- * @param \GuzzleHttp\Psr7\Response $response
+ * @param \Psr\Http\Message\ResponseInterface $response
* A response.
*/
public function __construct(ResponseInterface $response) {
diff --git a/src/SalesforceAuthProviderInterface.php b/src/SalesforceAuthProviderInterface.php
index 8d8e45d2537dcbe3b23855dccc2a2edb4a742a24..2792566bb4639b43e3186400a2b94d0350931551 100644
--- a/src/SalesforceAuthProviderInterface.php
+++ b/src/SalesforceAuthProviderInterface.php
@@ -136,8 +136,8 @@ interface SalesforceAuthProviderInterface extends ServiceInterface, PluginFormIn
* @param string $api_type
* (optional) Which API for which to retrieve URL, defaults to "rest".
*
- * @return string.
- * The URL
+ * @return string
+ * The URL.
*/
public function getApiEndpoint($api_type = 'rest');
diff --git a/src/SelectQueryRaw.php b/src/SelectQueryRaw.php
index 1e536eff553571722035c9dff3b3b37b473faa73..e1732af4a3cf49d18dc260d8c9da22b60ecea911 100644
--- a/src/SelectQueryRaw.php
+++ b/src/SelectQueryRaw.php
@@ -2,6 +2,9 @@
namespace Drupal\salesforce;
+/**
+ * Class SelectQueryRaw to construct SOQL manually from a string.
+ */
class SelectQueryRaw implements SelectQueryInterface {
protected $query;
@@ -22,4 +25,5 @@ class SelectQueryRaw implements SelectQueryInterface {
public function __toString() {
return str_replace(' ', '+', $this->query);
}
+
}