diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php b/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php
index 5e4d6a2375e8fbd40ab1b9001dda1ebce868fee8..b08728276fb7d84f2bbbe17a7b22b99b922651d2 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php
@@ -330,7 +330,7 @@ class GetItemStatuses extends AbstractBase implements TranslatorAwareInterface
     protected function getItemStatusGroup($record, $messages, $callnumberSetting)
     {
         // Summarize call number, location and availability info across all items:
-        $locations =  [];
+        $locations = [];
         $use_unknown_status = $available = false;
         foreach ($record as $info) {
             // Find an available copy
diff --git a/module/VuFind/src/VuFind/Cart.php b/module/VuFind/src/VuFind/Cart.php
index a9e4bf4b13a6164ac20e024fc132652dd5de4aa2..51ab9cf25235e51d709abda9e429110f6071cd11 100644
--- a/module/VuFind/src/VuFind/Cart.php
+++ b/module/VuFind/src/VuFind/Cart.php
@@ -84,7 +84,7 @@ class Cart
      */
     protected $cookieManager;
 
-    const CART_COOKIE =  'vufind_cart';
+    const CART_COOKIE = 'vufind_cart';
     const CART_COOKIE_SOURCES = 'vufind_cart_src';
     const CART_COOKIE_DELIM = "\t";
 
diff --git a/module/VuFind/src/VuFind/Controller/AlphabrowseController.php b/module/VuFind/src/VuFind/Controller/AlphabrowseController.php
index dda555b45f0104a41aa511ee90f6185d9602cffb..b408b516623455fdcf68f24c319e5c73c0f50dfa 100644
--- a/module/VuFind/src/VuFind/Controller/AlphabrowseController.php
+++ b/module/VuFind/src/VuFind/Controller/AlphabrowseController.php
@@ -160,7 +160,7 @@ class AlphabrowseController extends AbstractBase
             $highlight_row = $rows_before;
             // special case: match row is < rows_before (i.e. at beginning of list)
             if ($startRow_adj < $rows_before) {
-                $highlight_row =  $startRow_adj;
+                $highlight_row = $startRow_adj;
             }
             // special case: we've gone past the end
             // only the rows_before records will have been returned
diff --git a/module/VuFind/src/VuFind/Controller/CollectionsController.php b/module/VuFind/src/VuFind/Controller/CollectionsController.php
index b485360810a5b78e212b9d9570b8c46926c17cc4..244604bdd0a40c6e5ee299b113364da9176867e2 100644
--- a/module/VuFind/src/VuFind/Controller/CollectionsController.php
+++ b/module/VuFind/src/VuFind/Controller/CollectionsController.php
@@ -189,7 +189,7 @@ class CollectionsController extends AbstractBase
         foreach ($result as $rkey => $collection) {
             list($name, $id) = explode($delimiter, $collection['value'], 2);
             $result[$rkey]['displayText'] = $name;
-            $result[$rkey]['value'] =  $id;
+            $result[$rkey]['value'] = $id;
         }
 
         // Sort the $results and get the position of the from string once sorted
diff --git a/module/VuFind/src/VuFind/Controller/InstallController.php b/module/VuFind/src/VuFind/Controller/InstallController.php
index 8269e32c7f6d2cf117594d85131b0409575b48b4..d45cb21701faaf88336e8b9634677f0078ceb666 100644
--- a/module/VuFind/src/VuFind/Controller/InstallController.php
+++ b/module/VuFind/src/VuFind/Controller/InstallController.php
@@ -475,9 +475,9 @@ class InstallController extends AbstractBase
     {
         // Special case: PostgreSQL:
         if ($view->driver == 'pgsql') {
-            $grantTables =  "GRANT ALL PRIVILEGES ON ALL TABLES IN "
+            $grantTables = "GRANT ALL PRIVILEGES ON ALL TABLES IN "
                 . "SCHEMA public TO {$view->dbuser} ";
-            $grantSequences =  "GRANT ALL PRIVILEGES ON ALL SEQUENCES"
+            $grantSequences = "GRANT ALL PRIVILEGES ON ALL SEQUENCES"
                 . " IN SCHEMA public TO {$view->dbuser} ";
             return [$grantTables, $grantSequences];
         }
diff --git a/module/VuFind/src/VuFind/Cover/Loader.php b/module/VuFind/src/VuFind/Cover/Loader.php
index c521b77da49410919a00cba37403f32cec39b62b..1f195356cdd4ae0b33798a42ca15f2762766e029 100644
--- a/module/VuFind/src/VuFind/Cover/Loader.php
+++ b/module/VuFind/src/VuFind/Cover/Loader.php
@@ -629,7 +629,7 @@ class Loader extends \VuFind\ImageLoader
             $imagePath = substr($url, 7);
 
             // Display the image:
-            $this->contentType =  mime_content_type($imagePath);
+            $this->contentType = mime_content_type($imagePath);
             $this->image = file_get_contents($imagePath);
             return true;
         } else {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Alma.php b/module/VuFind/src/VuFind/ILS/Driver/Alma.php
index f4df65fee9ee31bdf7135480bb307207d0a87282..0cd9ac92ceee7c05261bcac4de632471716b7457 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Alma.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Alma.php
@@ -789,46 +789,46 @@ class Alma extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
             return [];
         }
         $profile = [
-            'firstname'  => (isset($xml->first_name))
-                                ? (string)$xml->first_name
-                                : null,
-            'lastname'   => (isset($xml->last_name))
-                                ? (string)$xml->last_name
-                                : null,
-            'group'      => isset($xml->user_group)
-                                ? $this->getTranslatableString($xml->user_group)
-                                : null,
+            'firstname' => (isset($xml->first_name))
+                ? (string)$xml->first_name
+                : null,
+            'lastname' => (isset($xml->last_name))
+                ? (string)$xml->last_name
+                : null,
+            'group' => isset($xml->user_group)
+                ? $this->getTranslatableString($xml->user_group)
+                : null,
             'group_code' => (isset($xml->user_group))
-                                ? (string)$xml->user_group
-                                : null
+                ? (string)$xml->user_group
+                : null
         ];
         $contact = $xml->contact_info;
         if ($contact) {
             if ($contact->addresses) {
                 $address = $contact->addresses[0]->address;
-                $profile['address1'] =  (isset($address->line1))
-                                            ? (string)$address->line1
-                                            : null;
-                $profile['address2'] =  (isset($address->line2))
-                                            ? (string)$address->line2
-                                            : null;
-                $profile['address3'] =  (isset($address->line3))
-                                            ? (string)$address->line3
-                                            : null;
-                $profile['zip']      =  (isset($address->postal_code))
-                                            ? (string)$address->postal_code
-                                            : null;
-                $profile['city']     =  (isset($address->city))
-                                            ? (string)$address->city
-                                            : null;
-                $profile['country']  =  (isset($address->country))
-                                            ? (string)$address->country
-                                            : null;
+                $profile['address1'] = (isset($address->line1))
+                    ? (string)$address->line1
+                    : null;
+                $profile['address2'] = (isset($address->line2))
+                    ? (string)$address->line2
+                    : null;
+                $profile['address3'] = (isset($address->line3))
+                    ? (string)$address->line3
+                    : null;
+                $profile['zip'] = (isset($address->postal_code))
+                    ? (string)$address->postal_code
+                    : null;
+                $profile['city'] = (isset($address->city))
+                    ? (string)$address->city
+                    : null;
+                $profile['country'] = (isset($address->country))
+                    ? (string)$address->country
+                    : null;
             }
             if ($contact->phones) {
                 $profile['phone'] = (isset($contact->phones[0]->phone->phone_number))
-                                   ? (string)$contact->phones[0]->phone->phone_number
-                                   : null;
+                    ? (string)$contact->phones[0]->phone->phone_number
+                    : null;
             }
             $profile['email'] = $this->getPreferredEmail($xml);
         }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
index 809f0614dea5ae0c57a9e41671849931c900efdc..75224a2e7cb6d4807cfc351049b02aa888f88207 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
@@ -610,7 +610,7 @@ class Amicus extends AbstractBase implements TranslatorAwareInterface
             "AS DUEDATE, CIRT_ITM.BIB_ITM_NBR AS BIB_ID " .
             "FROM LV_USER, CIRT_ITM " .
             "WHERE LV_USER.PRSN_NBR = CIRT_ITM.PRSN_NBR " .
-            "AND LV_USER.LOGIN =  '" . $patron['id'] . "'";
+            "AND LV_USER.LOGIN = '" . $patron['id'] . "'";
         try {
             $sqlStmt = $this->db->prepare($sql);
             $sqlStmt->execute();
diff --git a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
index 3359cac62304244704cfe0efaca37ee19cd6c23c..aec518b811a894810865b76287d08d4866467fc3 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
@@ -546,7 +546,7 @@ class HorizonXMLAPI extends Horizon implements \VuFindHttp\HttpServiceAwareInter
         $initResponse = $this->makeRequest($params);
 
         if ($initResponse->request_confirm) {
-            $confirmParams =  [
+            $confirmParams = [
                 "session" => $session,
                 "profile" => $this->wsProfile,
                 "bibkey" => $requestDetails['bibId'],
diff --git a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
index 4ca53c1fdc8bbc1cb6a4686b00adea490104745d..e528c429e46eb357652f527f37d184c50fb8a524 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
@@ -482,7 +482,7 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
             "Y-m-d", $display_date
         );
 
-        $checkTime =  $this->dateConverter->convertFromDisplayDate(
+        $checkTime = $this->dateConverter->convertFromDisplayDate(
             "U", $display_date
         );
         if (!is_numeric($checkTime)) {
@@ -1032,7 +1032,7 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
 
         $rescount = 0;
         foreach ($itemSqlStmt->fetchAll() as $rowItem) {
-            $items[] =  [
+            $items[] = [
                 'id' => $rowItem['id']
             ];
             $rescount++;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PAIA.php b/module/VuFind/src/VuFind/ILS/Driver/PAIA.php
index c055cc7ff3046f0314bd6e4f1dce9d361eba2ac5..12d7b9ef4d7a815ae129135e63747e939d315c98 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PAIA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PAIA.php
@@ -1441,7 +1441,7 @@ class PAIA extends DAIA
         $result['location'] = ($doc['storage'] ?? null);
 
         // queue (0..1) number of waiting requests for the document or item
-        $result['position'] =  ($doc['queue'] ?? null);
+        $result['position'] = ($doc['queue'] ?? null);
 
         // only true if status == 4
         $result['available'] = false;
@@ -1479,7 +1479,7 @@ class PAIA extends DAIA
         // Optional VuFind fields
         /*
         $result['reqnum'] = null;
-        $result['volume'] =  null;
+        $result['volume'] = null;
         $result['publication_year'] = null;
         $result['isbn'] = null;
         $result['issn'] = null;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
index 48f66f87efd8896733082374b1a390de0a631859..75aa0c586113194a6851c3611a3bd664c0d38422 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
@@ -1179,10 +1179,10 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         if (empty($url)) {
             $url = $this->host;
             if ($this->port) {
-                $url =  "http://" . $url . ":" . $this->port . "/" .
+                $url = "http://" . $url . ":" . $this->port . "/" .
                     $this->search_prog;
             } else {
-                $url =  "http://" . $url . "/" . $this->search_prog;
+                $url = "http://" . $url . "/" . $this->search_prog;
             }
         }
 
diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
index 35b391a11249f6a74f2488d431411cd5aae82fd3..e1a7ad153cbc938f591e3b5e1f7f2146cb4a8593 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
@@ -1507,7 +1507,7 @@ EOT;
         }
 
         // Build request
-        $xml =  <<<EOT
+        $xml = <<<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <ser:serviceParameters
   xmlns:ser="http://www.endinfosys.com/Voyager/serviceParameters">
@@ -1973,7 +1973,7 @@ EOT;
         }
 
         try {
-            $checkTime =  $this->dateFormat->convertFromDisplayDate(
+            $checkTime = $this->dateFormat->convertFromDisplayDate(
                 'U', $holdDetails['requiredBy']
             );
             if (!is_numeric($checkTime)) {
@@ -2734,7 +2734,7 @@ EOT;
             return false;
         }
 
-        $xml =  <<<EOT
+        $xml = <<<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <ser:serviceParameters
 xmlns:ser="http://www.endinfosys.com/Voyager/serviceParameters">
@@ -2943,7 +2943,7 @@ EOT;
         $barcode = $this->encodeXML($catUsername);
         $pickupLib = $this->encodeXML($pickupLib);
 
-        $xml =  <<<EOT
+        $xml = <<<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <ser:serviceParameters
 xmlns:ser="http://www.endinfosys.com/Voyager/serviceParameters">
@@ -3056,7 +3056,7 @@ EOT;
         }
 
         // Attempt Request
-        $xml =  <<<EOT
+        $xml = <<<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <ser:serviceParameters
 xmlns:ser="http://www.endinfosys.com/Voyager/serviceParameters">
@@ -3313,7 +3313,7 @@ EOT;
         }
         $barcode = htmlspecialchars($patron['cat_username'], ENT_COMPAT, 'UTF-8');
 
-        $xml =  <<<EOT
+        $xml = <<<EOT
 <?xml version="1.0" encoding="UTF-8"?>
 <ser:serviceParameters
 xmlns:ser="http://www.endinfosys.com/Voyager/serviceParameters">
diff --git a/module/VuFind/src/VuFind/ImageLoader.php b/module/VuFind/src/VuFind/ImageLoader.php
index 228622ead3ed404968a34caf828dcd3fc4650e5a..4746b27e3509fef3a11c0efdafdef7f51244c868 100644
--- a/module/VuFind/src/VuFind/ImageLoader.php
+++ b/module/VuFind/src/VuFind/ImageLoader.php
@@ -145,7 +145,7 @@ class ImageLoader implements \Zend\Log\LoggerAwareInterface
         // Check all supported image formats:
         $filenames = [];
         foreach ($formats as $format) {
-            $filenames[] =  $path . $format;
+            $filenames[] = $path . $format;
         }
         if (null === $this->themeTools) {
             throw new \Exception('\VuFindTheme\ThemeInfo object missing');
diff --git a/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommendDeferred.php b/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommendDeferred.php
index b71764cce7bbe947a7e5429953369efb94fafb25..e04a062b3a421123a3a4ed21f6b4e564527d02a1 100644
--- a/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommendDeferred.php
+++ b/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommendDeferred.php
@@ -118,7 +118,7 @@ class AbstractSummonRecommendDeferred implements RecommendInterface
 
         // Collect the best possible search term(s):
         $lookforParam = empty($settings[0]) ? 'lookfor' : $settings[0];
-        $this->lookfor =  $request->get($lookforParam, '');
+        $this->lookfor = $request->get($lookforParam, '');
         if (empty($this->lookfor) && is_object($params)) {
             $this->lookfor = $params->getQuery()->getAllTerms();
         }
diff --git a/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php b/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php
index f163c352dd59c5e01411561b7cd7ae83ea956f41..be9a7515eee499870394a2381a3838a8077f26b7 100644
--- a/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php
+++ b/module/VuFind/src/VuFind/Recommend/EuropeanaResults.php
@@ -196,7 +196,7 @@ class EuropeanaResults implements RecommendInterface,
     public function init($params, $request)
     {
         // Collect the best possible search term(s):
-        $this->lookfor =  $request->get('lookfor', '');
+        $this->lookfor = $request->get('lookfor', '');
         if (empty($this->lookfor) && is_object($params)) {
             $this->lookfor = $params->getQuery()->getAllTerms();
         }
diff --git a/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php b/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
index 9be50bdf5fa6af55677cdd3ab85c60b964951c64..d26cf3ce5f4ff8c75816fa390415cce556599358 100644
--- a/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
+++ b/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
@@ -100,7 +100,7 @@ class EuropeanaResultsDeferred implements RecommendInterface
         }
 
         // Collect the best possible search term(s):
-        $this->lookfor =  $request->get('lookfor', '');
+        $this->lookfor = $request->get('lookfor', '');
         if (empty($this->lookfor) && is_object($params)) {
             $this->lookfor = $params->getQuery()->getAllTerms();
         }
diff --git a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php
index afcdd42b54cdaee4a1a60831c3709c5e250d75c3..7704b10ef23d3e54ae5bdbc74d68bb19e5179648 100644
--- a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php
+++ b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php
@@ -147,7 +147,7 @@ class OpenLibrarySubjects implements RecommendInterface,
     public function init($params, $request)
     {
         // Get and normalise $requestParam
-        $this->subject =  $request->get($this->requestParam);
+        $this->subject = $request->get($this->requestParam);
 
         // Set up the published date range if it has not already been provided:
         if (empty($this->publishedIn) && $this->pubFilter) {
diff --git a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php
index 081460d039baf0909867ffaea56613bb7b05a24e..a673407cc72d1986a9e0d3cd2528cdc83225e4e5 100644
--- a/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php
+++ b/module/VuFind/src/VuFind/Recommend/OpenLibrarySubjectsDeferred.php
@@ -112,7 +112,7 @@ class OpenLibrarySubjectsDeferred extends OpenLibrarySubjects
         $this->processedParams = implode(':', $settings);
 
         // Collect the best possible search term(s):
-        $this->subject =  $request->get($this->requestParam);
+        $this->subject = $request->get($this->requestParam);
         if (empty($this->subject) && is_object($params)) {
             $this->subject = $params->getQuery()->getAllTerms();
         }
diff --git a/module/VuFind/src/VuFind/RecordDriver/EDS.php b/module/VuFind/src/VuFind/RecordDriver/EDS.php
index 208260ea92c321939805177c1f7b9250252be61c..eba329676a45f93fea5a3c497572438a06fa68f5 100644
--- a/module/VuFind/src/VuFind/RecordDriver/EDS.php
+++ b/module/VuFind/src/VuFind/RecordDriver/EDS.php
@@ -535,7 +535,7 @@ class EDS extends DefaultRecord
     {
         $groupsToReplace = ['au','su'];
         if (in_array($group, $groupsToReplace)) {
-            $br =  '/<br \/>/';
+            $br = '/<br \/>/';
             $comma = ', ';
             return preg_replace($br, $comma, $data);
         }
diff --git a/module/VuFind/src/VuFind/Search/EDS/Options.php b/module/VuFind/src/VuFind/Search/EDS/Options.php
index 2fa20504888c258251637b76732b0df8a51bfe24..0b8c778302a38f951a81bcf1088e8911ba0964b6 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Options.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Options.php
@@ -481,7 +481,7 @@ class Options extends \VuFind\Search\Base\Options
                     if (isset($expander['DefaultOn'])
                         && 'y' == $expander['DefaultOn']
                     ) {
-                        $this->defaultExpanders[] =  $expander['Id'];
+                        $this->defaultExpanders[] = $expander['Id'];
                     }
                 }
             }
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
index a8fb868655af3107a04f61ac4c967e5d9c263066..f509089a96f946c9031d9a1f4bab61066fcf04b3 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
@@ -273,7 +273,7 @@ class Citation extends \Zend\View\Helper\AbstractHelper
         } else {
             // Add other journal-specific details:
             $mla['pageRange'] = $this->getPageRange();
-            $mla['journal'] =  $this->capitalizeTitle($this->details['journal']);
+            $mla['journal'] = $this->capitalizeTitle($this->details['journal']);
             $mla['numberAndDate'] = $this->getMLANumberAndDate($volNumSeparator);
             return $partial('Citation/mla-article.phtml', $mla);
         }
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
index cad62f92f8e54827dab2c7a16978061467d1d532..12e2cd3f5c74292153ba1ce138d41eaed34627f9 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
@@ -421,7 +421,7 @@ class Backend extends AbstractBackend
         }
         $authTokenData = $this->cache->getItem('edsAuthenticationToken');
         if (isset($authTokenData)) {
-            $currentToken =  $authTokenData['token'] ?? '';
+            $currentToken = $authTokenData['token'] ?? '';
             $expirationTime = $authTokenData['expiration'] ?? 0;
             $this->debugPrint(
                 'Cached Authentication data: '
@@ -473,7 +473,7 @@ class Backend extends AbstractBackend
         }
         $autocompleteData = $this->cache->getItem('edsAutocomplete');
         if (!empty($autocompleteData)) {
-            $currentToken =  $autocompleteData['token'] ?? '';
+            $currentToken = $autocompleteData['token'] ?? '';
             $expirationTime = $autocompleteData['expiration'] ?? 0;
 
             // Check to see if the token expiration time is greater than the current
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
index 7c5e702ab5dfaccc98038e9c0a09cc58b895a98f..79fefed753ef358425861709d79f2865087e29fb 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
@@ -118,7 +118,7 @@ class QueryBuilder
      */
     protected function queryGroupToArray(QueryGroup $query)
     {
-        $groups =  [];
+        $groups = [];
         foreach ($query->getQueries() as $params) {
             // Advanced Search
             if ($params instanceof QueryGroup) {
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php
index 28b321d6a07c8f815075e59296741e1018d58545..69804c642c9f064329599ef9e318fd64c6053ab2 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadThemeResources.php
@@ -170,7 +170,7 @@ class HeadThemeResources extends \Zend\View\Helper\AbstractHelper
         // Load Javascript (same ordering considerations as CSS, above):
         $headScript = $this->getView()->plugin('headScript');
         foreach (array_reverse($this->container->getJs()) as $current) {
-            $parts =  $this->parseSetting($current);
+            $parts = $this->parseSetting($current);
             $headScript()->forcePrependFile(
                 trim($parts[0]),
                 'text/javascript',