Code sniff cleanups

modules/salesforce_encrypt/salesforce_encrypt.install

@@ -42,4 +42,3 @@ function salesforce_encrypt_requirements($phase) {
   }
   return $requirements;
 }
-

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',
     ]);
-
-
 }
 
 /**

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
+}

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;

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
+}

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);
   }
 

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
+}

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
-  }
-
 }

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
    */

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;

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

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

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 {
 

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

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
    */

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.

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

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')

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
+}

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
+}