Fix code style

Author: RoSk0

src/Auth/Source/External.php

@@ -74,23 +74,22 @@
  */
 class External extends Source
 {
+    /**
+     * The string used to identify Drupal user ID.
+     */
+    public const DRUPALAUTH_EXTERNAL_USER_ID = 'drupalauth:External:UserID';
 
-  /**
-   * The string used to identify Drupal user ID.
-   */
-    const DRUPALAUTH_EXTERNAL_USER_ID = 'drupalauth:External:UserID';
-
-  /**
-   * The string used to identify authentication source.
-   */
-    const DRUPALAUTH_AUTH_ID = 'drupalauth:AuthID';
+    /**
+     * The string used to identify authentication source.
+     */
+    public const DRUPALAUTH_AUTH_ID = 'drupalauth:AuthID';
 
-  /**
-   * The string used to identify our states.
-   */
-    const DRUPALAUTH_EXTERNAL = 'drupalauth:External';
+    /**
+     * The string used to identify our states.
+     */
+    public const DRUPALAUTH_EXTERNAL = 'drupalauth:External';
 
-  /**
+    /**
      * Configuration object.
      *
      * @var \SimpleSAML\Module\drupalauth\ConfigHelper
@@ -120,19 +119,19 @@ public function __construct(array $info, array $config)
         $this->config = $drupalAuthConfig;
     }
 
-
     /**
      * Retrieve attributes for the user.
      *
-     * @return array|NULL  The user's attributes, or NULL if the user isn't authenticated.
+     * @return array|NULL  The user's attributes, or NULL if the user isn't
+     *     authenticated.
      */
     private function getUser($drupaluid): ?array
     {
         if (!empty($drupaluid)) {
             $drupalHelper = new DrupalHelper();
             $drupalHelper->bootDrupal($this->config->getDrupalroot());
 
-          // Load the user object from Drupal.
+            // Load the user object from Drupal.
             $drupaluser = User::load($drupaluid);
             if ($drupaluser->isBlocked()) {
                 throw new Error('NOACCESS');
@@ -142,26 +141,28 @@ private function getUser($drupaluid): ?array
 
             return $drupalHelper->getAttributes($drupaluser, $requested_attributes);
         }
+
+        return null;
     }
 
     /**
      * Log in using an external authentication helper.
      *
-     * @param array &$state  Information about the current authentication.
+     * @param array &$state Information about the current authentication.
      */
     public function authenticate(array &$state): void
     {
         assert(is_array($state));
 
-      /*
+        /*
          * The user is already authenticated.
          *
          * Add the users attributes to the $state-array, and return control
          * to the authentication process.
          */
-      if (!empty($state[self::DRUPALAUTH_EXTERNAL_USER_ID])) {
-          $state['Attributes'] = $this->getUser($state[self::DRUPALAUTH_EXTERNAL_USER_ID]);
-          return;
+        if (!empty($state[self::DRUPALAUTH_EXTERNAL_USER_ID])) {
+            $state['Attributes'] = $this->getUser($state[self::DRUPALAUTH_EXTERNAL_USER_ID]);
+            return;
         }
 
         /*
@@ -230,7 +231,7 @@ public function authenticate(array &$state): void
      * This function resumes the authentication process after the user has
      * entered his or her credentials.
      *
-     * @param array &$state  The authentication state.
+     * @param array &$state The authentication state.
      */
     public static function resume($stateID)
     {
@@ -274,7 +275,7 @@ public static function resume($stateID)
          * First we check that the user is acutally logged in, and didn't simply skip the login page.
          */
         if (empty($state[self::DRUPALAUTH_EXTERNAL_USER_ID])) {
-          throw new Exception('User ID is missing.');
+            throw new Exception('User ID is missing.');
         }
 
         /*
@@ -306,10 +307,10 @@ public static function resume($stateID)
     }
 
     /**
-     * This function is called when the user start a logout operation, for example
-     * by logging out of a SP that supports single logout.
+     * This function is called when the user start a logout operation, for
+     * example by logging out of a SP that supports single logout.
      *
-     * @param array &$state  The logout state array.
+     * @param array &$state The logout state array.
      */
     public function logout(array &$state): void
     {

src/Auth/Source/UserPass.php

@@ -56,7 +56,6 @@
  */
 class UserPass extends UserPassBase
 {
-
     /**
      * Configuration object.
      *
@@ -91,14 +90,16 @@ public function __construct(array $info, array $config)
     /**
      * Attempt to log in using the given username and password.
      *
-     * On a successful login, this function should return the users attributes. On failure,
-     * it should throw an exception. If the error was caused by the user entering the wrong
-     * username or password, a SimpleSAML_Error_Error('WRONGUSERPASS') should be thrown.
+     * On a successful login, this function should return the users attributes.
+     * On failure, it should throw an exception. If the error was caused by the
+     * user entering the wrong username or password, a
+     * SimpleSAML_Error_Error('WRONGUSERPASS') should be thrown.
      *
      * Note that both the username and the password are UTF-8 encoded.
      *
      * @param string $username The username the user wrote.
      * @param string $password The password the user wrote.
+     *
      * @return array  Associative array with the users attributes.
      */
     protected function login(string $username, string $password): array

src/ConfigHelper.php

@@ -9,8 +9,6 @@
  */
 class ConfigHelper
 {
-
-
     /**
      * String with the location of this configuration.
      * Used for error reporting.
@@ -56,14 +54,15 @@ class ConfigHelper
      * @param array $config  Configuration.
      * @param string $location  The location of this configuration. Used for error reporting.
      */
-    public function __construct(array $config, string $location) {
-      assert(is_array($config));
-      assert(is_string($location));
+    public function __construct(array $config, string $location)
+    {
+        assert(is_array($config));
+        assert(is_string($location));
 
-      $this->location = $location;
+        $this->location = $location;
 
       /* Get authsource configuration. */
-      $config = Configuration::loadFromArray($config, $location);
+        $config = Configuration::loadFromArray($config, $location);
 
         $this->drupalroot = $config->getString('drupalroot');
         $this->debug = $config->getOptionalBoolean('debug', false);

src/DrupalHelper.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SimpleSAML\Module\drupalauth;
 
 use Drupal\Core\DrupalKernel;