Merge branch 'release-3.0'

module/VuFind/src/VuFind/ILS/Driver/DAIA.php

@@ -362,7 +362,7 @@ class DAIA extends AbstractBase implements
     {
         $http_headers = [
             'Content-type: ' . $this->contentTypesRequest[$this->daiaResponseFormat],
-            'Accept: ' .  $this->contentTypesRequest[$this->daiaResponseFormat],
+            'Accept: ' . $this->contentTypesRequest[$this->daiaResponseFormat],
         ];
 
         $params = [

module/VuFind/src/VuFind/ILS/Driver/Unicorn.php

@@ -322,7 +322,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
             $cmp = create_function(
                 '$a,$b',
                 'if ($a["shelving_key"] == $b["shelving_key"]) '
-                .     'return $a["number"] - $b["number"];'
+                . 'return $a["number"] - $b["number"];'
                 . 'return $a["shelving_key"] < $b["shelving_key"] ? 1 : -1;'
             );
             usort($items, $cmp);

module/VuFind/src/VuFind/ILS/Driver/Virtua.php

@@ -1764,24 +1764,24 @@ class Virtua extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterfa
 
         // Have to use raw post data because of the way
         //   virtua expects the barcodes to come across.
-        $post_data  = "function="      . "RENEWAL";
-        $post_data .= "&search="       . "PATRON";
-        $post_data .= "&sessionid="    . "$session_id";
-        $post_data .= "&skin="         . "homepage";
-        $post_data .= "&lng="          . $this->getConfiguredLanguage();
-        $post_data .= "&inst="         . "consortium";
-        $post_data .= "&conf="         . urlencode("./chameleon.conf");
-        $post_data .= "&u1="           . "12";
+        $post_data  = "function=" . "RENEWAL";
+        $post_data .= "&search=" . "PATRON";
+        $post_data .= "&sessionid=" . "$session_id";
+        $post_data .= "&skin=" . "homepage";
+        $post_data .= "&lng=" . $this->getConfiguredLanguage();
+        $post_data .= "&inst=" . "consortium";
+        $post_data .= "&conf=" . urlencode("./chameleon.conf");
+        $post_data .= "&u1=" . "12";
         $post_data .= "&SourceScreen=" . "PATRONACTIVITY";
-        $post_data .= "&pos="          . "1";
-        $post_data .= "&patronid="     . $patron['cat_username'];
+        $post_data .= "&pos=" . "1";
+        $post_data .= "&patronid=" . $patron['cat_username'];
         $post_data .= "&patronhost="
             . urlencode($this->config['Catalog']['patron_host']);
         $post_data .= "&host="
             . urlencode($this->config['Catalog']['host_string']);
-        $post_data .= "&itembarcode="  . implode("&itembarcode=", $item_list);
-        $post_data .= "&submit="       . "Renew";
-        $post_data .= "&reset="        . "Clear";
+        $post_data .= "&itembarcode=" . implode("&itembarcode=", $item_list);
+        $post_data .= "&submit=" . "Renew";
+        $post_data .= "&reset=" . "Clear";
 
         $result = $this->httpRequest($virtua_url, null, $post_data);
 
@@ -1832,7 +1832,7 @@ class Virtua extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterfa
         }
 
         foreach ($result as $row) {
-            $list[] = 'vtls' .  str_pad($row['AUTH_ID'], 9, "0", STR_PAD_LEFT);
+            $list[] = 'vtls' . str_pad($row['AUTH_ID'], 9, "0", STR_PAD_LEFT);
         }
         return $list;
     }

module/VuFind/src/VuFind/Service/Factory.php

@@ -873,7 +873,7 @@ class Factory
         // Set up the ExtendedIni plugin:
         $config = $sm->get('VuFind\Config')->get('config');
         $pathStack = [
-            APPLICATION_PATH  . '/languages',
+            APPLICATION_PATH . '/languages',
             LOCAL_OVERRIDE_DIR . '/languages'
         ];
         $fallbackLocales = $config->Site->language == 'en'

module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php

@@ -89,7 +89,7 @@ class DevtoolsController extends \VuFind\Controller\AbstractBase
     public function languageAction()
     {
         // Test languages with no local overrides and no fallback:
-        $loader = new ExtendedIni([APPLICATION_PATH  . '/languages']);
+        $loader = new ExtendedIni([APPLICATION_PATH . '/languages']);
         $helper = new LanguageHelper($loader, $this->getConfig());
         return $helper->getAllDetails($this->params()->fromQuery('main', 'en'));
     }

module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php

@@ -178,7 +178,7 @@ class LanguageHelper
     {
         static $domains = false;
         if (!$domains) {
-            $base = APPLICATION_PATH  . '/languages';
+            $base = APPLICATION_PATH . '/languages';
             $dir = opendir($base);
             $domains = [];
             while ($current = readdir($dir)) {

module/VuFindTheme/src/VuFindTheme/LessCompiler.php

@@ -181,7 +181,7 @@ class LessCompiler
         list($fileName, ) = explode('.', $less);
         $finalFile = $finalOutDir . $fileName . '.css';
 
-        $this->logMessage("\tcompiling '" . $less .  "' into '" . $finalFile . "'");
+        $this->logMessage("\tcompiling '" . $less . "' into '" . $finalFile . "'");
         $start = microtime(true);
 
         $directories = [];