diff --git a/module/VuFind/src/VuFind/Auth/LDAP.php b/module/VuFind/src/VuFind/Auth/LDAP.php
index 3dd881635d8a58cc2c427b2672f45ad1dc321985..699402a6a06204be05f0af50266efcd8be3b44d9 100644
--- a/module/VuFind/src/VuFind/Auth/LDAP.php
+++ b/module/VuFind/src/VuFind/Auth/LDAP.php
@@ -291,7 +291,7 @@ class LDAP extends AbstractBase
 
         // Save credentials if applicable:
         if (!empty($catPassword) && !empty($user->cat_username)) {
-            $user->saveCredentials($user->cat_username, $catPassword); 
+            $user->saveCredentials($user->cat_username, $catPassword);
         }
 
         // Update the user in the database, then return it to the caller:
diff --git a/module/VuFind/src/VuFind/Controller/AlphabrowseController.php b/module/VuFind/src/VuFind/Controller/AlphabrowseController.php
index ee169f5d4bad3c4a17b79b765af035dd874eff5a..94a6dcb4bd91b8eb78420602b3413ce1f3f0c8fd 100644
--- a/module/VuFind/src/VuFind/Controller/AlphabrowseController.php
+++ b/module/VuFind/src/VuFind/Controller/AlphabrowseController.php
@@ -103,7 +103,7 @@ class AlphabrowseController extends AbstractBase
         $page   = intval($this->params()->fromQuery('page', 0));
 
         // Set up any extra parameters to pass
-        $extraParams = new ParamBag(); 
+        $extraParams = new ParamBag();
         if (isset($extras[$source])) {
             $extraParams->add('extras', $extras[$source]);
         }
