Coding standards

Author: jeppekroghitk

modules/os2forms_fbs_handler/src/Client/FBS.php

@@ -11,7 +11,7 @@
 /**
  * Minimalistic client to create user with guardians at FBS.
  */
-class FBS {
+class Fbs {
 
   /**
    * FBS session key.
@@ -154,12 +154,13 @@ public function getPatron(string $patronId): ?Patron {
         (bool) $json->patron->receiveSms,
         (bool) $json->patron->receivePostalMail,
         $json->patron->notificationProtocols,
-        $json->patron->phoneNumber,
         is_null($json->patron->onHold) ? $json->patron->onHold : (array) $json->patron->onHold,
         $json->patron->preferredLanguage,
         (bool) $json->patron->guardianVisibility,
         $json->patron->defaultInterestPeriod,
         (bool) $json->patron->resident,
+        $json->patron->phoneNumber,
+
         [
           [
             'emailAddress' => $json->patron->emailAddress,

modules/os2forms_fbs_handler/src/Client/Model/Patron.php

@@ -25,12 +25,12 @@ public function __construct(
     public readonly ?int $defaultInterestPeriod = NULL,
     public readonly ?bool $resident = NULL,
     // Allow these properties below to be updatable.
+    public ?string $phoneNumber = NULL,
     public ?array $emailAddresses = NULL,
     public ?bool $receiveEmail = NULL,
     public ?string $preferredPickupBranch = NULL,
     public ?string $personId = NULL,
     public ?string $pincode = NULL,
-    public ?string $phoneNumber = NULL,
   ) {
   }
 

modules/os2forms_fbs_handler/src/Plugin/AdvancedQueue/JobType/FbsCreateUser.php

@@ -8,7 +8,7 @@
 use Drupal\advancedqueue\Job;
 use Drupal\advancedqueue\JobResult;
 use Drupal\advancedqueue\Plugin\AdvancedQueue\JobType\JobTypeBase;
-use Drupal\os2forms_fbs_handler\Client\FBS;
+use Drupal\os2forms_fbs_handler\Client\Fbs;
 use Drupal\os2forms_fbs_handler\Client\Model\Guardian;
 use Drupal\os2forms_fbs_handler\Client\Model\Patron;
 use Drupal\os2web_audit\Service\Logger;
@@ -84,7 +84,7 @@ public function process(Job $job): JobResult {
       $config = $payload['configuration'];
 
       try {
-        $fbs = new FBS($this->client, $config['endpoint_url'], $config['agency_id'], $config['username'], $config['password']);
+        $fbs = new Fbs($this->client, $config['endpoint_url'], $config['agency_id'], $config['username'], $config['password']);
 
         // Log into FBS and obtain session.
         $fbs->login();