diff --git a/module/VuDL/src/VuDL/Connection/AbstractBase.php b/module/VuDL/src/VuDL/Connection/AbstractBase.php
index 7c6b96e2007f906db8c98ef95e3e98730c4ce1ee..1229a945f300770ff497b030c80fc2b3066e008e 100644
--- a/module/VuDL/src/VuDL/Connection/AbstractBase.php
+++ b/module/VuDL/src/VuDL/Connection/AbstractBase.php
@@ -121,7 +121,7 @@ class AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
         foreach ($detailsList as $key => $title) {
             $keys = explode(',', $key);
             $field = false;
-            for ($i = 0;$i<count($keys);$i++) {
+            for ($i = 0;$i < count($keys);$i++) {
                 if (isset($record[$keys[$i]])) {
                     $field = $keys[$i];
                     break;
diff --git a/module/VuDL/src/VuDL/Connection/Fedora.php b/module/VuDL/src/VuDL/Connection/Fedora.php
index dad33f9b19a687525b5d0912707afbb519a0b9b5..b2049bc1e8d416de590f8fbdd426c105212f058b 100644
--- a/module/VuDL/src/VuDL/Connection/Fedora.php
+++ b/module/VuDL/src/VuDL/Connection/Fedora.php
@@ -211,7 +211,7 @@ class Fedora extends AbstractBase
         $response = $this->query($query);
         $list = explode("\n", $response->getBody());
         $items = [];
-        for ($i = 1;$i<count($list);$i++) {
+        for ($i = 1;$i < count($list);$i++) {
             if (empty($list[$i])) {
                 continue;
             }
@@ -261,7 +261,7 @@ class Fedora extends AbstractBase
         if (count($list) > 2) {
             $items = [];
             $sequenced = true;
-            for ($i = 1;$i<count($list);$i++) {
+            for ($i = 1;$i < count($list);$i++) {
                 if (empty($list[$i])) {
                     continue;
                 }
@@ -280,7 +280,7 @@ class Fedora extends AbstractBase
                 usort(
                     $items,
                     function ($a, $b) {
-                        return intval($a['seq'])-intval($b['seq']);
+                        return intval($a['seq']) - intval($b['seq']);
                     }
                 );
                 return array_map(
@@ -301,7 +301,7 @@ class Fedora extends AbstractBase
         $response = $this->query($query);
         $list = explode("\n", $response->getBody());
         $items = [];
-        for ($i = 1;$i<count($list);$i++) {
+        for ($i = 1;$i < count($list);$i++) {
             if (empty($list[$i])) {
                 continue;
             }
@@ -335,7 +335,7 @@ class Fedora extends AbstractBase
         $response = $this->query($query);
         $list = explode("\n", trim($response->getBody(), "\n"));
         $tree = [];
-        for ($i = 1;$i<count($list);$i++) {
+        for ($i = 1;$i < count($list);$i++) {
             list($child, $parent, $title) = explode(',', substr($list[$i], 12), 3);
             $parent = substr($parent, 12);
             if (!isset($tree[$parent])) {
@@ -420,7 +420,7 @@ class Fedora extends AbstractBase
         if (count($data) > 1) {
             $bytes = intval($data[1]);
             $sizes = ['bytes','KB','MB'];
-            while ($size_index < count($sizes)-1 && $bytes > 1024) {
+            while ($size_index < count($sizes) - 1 && $bytes > 1024) {
                 $bytes /= 1024;
                 $size_index++;
             }
diff --git a/module/VuDL/src/VuDL/Controller/VudlController.php b/module/VuDL/src/VuDL/Controller/VudlController.php
index 8a8d834472b5998985db195827f764a97d23fdd4..a27897385e64470898c4974aa50180e4fb07a629 100644
--- a/module/VuDL/src/VuDL/Controller/VudlController.php
+++ b/module/VuDL/src/VuDL/Controller/VudlController.php
@@ -178,7 +178,7 @@ class VudlController extends AbstractVuDL
         $start = $this->params()->fromQuery('start');
         $end = $this->params()->fromQuery('end');
         $data = [
-            'outline' => $this->getOutline($id, $start, $end-$start),
+            'outline' => $this->getOutline($id, $start, $end - $start),
             'start'  => (int)$start
         ];
         $data['outline'] = current($data['outline']['lists']);
@@ -271,7 +271,7 @@ class VudlController extends AbstractVuDL
         // Get ids for all files
         $outline = $this->getOutline(
             $root,
-            max(0, $view->initPage-($this->getConnector()->getPageLength()/2))
+            max(0, $view->initPage - ($this->getConnector()->getPageLength() / 2))
         );
 
         // Send the data for the first pages
@@ -430,11 +430,11 @@ class VudlController extends AbstractVuDL
                 ->toRoute('collection', ['id' => $params['trail']]);
         } elseif (isset($params['prev'])) {
             return $this->redirect()->toRoute(
-                'vudl-record', ['id' => $members[($index-1)%count($members)]]
+                'vudl-record', ['id' => $members[($index - 1) % count($members)]]
             );
         } else {
             return $this->redirect()->toRoute(
-                'vudl-record', ['id' => $members[($index+1)%count($members)]]
+                'vudl-record', ['id' => $members[($index + 1) % count($members)]]
             );
         }
     }
diff --git a/module/VuFind/src/VuFind/Cart.php b/module/VuFind/src/VuFind/Cart.php
index 2e6b8d2195cd02375aaf5f92ba3b390c9f64ff17..b4234148de091c4efeacbea181b234df2f1f70e6 100644
--- a/module/VuFind/src/VuFind/Cart.php
+++ b/module/VuFind/src/VuFind/Cart.php
@@ -163,7 +163,7 @@ class Cart
         $this->items = array_slice(array_unique($items), 0, $this->maxSize);
         $this->save();
         if ($total > $this->maxSize) {
-            $notAdded = $total-$this->maxSize;
+            $notAdded = $total - $this->maxSize;
             return ['success' => false, 'notAdded' => $notAdded];
         }
         return ['success' => true];
diff --git a/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php b/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php
index 86cd0917ada5f7a62106fce5ddeb203906b0bc3f..894a7cade6eee78ff93f7d1ca02d094b91aa2bc6 100644
--- a/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php
+++ b/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php
@@ -42,7 +42,6 @@ use Zend\Cache\Storage\StorageInterface;
  */
 class CacheDecorator implements ReaderInterface
 {
-
     /**
      * The decorated reader.
      *
diff --git a/module/VuFind/src/VuFind/Controller/CollectionsController.php b/module/VuFind/src/VuFind/Controller/CollectionsController.php
index 34ad4f6096216dbb32f9c9524046d2314e87e032..0229d3b9339e216a3058a007d2c26def4c9c845e 100644
--- a/module/VuFind/src/VuFind/Controller/CollectionsController.php
+++ b/module/VuFind/src/VuFind/Controller/CollectionsController.php
@@ -198,7 +198,7 @@ class CollectionsController extends AbstractBase
             $key = 0;
         }
         if ($key >= count($result)) {
-            $key = count($result)-1;
+            $key = count($result) - 1;
         }
 
         // Begin building view model:
diff --git a/module/VuFind/src/VuFind/Controller/CoverController.php b/module/VuFind/src/VuFind/Controller/CoverController.php
index fbe772e559f4e10e6d31799eaa1cbb3a75652223..2f4b6c2cacb24eabb9be2fb57c566d397d6ba5e1 100644
--- a/module/VuFind/src/VuFind/Controller/CoverController.php
+++ b/module/VuFind/src/VuFind/Controller/CoverController.php
@@ -132,7 +132,7 @@ class CoverController extends AbstractBase
         // is able to cache the cover images and not have to re-request
         // then on each page load. Default TTL set at 14 days
 
-        $coverImageTtl = (60*60*24*14); // 14 days
+        $coverImageTtl = (60 * 60 * 24 * 14); // 14 days
         $headers->addHeaderLine(
             'Cache-Control', "maxage=" . $coverImageTtl
         );
@@ -140,7 +140,7 @@ class CoverController extends AbstractBase
             'Pragma', 'public'
         );
         $headers->addHeaderLine(
-            'Expires', gmdate('D, d M Y H:i:s', time()+$coverImageTtl) . ' GMT'
+            'Expires', gmdate('D, d M Y H:i:s', time() + $coverImageTtl) . ' GMT'
         );
 
         $response->setContent($this->getLoader()->getImage());
diff --git a/module/VuFind/src/VuFind/Controller/HierarchyController.php b/module/VuFind/src/VuFind/Controller/HierarchyController.php
index ccf167ad5e9d16b0c14b0fba724e35622fff4701..bd00c3a421077519b63dd2c046d20657400e7c8d 100644
--- a/module/VuFind/src/VuFind/Controller/HierarchyController.php
+++ b/module/VuFind/src/VuFind/Controller/HierarchyController.php
@@ -93,7 +93,7 @@ class HierarchyController extends AbstractBase
             ->get('VuFind\SearchResultsPluginManager')->get('Solr');
         $results->getParams()->setBasicSearch($lookfor, $searchType);
         $results->getParams()->addFilter('hierarchy_top_id:' . $hierarchyID);
-        $facets = $results->getFullFieldFacets(['id'], false, $limit+1);
+        $facets = $results->getFullFieldFacets(['id'], false, $limit + 1);
 
         $callback = function ($data) {
             return $data['value'];
diff --git a/module/VuFind/src/VuFind/Controller/MyResearchController.php b/module/VuFind/src/VuFind/Controller/MyResearchController.php
index 7f5329af3cee17dc78c20c5465a472617934d756..a93693644b508f44a2c1b125b8896c6af8d3e4fd 100644
--- a/module/VuFind/src/VuFind/Controller/MyResearchController.php
+++ b/module/VuFind/src/VuFind/Controller/MyResearchController.php
@@ -1218,7 +1218,7 @@ class MyResearchController extends AbstractBase
             $recoveryInterval = isset($config->Authentication->recover_interval)
                 ? $config->Authentication->recover_interval
                 : 60;
-            if (time()-$hashtime < $recoveryInterval) {
+            if (time() - $hashtime < $recoveryInterval) {
                 $this->flashMessenger()->setNamespace('error')
                     ->addMessage('recovery_too_soon');
             } else {
@@ -1270,7 +1270,7 @@ class MyResearchController extends AbstractBase
             $hashLifetime = isset($config->Authentication->recover_hash_lifetime)
                 ? $config->Authentication->recover_hash_lifetime
                 : 1209600; // Two weeks
-            if (time()-$hashtime > $hashLifetime) {
+            if (time() - $hashtime > $hashLifetime) {
                 $this->flashMessenger()->setNamespace('error')
                     ->addMessage('recovery_expired_hash');
                 return $this->forwardTo('MyResearch', 'Login');
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php b/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
index d85f53f100e48f490880f77b06e3703e843ad088..d6853fe3338f0f1e748db64cf0ccdae048e738b3 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
@@ -299,7 +299,7 @@ abstract class AbstractRequestBase extends AbstractPlugin
     {
         list($d, $m, $y) = $dateArray;
         return mktime(
-            0, 0, 0, date('m')+$m, date('d')+$d, date('Y')+$y
+            0, 0, 0, date('m') + $m, date('d') + $d, date('Y') + $y
         );
     }
 }
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/NewItems.php b/module/VuFind/src/VuFind/Controller/Plugin/NewItems.php
index 8620b4193b814cbda27cbfdb3b3dff7276271a46..2a48d52974420e52129fa24e91e1522d7c44a5d9 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/NewItems.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/NewItems.php
@@ -78,7 +78,7 @@ class NewItems extends AbstractPlugin
 
         // Build a list of unique IDs
         $bibIDs = [];
-        for ($i = 0; $i<count($newItems['results']); $i++) {
+        for ($i = 0; $i < count($newItems['results']); $i++) {
             $bibIDs[] = $newItems['results'][$i]['id'];
         }
 
diff --git a/module/VuFind/src/VuFind/Cover/Generator.php b/module/VuFind/src/VuFind/Cover/Generator.php
index fdd3c3ee99c9e07ca4b672f63a35a281e00563cf..b19128a5eb736bb085545721fb81b7e63ccc9461 100644
--- a/module/VuFind/src/VuFind/Cover/Generator.php
+++ b/module/VuFind/src/VuFind/Cover/Generator.php
@@ -116,7 +116,7 @@ class Generator
      */
     protected function generateSolid($title, $author, $callnumber)
     {
-        $half = $this->settings->size/2;
+        $half = $this->settings->size / 2;
         // Create image
         if (!($im = imagecreate($this->settings->size, $this->settings->size))) {
             throw new \Exception("Cannot Initialize new GD image stream");
@@ -131,7 +131,7 @@ class Generator
         // Number to color, hsb to control saturation and lightness
         $color = $this->makeHSBColor(
             $im,
-            $seed%256,
+            $seed % 256,
             $this->settings->saturation,
             $this->settings->lightness
         );
@@ -150,7 +150,7 @@ class Generator
             $im,
             strtoupper($title[0]),
             $half,
-            $half+28,
+            $half + 28,
             $this->settings->titleFont,
             60,
             $this->white,
@@ -182,8 +182,8 @@ class Generator
     protected function generateGrid($title, $author, $callnumber)
     {
         // Set up common variables
-        $half = $this->settings->size/2;
-        $box  = $this->settings->size/8;
+        $half = $this->settings->size / 2;
+        $box  = $this->settings->size / 8;
 
         // Create image
         if (!($im = imagecreate($this->settings->size, $this->settings->size))) {
@@ -199,7 +199,7 @@ class Generator
         // Number to color, hsb to control saturation and lightness
         $grid_color = $this->makeHSBColor(
             $im,
-            $seed%256,
+            $seed % 256,
             $this->settings->saturation,
             $this->settings->lightness
         );
@@ -241,7 +241,7 @@ class Generator
         }
         if (null !== $callnumber) {
             $cv = 0;
-            for ($i = 0;$i<strlen($callnumber);$i++) {
+            for ($i = 0;$i < strlen($callnumber);$i++) {
                 $cv += ord($callnumber[$i]);
             }
             return $cv;
@@ -297,7 +297,7 @@ class Generator
         $line = '';
         $lineCount = 0;
         $i = 0;
-        while ($i<count($words) && $lineCount<$this->settings->maxLines-1) {
+        while ($i < count($words) && $lineCount < $this->settings->maxLines - 1) {
             $pline = $line;
             // Format
             $text = strtoupper($words[$i]);
@@ -313,7 +313,7 @@ class Generator
                     $im,
                     $pline,
                     3,
-                    $this->settings->topPadding+$lineHeight*$lineCount,
+                    $this->settings->topPadding + $lineHeight * $lineCount,
                     $this->settings->titleFont,
                     $this->settings->fontSize,
                     $this->black,
@@ -329,21 +329,21 @@ class Generator
             $im,
             $line,
             3,
-            $this->settings->topPadding+$lineHeight*$lineCount,
+            $this->settings->topPadding + $lineHeight * $lineCount,
             $this->settings->titleFont,
             $this->settings->fontSize,
             $this->black,
             $this->white
         );
         // Add ellipses if we've truncated
-        if ($i < count($words)-1) {
+        if ($i < count($words) - 1) {
             $this->drawText(
                 $im,
                 '...',
                 5,
-                $this->settings->topPadding+$this->settings->maxLines*$lineHeight,
+                $this->settings->topPadding + $this->settings->maxLines * $lineHeight,
                 $this->settings->titleFont,
-                $this->settings->fontSize+1,
+                $this->settings->fontSize + 1,
                 $this->black,
                 $this->white
             );
@@ -382,7 +382,7 @@ class Generator
             $im,
             $author,
             5,
-            $this->settings->size-3,
+            $this->settings->size - 3,
             $this->settings->authorFont,
             $fontSize,
             $this->white,
@@ -418,7 +418,7 @@ class Generator
     protected function textWidth($text, $font, $size)
     {
         $p = imagettfbbox($size, 0, $font, $text);
-        return $p[2]-$p[0]-4;
+        return $p[2] - $p[0] - 4;
     }
 
     /**
@@ -453,21 +453,21 @@ class Generator
         }
         if ($align == 'center') {
             $p = imagettfbbox($fontSize, 0, $this->settings->titleFont, $text);
-            $txtWidth = $p[2]-$p[0]-4;
-            $x = ($this->settings->size-$txtWidth)/2;
+            $txtWidth = $p[2] - $p[0] - 4;
+            $x = ($this->settings->size - $txtWidth) / 2;
         }
         if ($align == 'right') {
             $p = imagettfbbox($fontSize, 0, $this->settings->titleFont, $text);
-            $txtWidth = $p[2]-$p[0]-4;
-            $x = $this->settings->size-$txtWidth-$x;
+            $txtWidth = $p[2] - $p[0] - 4;
+            $x = $this->settings->size - $txtWidth - $x;
         }
 
         // Generate 5 lines of text, 4 offset in a border color
         if ($scolor) {
-            imagettftext($im, $fontSize, 0, $x,   $y+1, $scolor, $font, $text);
-            imagettftext($im, $fontSize, 0, $x,   $y-1, $scolor, $font, $text);
-            imagettftext($im, $fontSize, 0, $x+1, $y,   $scolor, $font, $text);
-            imagettftext($im, $fontSize, 0, $x-1, $y,   $scolor, $font, $text);
+            imagettftext($im, $fontSize, 0, $x,   $y + 1, $scolor, $font, $text);
+            imagettftext($im, $fontSize, 0, $x,   $y - 1, $scolor, $font, $text);
+            imagettftext($im, $fontSize, 0, $x + 1, $y,   $scolor, $font, $text);
+            imagettftext($im, $fontSize, 0, $x - 1, $y,   $scolor, $font, $text);
         }
         // 1 centered in main color
         imagettftext($im, $fontSize, 0, $x,   $y,   $mcolor, $font, $text);
@@ -488,18 +488,18 @@ class Generator
     protected function render($bc, $im, $color, $half, $box)
     {
         $bc = str_split($bc);
-        for ($k = 0;$k<4;$k++) {
-            $x = $k%2   ? $half : $half-$box;
-            $y = $k/2<1 ? $half : $half-$box;
-            $u = $k%2   ? $box : -$box;
-            $v = $k/2<1 ? $box : -$box;
-            for ($i = 0;$i<16;$i++) {
+        for ($k = 0;$k < 4;$k++) {
+            $x = $k % 2   ? $half : $half - $box;
+            $y = $k / 2 < 1 ? $half : $half - $box;
+            $u = $k % 2   ? $box : -$box;
+            $v = $k / 2 < 1 ? $box : -$box;
+            for ($i = 0;$i < 16;$i++) {
                 if ($bc[$i] == "1") {
-                    imagefilledrectangle($im, $x, $y, $x+$box-1, $y+$box-1, $color);
+                    imagefilledrectangle($im, $x, $y, $x + $box - 1, $y + $box - 1, $color);
                 }
                 $x += $u;
                 if ($x >= $this->settings->size || $x < 0) {
-                    $x = $k%2 ? $half : $half-$box;
+                    $x = $k % 2 ? $half : $half - $box;
                     $y += $v;
                 }
             }
diff --git a/module/VuFind/src/VuFind/Crypt/RC4.php b/module/VuFind/src/VuFind/Crypt/RC4.php
index b71cf8de8c1f814ffea1a921ba100ad305d8296d..655d4b01bd22e210e724204816d64fe181ede36c 100644
--- a/module/VuFind/src/VuFind/Crypt/RC4.php
+++ b/module/VuFind/src/VuFind/Crypt/RC4.php
@@ -60,12 +60,12 @@ class RC4
          * Website: http://farhadi.ir/
          */
         $s = [];
-        for ($i = 0; $i<256; $i++) {
+        for ($i = 0; $i < 256; $i++) {
             $s[$i] = $i;
         }
         $j = 0;
         $x;
-        for ($i = 0; $i<256; $i++) {
+        for ($i = 0; $i < 256; $i++) {
             $j = ($j + $s[$i] + ord($key[$i % strlen($key)])) % 256;
             $x = $s[$i];
             $s[$i] = $s[$j];
@@ -75,7 +75,7 @@ class RC4
         $j = 0;
         $ct = '';
         $y;
-        for ($y = 0; $y<strlen($pt); $y++) {
+        for ($y = 0; $y < strlen($pt); $y++) {
             $i = ($i + 1) % 256;
             $j = ($j + $s[$i]) % 256;
             $x = $s[$i];
diff --git a/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php b/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
index 0e04f258fa1f3699eb9382056653523206e169fa..ae4d76f7fa7dbfc0edbb8db1c585b9e2f5bd7cfe 100644
--- a/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
+++ b/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
@@ -96,7 +96,7 @@ class UserStatsFields extends Gateway
                 [$fields[0] => 'value']
             );
             $select->where->equalTo('field', $fields[0]);
-            for ($i = 1;$i<count($fields);$i++) {
+            for ($i = 1;$i < count($fields);$i++) {
                 $select->where->equalTo('field' . $i . '.field', $fields[$i]);
                 $select->join(
                     ['field' . $i => 'user_stats_fields'],
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
index 9c01672cee4259443a741c9730335e52019638d0..29a558a92b37324c2eba89a7e224e87670ec635c 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
@@ -183,7 +183,7 @@ class JSTree extends AbstractBase
         ];
         if (isset($node->children)) {
             $ret['children'] = [];
-            for ($i = 0;$i<count($node->children);$i++) {
+            for ($i = 0;$i < count($node->children);$i++) {
                 $ret['children'][$i] = $this
                     ->buildNodeArray($node->children[$i], $context, $hierarchyID);
             }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
index ff02774fbc0f7cde2d8c3bca8278911a9bec2251..f67cf0541a082469d5a3b576e39072185c6a89ca 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
@@ -495,7 +495,7 @@ class Amicus extends AbstractBase implements TranslatorAwareInterface
                     'duedate' => $this->sacaFecha($row['CPY_ID_NBR']),
                     // TODO: fill this in if you want "recently returned" support:
                     'returnDate' => false,
-                    'number' => count($data) +1,
+                    'number' => count($data) + 1,
                     'item_id' => $row['CPY_ID_NBR'],
                     'barcode' => $row['BRCDE_NBR']
                 ];
@@ -812,8 +812,8 @@ class Amicus extends AbstractBase implements TranslatorAwareInterface
 
         $page = ($page) ? $page : 1;
         $limit = ($limit) ? $limit : 20;
-        $startRow = (($page-1)*$limit)+1;
-        $endRow = ($page*$limit);
+        $startRow = (($page - 1) * $limit) + 1;
+        $endRow = ($page * $limit);
         $sql = "select * from " .
                "(select a.*, rownum rnum from " .
                "(select  CPY_ID.BIB_ITM_NBR  as BIB_ID, CPY_ID.CRTN_DTE " .
diff --git a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
index 94bc4b2f79d2532c71e1d30bf58f5bd4147548e2..251cdcd420fd30fe790c5dff3a9de7888fcf96fc 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
@@ -236,7 +236,7 @@ class ClaviusSQL extends AbstractBase
       */
     public function getNewItems($page, $limit, $daysOld, $fundId = null)
     {
-        $limitFrom = ($page-1) * $limit;
+        $limitFrom = ($page - 1) * $limit;
         //TODO better escaping; mssql, oracle
         $sql = "SELECT t.tcislo as tcislo, t.druhdoku as druhdoku "
             . "FROM svazky s JOIN tituly t ON s.tcislo = t.tcislo "
@@ -436,7 +436,7 @@ class ClaviusSQL extends AbstractBase
                     'amount' => abs($fine['amount']),
                     'checkout' => null, // TODO maybe
                     'fine' => $reasons[$fine['reason']],
-                    'balance' => ($fine['amount']<0) ? abs($fine['amount']) : 0,
+                    'balance' => ($fine['amount'] < 0) ? abs($fine['amount']) : 0,
                     'createdate' => $fine['createdate'],
                     'duedate' => null, // TODO maybe
                     'id' => null,        // TODO maybe
diff --git a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
index 6d6cac9cdb2ecc4dc8d0dbd8f8dbdbb846440b30..699f8e2c2f2b98c9e264e9be151ac1a75072c1e0 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
@@ -551,7 +551,7 @@ class DAIA extends AbstractBase implements
                     $result_item["location"] = "Unknown";
                 }
                 // status and availability will be calculated in own function
-                $result_item = $this->calculateStatus($item)+$result_item;
+                $result_item = $this->calculateStatus($item) + $result_item;
                 // add result_item to the result array
                 $result[] = $result_item;
             } // end iteration on item
@@ -595,7 +595,7 @@ class DAIA extends AbstractBase implements
             $result = [
                 'callnumber' => '',
                 'availability' => '0',
-                'number' => ($c+1),
+                'number' => ($c + 1),
                 'reserve' => 'No',
                 'duedate' => '',
                 'queue'   => '',
@@ -930,7 +930,7 @@ class DAIA extends AbstractBase implements
                 $result = [
                     'callnumber' => '',
                     'availability' => '0',
-                    'number' => ($c+1),
+                    'number' => ($c + 1),
                     'reserve' => 'No',
                     'duedate' => '',
                     'queue'   => '',
@@ -1307,7 +1307,7 @@ class DAIA extends AbstractBase implements
                 'duedate'       => isset($earliest_duedate) ? $earliest_duedate : '',
                 'leanable'      => isset($leanable) ? $leanable : '',
                 'recallhref'    => isset($earliest_href) ? $earliest_href : '',
-                'number'        => ($c+1),
+                'number'        => ($c + 1),
                 'presenceOnly'  => isset($presenceOnly) ? $presenceOnly : '',
             ];
         }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Demo.php b/module/VuFind/src/VuFind/ILS/Driver/Demo.php
index 063ba088de1ab4185f6e6d1e49102467cf474cf9..5819af091f78934b02e6dc74ac67e352d6d1bbd0 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Demo.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Demo.php
@@ -148,7 +148,7 @@ class Demo extends AbstractBase
     protected function getFakeLoc($returnText = true)
     {
         $locations = $this->getPickUpLocations();
-        $loc = rand()%count($locations);
+        $loc = rand() % count($locations);
         return $returnText
             ? $locations[$loc]['locationDisplay']
             : $locations[$loc]['locationID'];
@@ -161,7 +161,7 @@ class Demo extends AbstractBase
      */
     protected function getFakeStatus()
     {
-        $loc = rand()%10;
+        $loc = rand() % 10;
         switch ($loc) {
         case 10:
             return "Missing";
@@ -182,9 +182,9 @@ class Demo extends AbstractBase
     protected function getFakeCallNum()
     {
         $codes = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        $a = $codes[rand()%strlen($codes)];
-        $b = rand()%899 + 100;
-        $c = rand()%9999;
+        $a = $codes[rand() % strlen($codes)];
+        $b = rand() % 899 + 100;
+        $c = rand() % 9999;
         return $a . $b . "." . $c;
     }
 
@@ -233,23 +233,23 @@ class Demo extends AbstractBase
             'source'       => $this->getRecordSource(),
             'item_id'      => $number,
             'number'       => $number,
-            'barcode'      => sprintf("%08d", rand()%50000),
+            'barcode'      => sprintf("%08d", rand() % 50000),
             'availability' => $status == 'Available',
             'status'       => $status,
             'location'     => $this->getFakeLoc(),
-            'reserve'      => (rand()%100 > 49) ? 'Y' : 'N',
+            'reserve'      => (rand() % 100 > 49) ? 'Y' : 'N',
             'callnumber'   => $this->getFakeCallNum(),
             'duedate'      => '',
             'is_holdable'  => true,
-            'addLink'      => $patron ? rand()%10 == 0 ? 'block' : true : false,
+            'addLink'      => $patron ? rand() % 10 == 0 ? 'block' : true : false,
             'level'        => 'copy',
             'storageRetrievalRequest' => 'auto',
             'addStorageRetrievalRequestLink' => $patron
-                ? rand()%10 == 0 ? 'block' : 'check'
+                ? rand() % 10 == 0 ? 'block' : 'check'
                 : false,
             'ILLRequest'   => 'auto',
             'addILLRequestLink' => $patron
-                ? rand()%10 == 0 ? 'block' : 'check'
+                ? rand() % 10 == 0 ? 'block' : 'check'
                 : false
         ];
     }
@@ -285,7 +285,7 @@ class Demo extends AbstractBase
     {
         // How many items are there?  %10 - 1 = 10% chance of none,
         // 90% of 1-9 (give or take some odd maths)
-        $items = rand()%10 - 1;
+        $items = rand() % 10 - 1;
 
         $requestGroups = $this->getRequestGroups(null, null);
 
@@ -303,7 +303,7 @@ class Demo extends AbstractBase
             ];
             // Inject a random identifier of some sort:
             $currentItem += $this->getRandomItemIdentifier();
-            if ($i == 2 || rand()%5 == 1) {
+            if ($i == 2 || rand() % 5 == 1) {
                 // Mimic an ILL request
                 $currentItem["id"] = "ill_request_$i";
                 $currentItem["title"] = "ILL Hold Title $i";
@@ -320,7 +320,7 @@ class Demo extends AbstractBase
             }
 
             if ($requestType == 'Holds') {
-                $pos = rand()%5;
+                $pos = rand() % 5;
                 if ($pos > 1) {
                     $currentItem['position'] = $pos;
                 } else {
@@ -329,14 +329,14 @@ class Demo extends AbstractBase
                 $pos = rand(0, count($requestGroups) - 1);
                 $currentItem['requestGroup'] = $requestGroups[$pos]['name'];
             } else {
-                $status = rand()%5;
+                $status = rand() % 5;
                 $currentItem['available'] = $status == 1;
                 $currentItem['canceled'] = $status == 2;
                 $currentItem['processed'] = ($status == 1 || rand(1, 3) == 3)
                     ? date("j-M-y")
                     : '';
                 if ($requestType == 'ILLRequests') {
-                    $transit = rand()%2;
+                    $transit = rand() % 2;
                     if (!$currentItem['available']
                         && !$currentItem['canceled']
                         && $transit == 1
@@ -385,7 +385,7 @@ class Demo extends AbstractBase
     {
         $id = $id . ""; // make it a string for consistency
         // How many items are there?
-        $records = rand()%15;
+        $records = rand() % 15;
         $holding = [];
 
         // NOTE: Ran into an interesting bug when using:
@@ -405,7 +405,7 @@ class Demo extends AbstractBase
 
         // Create a fake entry for each one
         for ($i = 0; $i < $records; $i++) {
-            $holding[] = $this->getRandomHolding($id, $i+1, $patron);
+            $holding[] = $this->getRandomHolding($id, $i + 1, $patron);
         }
         return $holding;
     }
@@ -424,7 +424,7 @@ class Demo extends AbstractBase
     public function setStatus($id, $holding = [], $append = true)
     {
         $id = (string)$id;
-        $i = ($this->session->statuses) ? count($this->session->statuses)+1 : 1;
+        $i = ($this->session->statuses) ? count($this->session->statuses) + 1 : 1;
         $holding = array_merge($this->getRandomHolding($id, $i), $holding);
 
         // if statuses is already stored
@@ -635,14 +635,14 @@ class Demo extends AbstractBase
         if (!isset($this->session->fines)) {
             // How many items are there? %20 - 2 = 10% chance of none,
             // 90% of 1-18 (give or take some odd maths)
-            $fines = rand()%20 - 2;
+            $fines = rand() % 20 - 2;
 
             $fineList = [];
             for ($i = 0; $i < $fines; $i++) {
                 // How many days overdue is the item?
-                $day_overdue = rand()%30 + 5;
+                $day_overdue = rand() % 30 + 5;
                 // Calculate checkout date:
-                $checkout = strtotime("now - " . ($day_overdue+14) . " days");
+                $checkout = strtotime("now - " . ($day_overdue + 14) . " days");
                 // 50c a day fine?
                 $fine = $day_overdue * 0.50;
 
@@ -652,7 +652,7 @@ class Demo extends AbstractBase
                     // After 20 days it becomes 'Long Overdue'
                     "fine"     => $day_overdue > 20 ? "Long Overdue" : "Overdue",
                     // 50% chance they've paid half of it
-                    "balance"  => (rand()%100 > 49 ? $fine/2 : $fine) * 100,
+                    "balance"  => (rand() % 100 > 49 ? $fine / 2 : $fine) * 100,
                     "duedate"  =>
                         date("j-M-y", strtotime("now - $day_overdue days"))
                 ];
@@ -747,12 +747,12 @@ class Demo extends AbstractBase
         if (!isset($this->session->transactions)) {
             // How many items are there?  %10 - 1 = 10% chance of none,
             // 90% of 1-9 (give or take some odd maths)
-            $trans = rand()%10 - 1;
+            $trans = rand() % 10 - 1;
 
             $transList = [];
             for ($i = 0; $i < $trans; $i++) {
                 // When is it due? +/- up to 15 days
-                $due_relative = rand()%30 - 15;
+                $due_relative = rand() % 30 - 15;
                 // Due date
                 $dueStatus = false;
                 if ($due_relative >= 0) {
@@ -766,26 +766,26 @@ class Demo extends AbstractBase
                 }
 
                 // Times renewed    : 0,0,0,0,0,1,2,3,4,5
-                $renew = rand()%10 - 5;
+                $renew = rand() % 10 - 5;
                 if ($renew < 0) {
                     $renew = 0;
                 }
 
                 // Renewal limit
-                $renewLimit = $renew + rand()%3;
+                $renewLimit = $renew + rand() % 3;
 
                 // Pending requests : 0,0,0,0,0,1,2,3,4,5
-                $req = rand()%10 - 5;
+                $req = rand() % 10 - 5;
                 if ($req < 0) {
                     $req = 0;
                 }
 
-                if ($i == 2 || rand()%5 == 1) {
+                if ($i == 2 || rand() % 5 == 1) {
                     // Mimic an ILL loan
                     $transList[] = $this->getRandomItemIdentifier() + [
                         'duedate' => $due_date,
                         'dueStatus' => $dueStatus,
-                        'barcode' => sprintf("%08d", rand()%50000),
+                        'barcode' => sprintf("%08d", rand() % 50000),
                         'renew'   => $renew,
                         'renewLimit' => $renewLimit,
                         'request' => $req,
@@ -802,7 +802,7 @@ class Demo extends AbstractBase
                     $transList[] = $this->getRandomItemIdentifier() + [
                         'duedate' => $due_date,
                         'dueStatus' => $dueStatus,
-                        'barcode' => sprintf("%08d", rand()%50000),
+                        'barcode' => sprintf("%08d", rand() % 50000),
                         'renew'   => $renew,
                         'renewLimit' => $renewLimit,
                         'request' => $req,
@@ -875,7 +875,7 @@ class Demo extends AbstractBase
     {
         // 5 years in the future (but similate intermittent failure):
         return rand(0, 1) == 1
-            ? mktime(0, 0, 0, date('m'), date('d'), date('Y')+5) : null;
+            ? mktime(0, 0, 0, date('m'), date('d'), date('Y') + 5) : null;
     }
 
     /**
@@ -1472,7 +1472,7 @@ class Demo extends AbstractBase
                 'location' => $details['pickUpLocation'],
                 'expire'   => date('j-M-y', $expire),
                 'create'  => date('j-M-y'),
-                'processed' => rand()%3 == 0 ? date('j-M-y', $expire) : '',
+                'processed' => rand() % 3 == 0 ? date('j-M-y', $expire) : '',
                 'reqnum'   => sprintf('%06d', $nextId),
                 'item_id'  => $nextId
             ]
@@ -1591,7 +1591,7 @@ class Demo extends AbstractBase
                 'location' => $pickupLocation,
                 'expire'   => date('j-M-y', $expire),
                 'create'  => date('j-M-y'),
-                'processed' => rand()%3 == 0 ? date('j-M-y', $expire) : '',
+                'processed' => rand() % 3 == 0 ? date('j-M-y', $expire) : '',
                 'reqnum'   => sprintf('%06d', $nextId),
                 'item_id'  => $nextId
             ]
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
index 18abd094605bd174ba0efd91125b16444e65fed1..d7a0ac78c40d6302a7894b955e8c17f78ba84f15 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
@@ -909,7 +909,7 @@ class Horizon extends AbstractBase
             if (is_numeric($dueTimeStamp)) {
                 if ($now > $dueTimeStamp) {
                     $dueStatus = "overdue";
-                } else if ($now > $dueTimeStamp-(1*24*60*60)) {
+                } else if ($now > $dueTimeStamp - (1 * 24 * 60 * 60)) {
                     $dueStatus = "due";
                 }
             }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
index 560fe47f0e566bd41af642e8fd433efd2099289f..8eabb2c6a6806fb0e0337bebb72fcb31e4b409f2 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
@@ -651,7 +651,7 @@ class HorizonXMLAPI extends Horizon implements \VuFindHttp\HttpServiceAwareInter
                         'success' => true, 'status' => "hold_cancel_success",
 
                     ];
-                    $count = $count+1;
+                    $count = $count + 1;
                 }
             }
         } else {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Innovative.php b/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
index 9be05c3728bfb0aa494a4362e7ced88e8c6e6525..29a3b1293fb95a69c59a01ffa70f0dbc2d30ac20 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
@@ -144,7 +144,7 @@ class Innovative extends AbstractBase implements
         // '<table class="bibItems" '
         $r = substr($result, stripos($result, 'bibItems'));
         // strip out the rest of the first table tag.
-        $r = substr($r, strpos($r, ">")+1);
+        $r = substr($r, strpos($r, ">") + 1);
         // strip out the next table closing tag and everything after it.
         $r = substr($r, 0, stripos($r, "</table"));
 
@@ -189,28 +189,28 @@ class Innovative extends AbstractBase implements
                 } else if ($count > 1) { // not the first row, has holding info
                     //look for location column
                     if (stripos($keys[$i], $loc_col_name) > -1) {
-                        $ret[$count-2]['location'] = strip_tags($cols[$i]);
+                        $ret[$count - 2]['location'] = strip_tags($cols[$i]);
                     }
                     // Does column hold reserves information?
                     if (stripos($keys[$i], $reserves_col_name) > -1) {
                         if (stripos($cols[$i], $reserves_key_name) > -1) {
-                            $ret[$count-2]['reserve'] = 'Y';
+                            $ret[$count - 2]['reserve'] = 'Y';
                         } else {
-                            $ret[$count-2]['reserve'] = 'N';
+                            $ret[$count - 2]['reserve'] = 'N';
                         }
                     }
                     // Does column hold call numbers?
                     if (stripos($keys[$i], $call_col_name) > -1) {
-                        $ret[$count-2]['callnumber'] = strip_tags($cols[$i]);
+                        $ret[$count - 2]['callnumber'] = strip_tags($cols[$i]);
                     }
                     // Look for status information.
                     if (stripos($keys[$i], $status_col_name) > -1) {
                         if (stripos($cols[$i], $stat_avail) > -1) {
-                            $ret[$count-2]['status'] = "Available On Shelf";
-                            $ret[$count-2]['availability'] = 1;
+                            $ret[$count - 2]['status'] = "Available On Shelf";
+                            $ret[$count - 2]['availability'] = 1;
                         } else {
-                            $ret[$count-2]['status'] = "Available to request";
-                            $ret[$count-2]['availability'] = 0;
+                            $ret[$count - 2]['status'] = "Available to request";
+                            $ret[$count - 2]['availability'] = 0;
                         }
                         if (stripos($cols[$i], $stat_due) > -1) {
                             $t = trim(
@@ -220,17 +220,17 @@ class Innovative extends AbstractBase implements
                                 )
                             );
                             $t = substr($t, 0, stripos($t, " "));
-                            $ret[$count-2]['duedate'] = $t;
+                            $ret[$count - 2]['duedate'] = $t;
                         }
                     }
                     //$ret[$count-2][$keys[$i]] = $cols[$i];
                     //$ret[$count-2]['id'] = $bibid;
-                    $ret[$count-2]['id'] = $id;
-                    $ret[$count-2]['number'] = ($count -1);
+                    $ret[$count - 2]['id'] = $id;
+                    $ret[$count - 2]['number'] = ($count - 1);
                     // Return a fake barcode so hold link is enabled
                     // TODO: Should be dependent on settings variable, if bib level
                     // holds.
-                    $ret[$count-2]['barcode'] = '1234567890123';
+                    $ret[$count - 2]['barcode'] = '1234567890123';
                 }
             }
             $count++;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
index eb46d9fabf9b0800edb4290b09a283f73a0c049d..a1a580c8c8ed92ba51bd24cff8edc6247b61e2fb 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
@@ -284,7 +284,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
                     $available = false;
                     $duedate = $this->getLoanexpire($volnum);
                     $is_holdable = true;
-                } else if ($loan_indi>6) {
+                } else if ($loan_indi > 6) {
                     $available = false;
                 }
 
@@ -757,7 +757,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
             while ($row = sybase_fetch_row($sqlStmt)) {
                 //$fine = $this->translate(('3'==$row[1])?'Overdue':'Dues');
                 $fine = $this->picaRecode($row[5]);
-                $amount = (null == $row[2]) ? 0 : $row[2]*100;
+                $amount = (null == $row[2]) ? 0 : $row[2] * 100;
                 //$balance = (null==$row[3])?0:$row[3]*100;
                 $checkout = substr($row[3], 0,  12);
                 $duedate = substr($row[4], 0, 12);
@@ -804,13 +804,13 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
     {
         $x = 0; $y = 0; $w = 2;
         $stra = str_split($str);
-        for ($i = strlen($str); $i>0; $i--) {
-            $c = $stra[$i-1];
+        for ($i = strlen($str); $i > 0; $i--) {
+            $c = $stra[$i - 1];
             $x = ord($c) - 48;
-            $y += $x*$w;
+            $y += $x * $w;
             $w++;
         }
-        $p = 11-$y%11;
+        $p = 11 - $y % 11;
         if ($p == 11) {
             $p = 0;
         }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php b/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
index 11850d4ebe088a8490a8f86bf16e3df046538fff..f20cae94cb7708650d53a846cc9112f5f9def87c 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
@@ -157,7 +157,7 @@ class NewGenLib extends AbstractBase
         $id = "";
         while ($row = $sqlStmt->fetch(PDO::FETCH_ASSOC)) {
             $id = $row['cataloguerecordid'] . "_" . $row['owner_library_id'];
-            $amount = $row['fine_amt']*100;
+            $amount = $row['fine_amt'] * 100;
             $checkout = $row['ta_date'];
             $duedate = $row['due_date'];
             $paidamtsql = "select sum(f.fine_amt_paid) as fine_amt_paid from " .
@@ -172,8 +172,8 @@ class NewGenLib extends AbstractBase
             $paidamt = "";
             $balance = "";
             while ($rowpaid = $sqlStmt1->fetch(PDO::FETCH_ASSOC)) {
-                $paidamt = $rowpaid['fine_amt_paid']*100;
-                $balance = $amount-$paidamt;
+                $paidamt = $rowpaid['fine_amt_paid'] * 100;
+                $balance = $amount - $paidamt;
             }
 
             $MyFines[] = ['amount' => $amount,
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PICA.php b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
index 33e72f325e64f3f976e92563e946b20a0c00231c..2db621e19e67255c0fc83daaad68f0c7a2299287 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PICA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
@@ -180,10 +180,10 @@ class PICA extends DAIA
         if ($messages === 2) {
             // ignore the first message (its only the message to close the window
             // after finishing)
-            for ($n = 0; $n<2; $n++) {
+            for ($n = 0; $n < 2; $n++) {
                 $pos = strpos($postit, '<strong class="alert">', $position);
                 $pos_close = strpos($postit, '</strong>', $pos);
-                $value = substr($postit, $pos+22, ($pos_close-$pos-22));
+                $value = substr($postit, $pos + 22, ($pos_close - $pos - 22));
                 $position = $pos + 1;
             }
             $recordList['message'] = $value;
@@ -228,17 +228,17 @@ class PICA extends DAIA
             $position = strpos($postit, '<iframe');
             for ($i = 0; $i < $iframes; $i++) {
                 $pos = strpos($postit, 'VBAR=', $position);
-                $value = substr($postit, $pos+9, 8);
-                $completeValue = substr($postit, $pos+5, 12);
+                $value = substr($postit, $pos + 9, 8);
+                $completeValue = substr($postit, $pos + 5, 12);
                 $barcode[] = $completeValue;
                 $bc = $this->getPpnByBarcode($value);
                 $ppns[] = $bc;
                 $position = $pos + 1;
                 $current_position = $position;
                 $position_state = null;
-                for ($n = 0; $n<6; $n++) {
+                for ($n = 0; $n < 6; $n++) {
                     $current_position = $this->strposBackwards(
-                        $postit, '<td class="value-small">', $current_position-1
+                        $postit, '<td class="value-small">', $current_position - 1
                     );
                     if ($n === 1) {
                         $position_reservations = $current_position;
@@ -254,15 +254,15 @@ class PICA extends DAIA
                     }
                 }
                 if ($position_state !== null
-                    && substr($postit, $position_state+24, 8) !== 'bestellt'
+                    && substr($postit, $position_state + 24, 8) !== 'bestellt'
                 ) {
-                    $reservations[] = substr($postit, $position_reservations+24, 1);
-                    $expiration[] = substr($postit, $position_expire+24, 10);
+                    $reservations[] = substr($postit, $position_reservations + 24, 1);
+                    $expiration[] = substr($postit, $position_expire + 24, 10);
                     $renewals[] = $this->getRenewals($completeValue);
                     $closing_title = strpos($postit, '</td>', $position_title);
                     $titles[] = $completeValue . " " . substr(
-                        $postit, $position_title+24,
-                        ($closing_title-$position_title-24)
+                        $postit, $position_title + 24,
+                        ($closing_title - $position_title - 24)
                     );
                 } else {
                     $holdsByIframe--;
@@ -278,18 +278,18 @@ class PICA extends DAIA
             $position = strpos($postit, 'input type="checkbox" name="VB"');
             for ($i = 0; $i < $holds; $i++) {
                 $pos = strpos($postit, 'value=', $position);
-                $value = substr($postit, $pos+11, 8);
-                $completeValue = substr($postit, $pos+7, 12);
+                $value = substr($postit, $pos + 11, 8);
+                $completeValue = substr($postit, $pos + 7, 12);
                 $barcode[] = $completeValue;
                 $ppns[] = $this->getPpnByBarcode($value);
                 $position = $pos + 1;
                 $position_expire = $position;
-                for ($n = 0; $n<4; $n++) {
+                for ($n = 0; $n < 4; $n++) {
                     $position_expire = strpos(
-                        $postit, '<td class="value-small">', $position_expire+1
+                        $postit, '<td class="value-small">', $position_expire + 1
                     );
                 }
-                $expiration[] = substr($postit, $position_expire+24, 10);
+                $expiration[] = substr($postit, $position_expire + 24, 10);
                 $renewals[] = $this->getRenewals($completeValue);
             }
         }
@@ -338,9 +338,9 @@ class PICA extends DAIA
         $needle_reverse = strrev($needle);
         $position_brutto = strpos($haystack_reverse, $needle_reverse);
         if ($offset === 0) {
-            $position_netto = strlen($haystack)-$position_brutto-strlen($needle);
+            $position_netto = strlen($haystack) - $position_brutto - strlen($needle);
         } else {
-            $position_netto = $offset-$position_brutto-strlen($needle);
+            $position_netto = $offset - $position_brutto - strlen($needle);
         }
         return $position_netto;
     }
@@ -427,7 +427,7 @@ class PICA extends DAIA
         $postit = $this->postit($URL, $POST);
 
         // How many items are there?
-        $holds = substr_count($postit, '<td class="plain"')/3;
+        $holds = substr_count($postit, '<td class="plain"') / 3;
         $fineDate = [];
         $description = [];
         $fine = [];
@@ -437,17 +437,17 @@ class PICA extends DAIA
             // first class=plain => description
             // length = position of next </td> - startposition
             $nextClosingTd = strpos($postit, '</td>', $pos);
-            $description[$i] = substr($postit, $pos+18, ($nextClosingTd-$pos-18));
+            $description[$i] = substr($postit, $pos + 18, ($nextClosingTd - $pos - 18));
             $position = $pos + 1;
             // next class=plain => date of fee creation
             $pos = strpos($postit, '<td class="plain"', $position);
             $nextClosingTd = strpos($postit, '</td>', $pos);
-            $fineDate[$i] = substr($postit, $pos+18, ($nextClosingTd-$pos-18));
+            $fineDate[$i] = substr($postit, $pos + 18, ($nextClosingTd - $pos - 18));
             $position = $pos + 1;
             // next class=plain => amount of fee
             $pos = strpos($postit, '<td class="plain"', $position);
             $nextClosingTd = strpos($postit, '</td>', $pos);
-            $fineString = substr($postit, $pos+32, ($nextClosingTd-$pos-32));
+            $fineString = substr($postit, $pos + 32, ($nextClosingTd - $pos - 32));
             $feeString = explode(',', $fineString);
             $feeString[1] = substr($feeString[1], 0, 2);
             $fine[$i] = (double) implode('', $feeString);
@@ -500,17 +500,17 @@ class PICA extends DAIA
         $position = strpos($postit, 'input type="checkbox" name="VB"');
         for ($i = 0; $i < $holds; $i++) {
             $pos = strpos($postit, 'value=', $position);
-            $value = substr($postit, $pos+11, 8);
+            $value = substr($postit, $pos + 11, 8);
             $ppns[] = $this->getPpnByBarcode($value);
             $position = $pos + 1;
             $position_create = $position;
-            for ($n = 0; $n<3; $n++) {
+            for ($n = 0; $n < 3; $n++) {
                 $position_create = strpos(
-                    $postit, '<td class="value-small">', $position_create+1
+                    $postit, '<td class="value-small">', $position_create + 1
                 );
             }
             $creation[]
-                = str_replace('-', '.', substr($postit, $position_create+24, 10));
+                = str_replace('-', '.', substr($postit, $position_create + 24, 10));
         }
         /* items, which are ordered and have no signature yet, are not included in
          * the for-loop getthem by checkbox PPN
@@ -520,32 +520,32 @@ class PICA extends DAIA
         for ($i = 0; $i < $moreholds; $i++) {
             $pos = strpos($postit, 'value=', $position);
             // get the length of PPN
-               $x = strpos($postit, '"', $pos+7);
-            $value = substr($postit, $pos+7, $x-$pos-7);
+               $x = strpos($postit, '"', $pos + 7);
+            $value = substr($postit, $pos + 7, $x - $pos - 7);
             // problem: the value presented here does not contain the checksum!
             // so its not a valid identifier
             // we need to calculate the checksum
             $checksum = 0;
-            for ($i = 0; $i<strlen($value);$i++) {
-                $checksum += $value[$i]*(9-$i);
+            for ($i = 0; $i < strlen($value);$i++) {
+                $checksum += $value[$i] * (9 - $i);
             }
-            if ($checksum%11 === 1) {
+            if ($checksum % 11 === 1) {
                 $checksum = 'X';
-            } else if ($checksum%11 === 0) {
+            } else if ($checksum % 11 === 0) {
                 $checksum = 0;
             } else {
-                $checksum = 11 - $checksum%11;
+                $checksum = 11 - $checksum % 11;
             }
             $ppns[] = $value . $checksum;
             $position = $pos + 1;
             $position_create = $position;
-            for ($n = 0; $n<3; $n++) {
+            for ($n = 0; $n < 3; $n++) {
                 $position_create = strpos(
-                    $postit, '<td class="value-small">', $position_create+1
+                    $postit, '<td class="value-small">', $position_create + 1
                 );
             }
             $creation[]
-                = str_replace('-', '.', substr($postit, $position_create+24, 10));
+                = str_replace('-', '.', substr($postit, $position_create + 24, 10));
         }
 
         /* media ordered from closed stack is not visible on the UI_LOR page
@@ -565,16 +565,16 @@ class PICA extends DAIA
         $position = 0;
         for ($i = 0; $i < $requests; $i++) {
             $position = strpos(
-                $postit_lol, '<td class="value-small">bestellt</td>', $position+1
+                $postit_lol, '<td class="value-small">bestellt</td>', $position + 1
             );
-            $pos = strpos($postit_lol, '<td class="value-small">', ($position-100));
+            $pos = strpos($postit_lol, '<td class="value-small">', ($position - 100));
             $nextClosingTd = strpos($postit_lol, '</td>', $pos);
-            $value = substr($postit_lol, $pos+27, ($nextClosingTd-$pos-27));
+            $value = substr($postit_lol, $pos + 27, ($nextClosingTd - $pos - 27));
             $ppns[] = $this->getPpnByBarcode($value);
             $creation[] = date('d.m.Y');
         }
 
-        for ($i = 0; $i < ($holds+$moreholds+$requests); $i++) {
+        for ($i = 0; $i < ($holds + $moreholds + $requests); $i++) {
             $holdList[] = [
                 "id"       => $ppns[$i],
                 "create"   => $creation[$i]
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Polaris.php b/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
index 5b6d8477b211b7391dfe4dceca3705ae4a4e28dd..b3fcc092f28c9022af5c0441878d22b57017f84c 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
@@ -181,7 +181,7 @@ class Polaris extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
     {
         preg_match('/Date\((\d+)\-(\d){2}(\d){2}\)/', $jsontime, $matches);
         if (count($matches) > 0) {
-            $matchestmp = intval($matches[1]/1000);
+            $matchestmp = intval($matches[1] / 1000);
             $date = date("n-j-Y", $matchestmp);
         } else {
             $date = 'n/a';
@@ -618,10 +618,10 @@ class Polaris extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         foreach ($fines_response_array as $fines_response) {
             $fineList[] = [
             // fees in vufind are in pennies
-            'amount'   => $fines_response->TransactionAmount*100,
+            'amount'   => $fines_response->TransactionAmount * 100,
             'checkout' => $this->formatJSONTime($fines_response->CheckOutDate),
             'fine'     => $fines_response->FeeDescription,
-            'balance'  => $fines_response->OutstandingAmount*100,
+            'balance'  => $fines_response->OutstandingAmount * 100,
             'duedate'    => $this->formatJSONTime($fines_response->DueDate),
             'createdate' => $this->formatJSONTime($fines_response->TransactionDate),
             'id'    => $fines_response->BibID,
@@ -863,10 +863,10 @@ class Polaris extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
             return;
         }
 
-        $offset = $count-$items_per_page;
+        $offset = $count - $items_per_page;
         $pages = ceil($count / $items_per_page);
 
-        $penultimate_page = $pages-1;
+        $penultimate_page = $pages - 1;
 
         if ($penultimate_page > 0) {
             $page_offset = $penultimate_page;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Sierra.php b/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
index 56f982f229020efffe0e7ed10c00ce36909ef369..0f4ea099fdba6e3a721ba65d54c1bd36dafe3fe8 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
@@ -82,7 +82,7 @@ class Sierra extends AbstractBase implements TranslatorAwareInterface
         // see Millennium manual page #105781 for the logic behind this
         for ($i = $numberLength; $i > 0; $i--) {
             $j = $numberLength - $i;
-            $partialCheck = $partialCheck + ($digitArray[$j] * ($i+1));
+            $partialCheck = $partialCheck + ($digitArray[$j] * ($i + 1));
         }
         $checkdigit = $partialCheck % 11;
         if ($checkdigit == 10) {
@@ -133,7 +133,7 @@ class Sierra extends AbstractBase implements TranslatorAwareInterface
         }
 
         // Convert hours to seconds:
-        $seconds = 60*60*$this->config['Catalog']['just_cataloged_time'];
+        $seconds = 60 * 60 * $this->config['Catalog']['just_cataloged_time'];
 
         // Was this a recently cataloged item? If so, return a special string
         // based on the append setting....
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
index 462d71b3185ecce2dc0a29e45e8a4689db3fc41c..e1ed0fc43dd90b2c44a81825feebb356358aa723 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
@@ -1011,7 +1011,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
             $rescount++;
         }
 
-        $results = array_slice($items, ($page - 1) * $limit, ($page * $limit)-1);
+        $results = array_slice($items, ($page - 1) * $limit, ($page * $limit) - 1);
         return ['count' => $rescount, 'results' => $results];
     }
 
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
index 871d48124163cc019aa35eea24ec2289635ef22f..2d1fca44cdb0f67d96a19e31a22f1a80b94dbeff 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
@@ -1720,7 +1720,7 @@ class Virtua extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterfa
         //consortium&amp;conf=.%26%23047%3bchameleon.conf&amp;timedout=1" />
         $start = strpos($result, 'sessionid=') + 10;
         $end   = strpos($result, '&amp;skin=');
-        return substr($result, $start, $end-$start);
+        return substr($result, $start, $end - $start);
     }
 
     /**
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
index 2469be811081c1fd0253ce133d39303c02885d6a..6e8360eea1979b485e30f4fe7ded2a5be35b4376 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
@@ -1378,7 +1378,7 @@ class Voyager extends AbstractBase
             if (is_numeric($dueTimeStamp)) {
                 if ($now > $dueTimeStamp) {
                     $dueStatus = "overdue";
-                } else if ($now > $dueTimeStamp-(1*24*60*60)) {
+                } else if ($now > $dueTimeStamp - (1 * 24 * 60 * 60)) {
                     $dueStatus = "due";
                 }
             }
@@ -2040,8 +2040,8 @@ class Voyager extends AbstractBase
 
         $page = ($page) ? $page : 1;
         $limit = ($limit) ? $limit : 20;
-        $bindParams[':startRow'] = (($page-1)*$limit)+1;
-        $bindParams[':endRow'] = ($page*$limit);
+        $bindParams[':startRow'] = (($page - 1) * $limit) + 1;
+        $bindParams[':endRow'] = ($page * $limit);
         /*
         $sql = "select * from " .
                "(select a.*, rownum rnum from " .
diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
index 6ab787492efab4e30fe6b1d32954dc0bc0db7f91..9c2f0a1750089070e6ffe4d229cca0f2df7319be 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
@@ -1976,7 +1976,7 @@ EOT;
                 $cancel = $cancel->children();
                 $node = "reply-text";
                 $reply = (string)$cancel->$node;
-                $count = ($reply == "ok") ? $count+1 : $count;
+                $count = ($reply == "ok") ? $count + 1 : $count;
 
                 $response[$itemId] = [
                     'success' => ($reply == "ok") ? true : false,
@@ -2100,7 +2100,7 @@ EOT;
                     if ($dueTimeStamp !== false && is_numeric($dueTimeStamp)) {
                         if ($now > $dueTimeStamp) {
                             $dueStatus = 'overdue';
-                        } else if ($now > $dueTimeStamp-(1*24*60*60)) {
+                        } else if ($now > $dueTimeStamp - (1 * 24 * 60 * 60)) {
                             $dueStatus = 'due';
                         }
                     }
@@ -3069,7 +3069,7 @@ EOT;
                 $cancel = $cancel->children();
                 $node = "reply-text";
                 $reply = (string)$cancel->$node;
-                $count = ($reply == "ok") ? $count+1 : $count;
+                $count = ($reply == "ok") ? $count + 1 : $count;
 
                 $response[$itemId] = [
                     'success' => ($reply == "ok") ? true : false,
diff --git a/module/VuFind/src/VuFind/OAI/Server.php b/module/VuFind/src/VuFind/OAI/Server.php
index 8a54e2a3495a694127a0544faeb77a214dc49be7..dc654ca2639ecd8e520e8586ceb05695ea38307c 100644
--- a/module/VuFind/src/VuFind/OAI/Server.php
+++ b/module/VuFind/src/VuFind/OAI/Server.php
@@ -776,13 +776,13 @@ class Server
             // Set default date range if not already provided:
             if (empty($params['from'])) {
                 $params['from'] = $this->earliestDatestamp;
-                if (strlen($params['from'])>strlen($params['until'])) {
+                if (strlen($params['from']) > strlen($params['until'])) {
                     $params['from'] = substr($params['from'], 0, 10);
                 }
             }
             if (empty($params['until'])) {
                 $params['until'] = date($this->iso8601);
-                if (strlen($params['until'])>strlen($params['from'])) {
+                if (strlen($params['until']) > strlen($params['from'])) {
                     $params['until'] = substr($params['until'], 0, 10);
                 }
             }
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
index b181ec335563273591120149f64acf6c2dd07773..ee6050b068d920f41dd74eb9144f120c2e2691df 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
@@ -211,10 +211,10 @@ class AuthorInfo implements RecommendInterface, TranslatorAwareInterface
         $last = $nameParts[0];
         // - move all names up an index, move last name to last
         // - Last, First M. -> First M. Last
-        for ($i = 1;$i<count($nameParts);$i++) {
-            $nameParts[$i-1] = $nameParts[$i];
+        for ($i = 1;$i < count($nameParts);$i++) {
+            $nameParts[$i - 1] = $nameParts[$i];
         }
-        $nameParts[count($nameParts)-1] = $last;
+        $nameParts[count($nameParts) - 1] = $last;
         $author = implode($nameParts, ' ');
         return $author;
     }
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php b/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php
index 7d068c068f47f939d685b25134c0207dd6c098d8..a6a1cc9a0af6495ed6e4a76c9d82a65129460815 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php
@@ -113,7 +113,7 @@ class AuthorityRecommend implements RecommendInterface
     {
         $params = explode(':', $settings);
         for ($i = 0; $i < count($params); $i += 2) {
-            if (isset($params[$i+1])) {
+            if (isset($params[$i + 1])) {
                 if ($params[$i] == '__resultlimit__') {
                     $this->resultLimit = intval($params[$i + 1]);
                 } else {
diff --git a/module/VuFind/src/VuFind/Recommend/RandomRecommend.php b/module/VuFind/src/VuFind/Recommend/RandomRecommend.php
index 6ce5d1771287fab1f9f0087ba153120120554c21..9cfa58575440824a7b4b3a32485d62d3160f3562 100644
--- a/module/VuFind/src/VuFind/Recommend/RandomRecommend.php
+++ b/module/VuFind/src/VuFind/Recommend/RandomRecommend.php
@@ -151,7 +151,7 @@ class RandomRecommend implements RecommendInterface
 
         // all other params are filters and their values respectively
         for ($i = 5; $i < count($settings); $i += 2) {
-            if (isset($settings[$i+1])) {
+            if (isset($settings[$i + 1])) {
                 $this->filters[] = $settings[$i] . ':' . $settings[$i + 1];
             }
         }
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Redi.php b/module/VuFind/src/VuFind/Resolver/Driver/Redi.php
index 93f624c634452f996a3d080bfc42413074483376..2f1dbda52b2836fea91fe51d802a81203a760d4a 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Redi.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Redi.php
@@ -139,7 +139,7 @@ class Redi implements DriverInterface
             ->query("//dd[@class='doi_d']");
 
         if ($doiTerm->length == $doiDefinition->length) {
-            for ($i = 0; $i<$doiTerm->length; $i++) {
+            for ($i = 0; $i < $doiTerm->length; $i++) {
                 $href = $xpath
                     ->query(".//@href", $doiDefinition->item($i))
                     ->item(0)->textContent;
@@ -172,7 +172,7 @@ class Redi implements DriverInterface
         $infoTokenNodes = $xpath->query("//div[@id='t_ezb']/div[@class='t']/p/sup");
 
         if ($infoTokenNodes->length > 0) {
-            for ($i = 0; $i<$infoTokenNodes->length; $i++) {
+            for ($i = 0; $i < $infoTokenNodes->length; $i++) {
                 if ($infoToken == $infoTokenNodes->item($i)->textContent) {
                     return $xpath
                         ->query("//div[@id='t_ezb']/div[@class='t']/p/sup/..")
@@ -204,16 +204,16 @@ class Redi implements DriverInterface
             ->query("//div[@class='t_ezb_result']/p/span[@class='t_link']/a");
 
         if ($ezbResultsNodesText->length == $ezbResultsNodesURL->length) {
-            for ($i = 0; $i<$ezbResultsNodesText->length; $i++) {
+            for ($i = 0; $i < $ezbResultsNodesText->length; $i++) {
 
                 $accessClass = 'unknown';
                 $accessClassExpressions = [
                     "denied"    => "//div[@class='t_ezb_result']["
-                        . ($i+1) . "]/p/span[@class='t_ezb_red']",
+                        . ($i + 1) . "]/p/span[@class='t_ezb_red']",
                     "limited" => "//div[@class='t_ezb_result']["
-                        . ($i+1) . "]/p/span[@class='t_ezb_yellow']",
+                        . ($i + 1) . "]/p/span[@class='t_ezb_yellow']",
                     "open"  => "//div[@class='t_ezb_result']["
-                        . ($i+1) . "]/p/span[@class='t_ezb_green']",
+                        . ($i + 1) . "]/p/span[@class='t_ezb_green']",
                 ]; // $i+1 because XPath-element-counting starts with 1
                 foreach ($accessClassExpressions as $key => $value) {
                     if ($xpath->evaluate("count({$value})") == 1) {
@@ -224,7 +224,7 @@ class Redi implements DriverInterface
                 $itemInfo = '';
 
                 $expression = "//div[@class='t_ezb_result']["
-                    . ($i+1) . "]/p/sup";
+                    . ($i + 1) . "]/p/sup";
                 if ($xpath->evaluate("count({$expression})") == 1) {
                     $itemInfo = $this->parseRediInfo(
                         $xml, $xpath->query($expression)->item(0)->textContent
diff --git a/module/VuFind/src/VuFind/Search/EIT/Options.php b/module/VuFind/src/VuFind/Search/EIT/Options.php
index b30cd959c478c90ac9ceea23662cef8d3b6b194f..96d748fc1c839000d271d2e5212f51ec4b4b7511 100644
--- a/module/VuFind/src/VuFind/Search/EIT/Options.php
+++ b/module/VuFind/src/VuFind/Search/EIT/Options.php
@@ -41,7 +41,6 @@ namespace VuFind\Search\EIT;
  */
 class Options extends \VuFind\Search\Base\Options
 {
-    
     /**
      * Constructor
      *
diff --git a/module/VuFind/src/VuFind/Search/Solr/AbstractErrorListener.php b/module/VuFind/src/VuFind/Search/Solr/AbstractErrorListener.php
index b3a88aa39a2a14b6f47ae73fa021842a371a1b6c..c61138ce9675cf7c1ae798d56ae41728a59a5a02 100644
--- a/module/VuFind/src/VuFind/Search/Solr/AbstractErrorListener.php
+++ b/module/VuFind/src/VuFind/Search/Solr/AbstractErrorListener.php
@@ -46,7 +46,6 @@ use SplObjectStorage;
  */
 abstract class AbstractErrorListener
 {
-
     /**
      * Tag indicating a parser error.
      *
diff --git a/module/VuFind/src/VuFind/Search/Solr/V4/ErrorListener.php b/module/VuFind/src/VuFind/Search/Solr/V4/ErrorListener.php
index 9e15ae91790338b4d0a4325f368e7c73718221f4..b806b95d252c992077f4371c1b7a6394eea27e30 100644
--- a/module/VuFind/src/VuFind/Search/Solr/V4/ErrorListener.php
+++ b/module/VuFind/src/VuFind/Search/Solr/V4/ErrorListener.php
@@ -45,7 +45,6 @@ use Zend\EventManager\EventInterface;
  */
 class ErrorListener extends AbstractErrorListener
 {
-
     /**
      * Normalized media types.
      *
diff --git a/module/VuFind/src/VuFind/SimpleXML.php b/module/VuFind/src/VuFind/SimpleXML.php
index d166f01b52f8f39709ce275880d937e72f02e312..8c416cdbdd969e116aab2e0bfcad204d9040167e 100644
--- a/module/VuFind/src/VuFind/SimpleXML.php
+++ b/module/VuFind/src/VuFind/SimpleXML.php
@@ -55,7 +55,7 @@ class SimpleXML
 
         // strip off xml header
         $mark = strpos($xml, '?' . '>');
-        if ($mark>0 && $mark<40) {
+        if ($mark > 0 && $mark < 40) {
             $xml = substr($xml, $mark + 2);
         }
 
diff --git a/module/VuFind/src/VuFind/Statistics/AbstractBase.php b/module/VuFind/src/VuFind/Statistics/AbstractBase.php
index 87cab2bb66c48739061d8df94ab108846d5ae605..9edd590438fba29dcb966a526e8970a98b864945 100644
--- a/module/VuFind/src/VuFind/Statistics/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Statistics/AbstractBase.php
@@ -235,7 +235,7 @@ abstract class AbstractBase
         }
         if (strpos($agent, "Chrome") > -1) {
             $split = explode(' ', $agent);
-            return str_replace('/', ' ', $split[count($split)-2]);
+            return str_replace('/', ' ', $split[count($split) - 2]);
         }
         if (strpos($agent, "Firefox") > -1 || strpos($agent, "Safari") > -1) {
             $split = explode(' ', $agent);
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/Solr.php b/module/VuFind/src/VuFind/Statistics/Driver/Solr.php
index 038a30733dbde60587e6342e94415d8218247b5f..55ef0551ab84f7befdedd5fc7df5f989dfe3c039 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/Solr.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/Solr.php
@@ -166,7 +166,7 @@ class Solr extends AbstractBase
                 'count' => $count
             ];
             // Insert sort (limit to listLength)
-            for ($i = 0;$i<$listLength-1 && $i<count($solrBrowsers);$i++) {
+            for ($i = 0;$i < $listLength - 1 && $i < count($solrBrowsers);$i++) {
                 if ($count > $solrBrowsers[$i]['count']) {
                     // Insert in order
                     array_splice($solrBrowsers, $i, 0, [$newBrowser]);
diff --git a/module/VuFind/src/VuFind/Statistics/Record.php b/module/VuFind/src/VuFind/Statistics/Record.php
index 8a06200aba883863a737e11d97d7dd8d9a55894e..b1d46cd841e2a90e465f00d06cc3f6eee7352f8f 100644
--- a/module/VuFind/src/VuFind/Statistics/Record.php
+++ b/module/VuFind/src/VuFind/Statistics/Record.php
@@ -74,7 +74,7 @@ class Record extends AbstractBase
                 $sources = $driver->getFullList('recordSource');
                 $hashes = [];
                 // Generate hashes (faster than grouping by looping)
-                for ($i = 0;$i<count($summary);$i++) {
+                for ($i = 0;$i < count($summary);$i++) {
                     $source = $sources[$i]['recordSource'];
                     $id = $summary[$i]['recordId'];
                     $hashes[$source][$id]
@@ -99,7 +99,7 @@ class Record extends AbstractBase
                             'source' => $source
                         ];
                         // Insert sort (limit to listLength)
-                        for ($i = 0;$i<$listLength-1 && $i<count($reference);$i++) {
+                        for ($i = 0;$i < $listLength - 1 && $i < count($reference);$i++) {
                             if ($count > $reference[$i]['count']) {
                                 // Insert in order
                                 array_splice($reference, $i, 0, [$newRecord]);
diff --git a/module/VuFind/src/VuFind/Statistics/Search.php b/module/VuFind/src/VuFind/Statistics/Search.php
index 5d9acacb3ba425fa4c968654d3a1d34f00609540..6daefcf6e075e25cfd5df0b23a5d3130e0faff7c 100644
--- a/module/VuFind/src/VuFind/Statistics/Search.php
+++ b/module/VuFind/src/VuFind/Statistics/Search.php
@@ -75,7 +75,7 @@ class Search extends AbstractBase
                 $sources = $driver->getFullList('searchSource');
                 $hashes = [];
                 // Generate hashes (faster than grouping by looping)
-                for ($i = 0;$i<count($summary);$i++) {
+                for ($i = 0;$i < count($summary);$i++) {
                     if (!isset($sources[$i]['searchSource'])) {
                         $sources[$i]['searchSource'] = 'Search';
                     } else {
@@ -113,7 +113,7 @@ class Search extends AbstractBase
                             'source' => $source
                         ];
                         // Insert sort (limit to listLength)
-                        for ($i = 0;$i<$listLength-1 && $i<count($reference);$i++) {
+                        for ($i = 0;$i < $listLength - 1 && $i < count($reference);$i++) {
                             if ($count > $reference[$i]['count']) {
                                 // Insert in order
                                 array_splice($reference, $i, 0, [$newRecord]);
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
index 669b4c1906d3c66bdb4ade1b4a511360f0f8a7a6..81279250a13ad708d8d7fa10f4df76ed8d137175 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Citation.php
@@ -704,7 +704,7 @@ class Citation extends \Zend\View\Helper\AbstractHelper
                 $authorStr = $this->cleanNameDates($author) . ', et al';
             } else {
                 foreach ($this->details['authors'] as $author) {
-                    if (($i+1 == count($this->details['authors'])) && ($i > 0)) {
+                    if (($i + 1 == count($this->details['authors'])) && ($i > 0)) {
                         // Last
                         $authorStr .= ', and ' .
                             $this->reverseName($this->stripPunctuation($author));
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Printms.php b/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
index 073d5e3b141af936846b1ea6046409557901be98..bcf97128a71c4f1caa2516042d3f6c3bf2961283 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Printms.php
@@ -48,21 +48,21 @@ class Printms extends AbstractHelper
      */
     public function __invoke($ms)
     {
-        $seconds = floor($ms/1000);
+        $seconds = floor($ms / 1000);
         $ms = ($ms % 1000);
 
-        $minutes = floor($seconds/60);
+        $minutes = floor($seconds / 60);
         $seconds = ($seconds % 60);
 
-        $hours = floor($minutes/60);
+        $hours = floor($minutes / 60);
         $minutes = ($minutes % 60);
 
         if ($hours) {
-            $days = floor($hours/60);
+            $days = floor($hours / 60);
             $hours = ($hours % 60);
 
             if ($days) {
-                $years = floor($days/365);
+                $years = floor($days / 365);
                 $days = ($days % 365);
 
                 if ($years) {
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php b/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
index b297856778637204b3c3e474fd791ddc7b79e8a1..be0c2d20e71792000984acdaa10519ea6f6094a3 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/ResultFeed.php
@@ -144,7 +144,7 @@ class ResultFeed extends AbstractHelper implements TranslatorAwareInterface
         if ($params->getPage() > 1) {
             $feed->addOpensearchLink(
                 $baseUrl . $results->getUrlQuery()
-                    ->setPage($params->getPage()-1, false),
+                    ->setPage($params->getPage() - 1, false),
                 'previous',
                 $params->getView()
             );
@@ -153,7 +153,7 @@ class ResultFeed extends AbstractHelper implements TranslatorAwareInterface
         if ($params->getPage() < $lastPage) {
             $feed->addOpensearchLink(
                 $baseUrl . $results->getUrlQuery()
-                    ->setPage($params->getPage()+1, false),
+                    ->setPage($params->getPage() + 1, false),
                 'next',
                 $params->getView()
             );
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php
index 54a188b7dcdf11501d49274cb60634e0e030d79b..5125b0e1d70ce03d4be7b76beb6787013ea7ce26 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php
@@ -41,7 +41,6 @@ use VuFind\Config\Reader\CacheDecorator;
  */
 class CacheDecoratorTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Read config from while, new file.
      *
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php
index 16519f97745b9383d9e955a1057fe6aa4e4bcc61..509df5fc106a647964a9c1e4886799d06057ecbe 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/DAIATest.php
@@ -45,7 +45,6 @@ use InvalidArgumentException;
  */
 class DAIATest extends \VuFindTest\Unit\ILSDriverTestCase
 {
-
     /**
      * Constructor
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
index 91d089b40791b81194fc00c16415886fde9bd124..08700dbd610b4f945b867331dfd487ea252c026d 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
@@ -30,7 +30,6 @@
 namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\MultiBackend, VuFind\Config\Reader as ConfigReader;
 use Zend\Log\Writer\Mock;
-use Zend\Log\Logger;
 
 /**
  * ILS driver test
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/RediTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/RediTest.php
index 53e9c42835fba0108af0acf31fe8e2597a100484..2bf5d0cca351283913c188ac39039052b525cafb 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/RediTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/RediTest.php
@@ -46,7 +46,6 @@ use InvalidArgumentException;
  */
 class RediTest extends \VuFindTest\Unit\TestCase
 {
-
     /**
      * Test-Config
      *
diff --git a/module/VuFindSearch/Module.php b/module/VuFindSearch/Module.php
index 1f1575313725d3824a50378dc9062c34868a3497..c37a4040e17b7dc2be6da8a3517b5519a65260ca 100644
--- a/module/VuFindSearch/Module.php
+++ b/module/VuFindSearch/Module.php
@@ -56,7 +56,6 @@ namespace VuFindSearch;
  */
 class Module
 {
-
     /**
      * Return autoloader configuration.
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/AbstractHandlerMap.php b/module/VuFindSearch/src/VuFindSearch/Backend/AbstractHandlerMap.php
index 5631551713ce588802e4094a5123e106929b454a..580d75ed1c6577396f067a0545a02f8d47b81cb2 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/AbstractHandlerMap.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/AbstractHandlerMap.php
@@ -46,7 +46,6 @@ use VuFindSearch\ParamBag;
  */
 abstract class AbstractHandlerMap
 {
-
     /**
      * Prepare final set of parameters for search function.
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
index 4b25c8a40b3526a3015d724235d71997716c923a..845a9e43133a1a4cb53835a76065d4560a2be448 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
@@ -419,7 +419,7 @@ class Backend extends AbstractBackend
             // Check to see if the token expiration time is greater than the current
             // time.  If the token is expired or within 5 minutes of expiring,
             // generate a new one.
-            if (!empty($currentToken) && (time() <= ($expirationTime - (60*5)))) {
+            if (!empty($currentToken) && (time() <= ($expirationTime - (60 * 5)))) {
                 return $currentToken;
             }
         }
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php
index c0b927247a353ad8609a78e734d0f3dbcd0d9fc7..32329dc1f5266015fe6bacb644c2efa87ee87601 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php
@@ -146,7 +146,7 @@ class SearchRequestModel
     {
         // PublicationDate:[xxxx TO xxxx]
         $dates = substr($filter, 17);
-        $dates = substr($dates, 0, strlen($dates)-1);
+        $dates = substr($dates, 0, strlen($dates) - 1);
         $parts = explode(' TO ', $dates, 2);
         if (count($parts) == 2) {
             $start = trim($parts[0]);
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
index 7ac36f8478b25853ab5f3eb98460bf95571ff30c..9fc0d601ead442776d342d335d07aad677b75cf1 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
@@ -41,7 +41,6 @@ use XMLWriter;
  */
 class CommitDocument extends AbstractDocument
 {
-
     /**
      * Value for commitWithin attribute
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
index c0a4b335afa6a46185c9146c11e93d1c637fef7a..d09ac12f7534ce3a1d9fb9c72821d0b6f51b3ff8 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
@@ -41,7 +41,6 @@ use XMLWriter;
  */
 class OptimizeDocument extends AbstractDocument
 {
-
     /**
      * Value for waitFlush attribute
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php
index aaec97e53abf937eb7af4d92fc388845e7ce9f2e..48cf993694f9a4c79ffb3dc8f90886f62271607f 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php
@@ -43,7 +43,6 @@ use XMLWriter;
  */
 class UpdateDocument extends AbstractDocument
 {
-
     /**
      * Records and index attributes.
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Record.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Record.php
index c34af0aca61b953efaec8d520ece398bfc67cba7..093dee490ee050757cc90c6852f655aab3b6a2ca 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Record.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Record.php
@@ -44,7 +44,6 @@ use VuFindSearch\Response\RecordInterface;
  */
 class Record implements RecordInterface
 {
-
     /**
      * SOLR fields.
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Response/RecordCollectionInterface.php b/module/VuFindSearch/src/VuFindSearch/Response/RecordCollectionInterface.php
index ccbd3b13a1f8f52861873f1b9e5730529f14a8b5..747929e5319e7d28eac06354c47237d9cc6d8540 100644
--- a/module/VuFindSearch/src/VuFindSearch/Response/RecordCollectionInterface.php
+++ b/module/VuFindSearch/src/VuFindSearch/Response/RecordCollectionInterface.php
@@ -39,7 +39,6 @@ namespace VuFindSearch\Response;
  */
 interface RecordCollectionInterface extends \Countable, \Iterator
 {
-
     /**
      * Return total number of records found.
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Response/RecordInterface.php b/module/VuFindSearch/src/VuFindSearch/Response/RecordInterface.php
index 333c6e12854e4937674a3e4e3836e7d20eacb486..b5a87767dee4fd9fb8752cb782dce54e7d7f132c 100644
--- a/module/VuFindSearch/src/VuFindSearch/Response/RecordInterface.php
+++ b/module/VuFindSearch/src/VuFindSearch/Response/RecordInterface.php
@@ -41,7 +41,6 @@ namespace VuFindSearch\Response;
  */
 interface RecordInterface
 {
-
     /**
      * Set the source backend identifier.
      *
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/AbstractHandlerMapTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/AbstractHandlerMapTest.php
index fb6c5001953ba256e8c1cccc6cbdee0b725a00a0..5c336b5fdac977d02d5e50c26926e3825daecefe 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/AbstractHandlerMapTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/AbstractHandlerMapTest.php
@@ -28,7 +28,6 @@
  */
 namespace VuFindTest\Backend;
 
-use VuFindSearch\Backend\AbstractHandlerMap;
 use VuFindSearch\ParamBag;
 
 use PHPUnit_Framework_TestCase as TestCase;
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php
index 1004c3c5a96026e31c2e483137cf7dabc7140d7c..ac5572d622bb7925c4384f60b7aa28b4ebdbbc95 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php
@@ -29,7 +29,6 @@
 namespace VuFindTest\Backend\EDS;
 
 use VuFindSearch\Backend\EDS\Backend;
-use VuFindSearch\Backend\EDS\Response\RecordCollectionFactory;
 use VuFindSearch\Query\Query;
 use InvalidArgumentException;
 
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php
index ec2854dcc04c91a473f6418f037b758ecda560ad..b8a548411e3d5a62c8c0b06b7c038bd1acd1b0fa 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php
@@ -30,7 +30,6 @@ namespace VuFindTest\Backend\EIT;
 
 use VuFindSearch\Backend\EIT\Backend;
 use VuFindSearch\Backend\EIT\QueryBuilder;
-use VuFindSearch\Backend\EIT\Response\RecordCollectionFactory;
 use VuFindSearch\Query\Query;
 use InvalidArgumentException;
 
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
index f65158c111878c15dcc62d9cbd6136c7934584f6..14c147f3a49ee5549016c2a5d9ec2739368e20e8 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
@@ -345,7 +345,7 @@ class SearchServiceTest extends TestCase
         $responseForZero->expects($this->once())->method('getTotal')
             ->will($this->returnValue($total));
 
-        for ($i = 1; $i<$limit+1; $i++) {
+        for ($i = 1; $i < $limit + 1; $i++) {
             $response = $this->getRecordCollection();
             $response->expects($this->any())->method('first')
                 ->will($this->returnValue($this->getMock('VuFindSearch\Response\RecordInterface')));
@@ -727,5 +727,4 @@ abstract class TestBackendClassForSimilar
 abstract class TestClassForRandomInterface
 implements BackendInterface, RandomInterface
 {
-
 }
\ No newline at end of file
diff --git a/module/VuFindTheme/src/VuFindTheme/LessCompiler.php b/module/VuFindTheme/src/VuFindTheme/LessCompiler.php
index a128979ac8a45be3c5e37dde69fc3a9428ab41d1..755907f7eea4c8f705d333321c2a83489155c516 100644
--- a/module/VuFindTheme/src/VuFindTheme/LessCompiler.php
+++ b/module/VuFindTheme/src/VuFindTheme/LessCompiler.php
@@ -217,7 +217,7 @@ class LessCompiler
         }
         file_put_contents($finalFile, $this->makeRelative($css, $less));
 
-        $this->logMessage("\t\t" . (microtime(true)-$start) . ' sec');
+        $this->logMessage("\t\t" . (microtime(true) - $start) . ' sec');
     }
 
     /**