diff --git a/module/VuFind/src/VuFind/Controller/AuthorController.php b/module/VuFind/src/VuFind/Controller/AuthorController.php
index 68c54b240b1049be4c22e900661df062ef62dd94..a64233c56d0df363b3487e6efd43c4216153c4e4 100644
--- a/module/VuFind/src/VuFind/Controller/AuthorController.php
+++ b/module/VuFind/src/VuFind/Controller/AuthorController.php
@@ -40,7 +40,7 @@ class AuthorController extends AbstractSearch
 {
     /**
      * Sets the configuration for displaying author results
-     * 
+     *
      * @return mixed
      */
     public function resultsAction()
@@ -52,7 +52,7 @@ class AuthorController extends AbstractSearch
 
     /**
      * Sets the configuration for performing an author search
-     * 
+     *
      * @return mixed
      */
     public function searchAction()
@@ -65,7 +65,7 @@ class AuthorController extends AbstractSearch
 
     /**
      * Displays the proper page for a search action
-     * 
+     *
      * @return mixed
      */
     public function homeAction()
diff --git a/module/VuFind/src/VuFind/Db/AdapterFactory.php b/module/VuFind/src/VuFind/Db/AdapterFactory.php
index fc1c35abbe9c2247b16d7dd05954c0039da3c3dd..f681818dbb7aeefbcad853bd1e9a3bb54cfcd0d8 100644
--- a/module/VuFind/src/VuFind/Db/AdapterFactory.php
+++ b/module/VuFind/src/VuFind/Db/AdapterFactory.php
@@ -102,7 +102,7 @@ class AdapterFactory
      * @return Adapter
      */
     public function getAdapterFromOptions($options)
-    {       
+    {
         // Set up custom options by database type:
         $driver = strtolower($options['driver']);
         switch ($driver) {
@@ -110,7 +110,7 @@ class AdapterFactory
             $options['charset'] = isset($this->config->Database->charset)
                 ? $this->config->Database->charset : 'utf8';
             $options['options'] = array('buffer_results' => true);
-            break; 
+            break;
         }
 
         // Set up database connection:
diff --git a/module/VuFind/src/VuFind/Db/Table/Tags.php b/module/VuFind/src/VuFind/Db/Table/Tags.php
index 59240d507411efa5050974d7e2dfc470e004c5cb..ec8316a20e13bcb06efb263b38ece75a5f0c65c1 100644
--- a/module/VuFind/src/VuFind/Db/Table/Tags.php
+++ b/module/VuFind/src/VuFind/Db/Table/Tags.php
@@ -99,7 +99,7 @@ class Tags extends Gateway
      */
     public function getForResource($id, $source = 'VuFind', $limit = 0,
         $list = null, $user = null, $sort = 'count'
-    ) {   
+    ) {
         return $this->select(
             function ($select) use ($id, $source, $limit, $list, $user, $sort) {
                 $select->columns(
diff --git a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
index 7632632df5d518e06ad8d94ea462d78ceafb26ae..a657347c2b187b74193eff77dcc4622b654ef216 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
@@ -814,7 +814,7 @@ class ClaviusSQL extends AbstractBase
     public function getMyTransactions($user, $history = false)
     {
         //TODO mssql a Oracle
-        $sql = "SELECT DATE_FORMAT(k.datum2,'%e. %c. %Y') as duedate, 
+        $sql = "SELECT DATE_FORMAT(k.datum2,'%e. %c. %Y') as duedate,
                 TRIM(s.ckod) as barcode, t.druhdoku as druhdoku, t.tcislo as tcislo,
                 t.rokvydani as year, CONCAT(t.nazev, t.big_nazev) as title,
                 TRIM(s.pcislo) as item_id
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Sierra.php b/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
index 04b431f16a5e782ae27a9171722f67dfe54e64c4..9fd27ba8daf4b24645b52e945ad4604372b7a62f 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
@@ -445,9 +445,9 @@ class Sierra extends AbstractBase
                             FROM
                             sierra_view.item_view
                         LEFT JOIN sierra_view.location
-                        ON (item_view.location_code = location.code) 
-                        LEFT JOIN sierra_view.location_name 
-                        ON (location.id = location_name.location_id) 
+                        ON (item_view.location_code = location.code)
+                        LEFT JOIN sierra_view.location_name
+                        ON (location.id = location_name.location_id)
                         LEFT JOIN sierra_view.checkout
                         ON (item_view.id = checkout.item_record_id)
                         LEFT JOIN sierra_view.varfield_view
diff --git a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
index 9261cb23f6e4cb9ec13432058d428d2024eda1cd..79603a8bfe0205fe63cc89233136df14ca37edd8 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
@@ -1654,7 +1654,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
                 '<ns1:LookupUser>';
 
         if (!is_null($patron_agency_id)) {
-            $ret .= 
+            $ret .=
                    '<ns1:InitiationHeader>' .
                         '<ns1:ToAgencyId>' .
                             '<ns1:AgencyId>' .
@@ -1664,7 +1664,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
                     '</ns1:InitiationHeader>';
         }
 
-        $ret .= 
+        $ret .=
                     '<ns1:AuthenticationInput>' .
                         '<ns1:AuthenticationInputData>' .
                             htmlspecialchars($username) .
diff --git a/module/VuFind/src/VuFind/Log/Logger.php b/module/VuFind/src/VuFind/Log/Logger.php
index 084bc96be2fa5cd9a0001b08a97817743239acc4..b5d648e5e3f7ab2b39162935419cc0602b8dbbf6 100644
--- a/module/VuFind/src/VuFind/Log/Logger.php
+++ b/module/VuFind/src/VuFind/Log/Logger.php
@@ -317,9 +317,9 @@ class Logger extends BaseLogger implements ServiceLocatorAwareInterface
     
     /**
      * Convert function argument to a loggable string
-     * 
+     *
      * @param mixed $arg Argument
-     * 
+     *
      * @return string
      */
     protected function argumentToString($arg)
@@ -344,6 +344,6 @@ class Logger extends BaseLogger implements ServiceLocatorAwareInterface
         if (is_null($arg)) {
             return 'null';
         }
-        return "'$arg'";        
+        return "'$arg'";
     }
 }
diff --git a/module/VuFind/src/VuFind/OAI/Server.php b/module/VuFind/src/VuFind/OAI/Server.php
index c5c977cd81a3dba255f9c87ad5290463dc76c6ff..9260e6f1913d204fcf57963cdd483c419a319e15 100644
--- a/module/VuFind/src/VuFind/OAI/Server.php
+++ b/module/VuFind/src/VuFind/OAI/Server.php
@@ -274,7 +274,7 @@ class Server
      *
      * @return void
      */
-    protected function attachRecordHeader($xml, $id, $date, $sets = array(), 
+    protected function attachRecordHeader($xml, $id, $date, $sets = array(),
         $status = ''
     ) {
         $header = $xml->addChild('header');
diff --git a/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommend.php b/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommend.php
index e741303a26d40cfc4f79a0f14eb7b5111bdcf927..57dc6f9ce7e628836824645d99bf8e82180c96ad 100644
--- a/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommend.php
+++ b/module/VuFind/src/VuFind/Recommend/AbstractSummonRecommend.php
@@ -126,7 +126,7 @@ abstract class AbstractSummonRecommend implements RecommendInterface
     public function process($results)
     {
         // If we received a Summon search object, we'll use that.  If not, we need
-        // to create a new Summon search object using the specified request 
+        // to create a new Summon search object using the specified request
         // parameter for search terms.
         if ($results->getParams()->getSearchClassId() != 'Summon') {
             $results = $this->resultsManager->get('Summon');
diff --git a/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php b/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
index b43501fbb028b89cc0bafbc57b84472bf0b5dbb3..671e7790a16bb209fc6ca7a2e400d3b238d96ed4 100644
--- a/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
+++ b/module/VuFind/src/VuFind/Recommend/EuropeanaResultsDeferred.php
@@ -32,7 +32,7 @@ namespace VuFind\Recommend;
  * EuropeanaResultsDeferred Recommendations Module
  *
  * This class sets up an AJAX call to trigger a call to the EuropeanaResults
- * module.  
+ * module.
  *
  * @category VuFind2
  * @package  Recommendations
diff --git a/module/VuFind/src/VuFind/RecordDriver/Summon.php b/module/VuFind/src/VuFind/RecordDriver/Summon.php
index 494abcae61f18969a08e8c0449680afa17512487..c8f87ce9ac671a4f3942d887a802e68104f8d575 100644
--- a/module/VuFind/src/VuFind/RecordDriver/Summon.php
+++ b/module/VuFind/src/VuFind/RecordDriver/Summon.php
@@ -55,9 +55,9 @@ class Summon extends SolrDefault
     public function getAllSubjectHeadings()
     {
         $retval = array();
-        $topic = isset($this->fields['SubjectTerms']) ? 
+        $topic = isset($this->fields['SubjectTerms']) ?
             $this->fields['SubjectTerms'] : array();
-        $temporal = isset($this->fields['TemporalSubjectTerms']) ? 
+        $temporal = isset($this->fields['TemporalSubjectTerms']) ?
             $this->fields['TemporalSubjectTerms'] : array();
         $geo = isset($this->fields['GeographicLocations']) ?
             $this->fields['GeographicLocations'] : array();
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php b/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php
index 619aadbbef4a67f210d858c3bb6fee6cbfad9774..2bd6002cb050a03ca402ba2d49ca0faf9b6ea024 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Sfx.php
@@ -79,7 +79,7 @@ class Sfx implements DriverInterface
     public function fetchLinks($openURL)
     {
         // Make the call to SFX and load results
-        $url = $this->baseUrl . 
+        $url = $this->baseUrl .
             '?sfx.response_type=multi_obj_detailed_xml&svc.fulltext=yes&' . $openURL;
         $feed = $this->httpClient->setUri($url)->send()->getBody();
         return $feed;
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
index 24d281eff4635122d49dee94ff210d10933aa412..544e95fd5f55487c4ac576e1757a0c9e1182800a 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
@@ -166,9 +166,9 @@ class Citation extends \Zend\View\Helper\AbstractHelper
 
     /**
      * Retrieve a citation in a particular format
-     * 
+     *
      * Returns the citation in the format specified
-     * 
+     *
      * @param string $format Citation format ('APA' or 'MLA')
      *
      * @return string        Formatted citation
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
index aeaab9a50e14240255f802dfd552d057d556d2ba..dc9ab80b325cbc1d0ddd480084e89cf20a94ebc9 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Record.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -524,7 +524,7 @@ class Record extends AbstractHelper
             // Apply prefix if found
             if (isset($link['prefix'])) {
                 $link['url'] = $link['prefix'] . $link['url'];
-            }            
+            }
             // Use URL as description if missing:
             if (!isset($link['desc'])) {
                 $link['desc'] = $link['url'];
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php
index eb166073e19089854ddadff1c5ffbb767069a055..068f98ec4dfab637db9ed0c84abdc8b977fda6b6 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php
@@ -247,7 +247,7 @@ class OAITest extends \VuFindTest\Unit\TestCase
     }
 
     /**
-     * 
+     *
     /**
      * Test that a missing URL throws an exception.
      *
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/MultiIndexListenerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/MultiIndexListenerTest.php
index 13c8dd0d5fc0a2315155cc7d6d0d7338c71a35dd..3ee0067f3f6a0a52d7fbee5574d9b8fddf97c68e 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/MultiIndexListenerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/MultiIndexListenerTest.php
@@ -139,7 +139,7 @@ class MultiIndexListenerTest extends TestCase
     {
         $params   = new ParamBag(
             array(
-                'facet.field' => array('field_1', 'field_2', 'field_3'), 
+                'facet.field' => array('field_1', 'field_2', 'field_3'),
                 'shards' => array(self::$shards['b'], self::$shards['c']),
             )
         );
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php
index 485970ccb4a6657eed556c5c1b83e936f234e526..781213ce569ee3faac0960a973148b60ffc59810 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php
@@ -139,7 +139,7 @@ class Backend extends AbstractBackend
         $this->connector->search($baseParams);
 
         /* Pazpar2 does not return all results immediately. Rather, we need to
-         * occassionally check with the Pazpar2 server on the status of the 
+         * occassionally check with the Pazpar2 server on the status of the
          * search.
          *
          * This loop will continue to wait until the configured level of
diff --git a/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php b/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php
index 736c7f64918eb76420ad0f1232f5fe7ce0b82b7f..b2ccc29ac45956928365c3e6e021cbe8e28392a0 100644
--- a/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php
+++ b/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php
@@ -55,7 +55,7 @@ class InjectTemplateListener extends \Zend\Mvc\View\Http\InjectTemplateListener
 
     /**
      * Determine the top-level namespace of the controller
-     * 
+     *
      * @param string $controller Controller name
      *
      * @return string