Use consistent nameing

Author: RoSk0

src/Auth/Source/External.php

@@ -125,21 +125,21 @@ public function __construct(array $info, array $config)
      * @return array|NULL  The user's attributes, or NULL if the user isn't
      *     authenticated.
      */
-    private function getUser($drupaluid): ?array
+    private function getUser($drupalUid): ?array
     {
-        if (!empty($drupaluid)) {
+        if (!empty($drupalUid)) {
             $drupalHelper = new DrupalHelper();
-            $drupalHelper->bootDrupal($this->config->getDrupalroot());
+            $drupalHelper->bootDrupal($this->config->getDrupalRoot());
 
             // Load the user object from Drupal.
-            $drupaluser = User::load($drupaluid);
-            if ($drupaluser->isBlocked()) {
+            $drupalUser = User::load($drupalUid);
+            if ($drupalUser->isBlocked()) {
                 throw new Error('NOACCESS');
             }
 
-            $requested_attributes = $this->config->getAttributes();
+            $requestedAttributes = $this->config->getAttributes();
 
-            return $drupalHelper->getAttributes($drupaluser, $requested_attributes);
+            return $drupalHelper->getAttributes($drupalUser, $requestedAttributes);
         }
 
         return null;
@@ -207,16 +207,16 @@ public function authenticate(array &$state): void
          * is also part of this module, but in a real example, this would likely be
          * the absolute URL of the login page for the site.
          */
-        $authPage = $this->config->getDrupalLoginURL();
+        $authPage = $this->config->getDrupalLoginUrl();
 
         /*
          * The redirect to the authentication page.
          *
          * Note the 'ReturnTo' parameter. This must most likely be replaced with
          * the real name of the parameter for the login page.
          */
-        $HTTP = new HTTP();
-        $HTTP->redirectTrustedURL($authPage, [
+        $http = new HTTP();
+        $http->redirectTrustedURL($authPage, [
             'ReturnTo' => $returnTo,
         ]);
 
@@ -322,13 +322,13 @@ public function logout(array &$state): void
             session_start();
         }
 
-        $logout_url = $this->config->getDrupalLogoutURL();
+        $logoutUrl = $this->config->getDrupalLogoutUrl();
         $parameters = [];
         if (!empty($state['ReturnTo'])) {
             $parameters['ReturnTo'] = $state['ReturnTo'];
         }
 
-        $HTTP = new HTTP();
-        $HTTP->redirectTrustedURL($logout_url, $parameters);
+        $http = new HTTP();
+        $http->redirectTrustedURL($logoutUrl, $parameters);
     }
 }

src/Auth/Source/UserPass.php

@@ -108,7 +108,7 @@ protected function login(string $username, string $password): array
         assert(is_string($password));
 
         $drupalHelper = new DrupalHelper();
-        $drupalHelper->bootDrupal($this->config->getDrupalroot());
+        $drupalHelper->bootDrupal($this->config->getDrupalRoot());
 
         /* @value \Drupal\user\UserAuth $userAuth */
         $userAuth = \Drupal::service('user.auth');
@@ -120,13 +120,13 @@ protected function login(string $username, string $password): array
         }
 
         // Load the user object from Drupal.
-        $drupaluser = User::load($uid);
-        if ($drupaluser->isBlocked()) {
+        $drupalUser = User::load($uid);
+        if ($drupalUser->isBlocked()) {
             throw new Error('NOACCESS');
         }
 
-        $requested_attributes = $this->config->getAttributes();
+        $requestedAttributes = $this->config->getAttributes();
 
-        return $drupalHelper->getAttributes($drupaluser, $requested_attributes);
+        return $drupalHelper->getAttributes($drupalUser, $requestedAttributes);
     }
 }

src/ConfigHelper.php

@@ -19,7 +19,7 @@ class ConfigHelper
     /**
      * The filesystem path to the Drupal directory
      */
-    private string $drupalroot;
+    private string $drupalRoot;
 
 
     /**
@@ -39,13 +39,13 @@ class ConfigHelper
     /**
    * The Drupal logout URL
    */
-    private string $drupal_logout_url;
+    private string $drupalLogoutUrl;
 
 
   /**
    * The Drupal login URL
    */
-    private string $drupal_login_url;
+    private string $drupalLoginUrl;
 
 
     /**
@@ -64,11 +64,11 @@ public function __construct(array $config, string $location)
       /* Get authsource configuration. */
         $config = Configuration::loadFromArray($config, $location);
 
-        $this->drupalroot = $config->getString('drupalroot');
+        $this->drupalRoot = $config->getString('drupalroot');
         $this->debug = $config->getOptionalBoolean('debug', false);
         $this->attributes = $config->getOptionalArray('attributes', null);
-        $this->drupal_logout_url = $config->getString('drupal_logout_url');
-        $this->drupal_login_url = $config->getString('drupal_login_url');
+        $this->drupalLogoutUrl = $config->getString('drupal_logout_url');
+        $this->drupalLoginUrl = $config->getString('drupal_login_url');
     }
 
     /**
@@ -86,9 +86,9 @@ public function getDebug(): bool
      *
      * @return string
      */
-    public function getDrupalroot(): string
+    public function getDrupalRoot(): string
     {
-        return $this->drupalroot;
+        return $this->drupalRoot;
     }
 
   /**
@@ -107,18 +107,18 @@ public function getAttributes(): ?array
      *
      * @return string
    */
-    public function getDrupalLogoutURL(): string
+    public function getDrupalLogoutUrl(): string
     {
-        return $this->drupal_logout_url;
+        return $this->drupalLogoutUrl;
     }
 
   /**
    * Returns Drupal login URL.
    *
    * @return string
    */
-    public function getDrupalLoginURL(): string
+    public function getDrupalLoginUrl(): string
     {
-        return $this->drupal_login_url;
+        return $this->drupalLoginUrl;
     }
 }