diff --git a/module/VuDL/src/VuDL/Connection/AbstractBase.php b/module/VuDL/src/VuDL/Connection/AbstractBase.php
index 32372148bcb2de1a681ff1c184fb3387d1d7ea83..068da109ee6097e2d1ab26db527bdb3089c085c1 100644
--- a/module/VuDL/src/VuDL/Connection/AbstractBase.php
+++ b/module/VuDL/src/VuDL/Connection/AbstractBase.php
@@ -118,10 +118,10 @@ class AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
             throw new \Exception('Missing [Details] in VuDL.ini');
         }
         $details = array();
-        foreach ($detailsList as $key=>$title) {
+        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 5dbe876932a0d836a42819f75fdcc55729433f97..df4e3a2362fb4ceb916631d87c2d80862dcedff8 100644
--- a/module/VuDL/src/VuDL/Connection/Fedora.php
+++ b/module/VuDL/src/VuDL/Connection/Fedora.php
@@ -153,7 +153,7 @@ class Fedora extends AbstractBase
             $dc
         );
         $details = array();
-        foreach ($dc[2] as $i=>$detail) {
+        foreach ($dc[2] as $i => $detail) {
             $details[$dc[1][$i]] = $detail;
         }
         if ($format) {
@@ -210,7 +210,7 @@ class Fedora extends AbstractBase
         $response = $this->query($query);
         $list = explode("\n", $response->getBody());
         $items = array();
-        for ($i=1;$i<count($list);$i++) {
+        for ($i = 1;$i<count($list);$i++) {
             if (empty($list[$i])) {
                 continue;
             }
@@ -259,7 +259,7 @@ class Fedora extends AbstractBase
         if (count($list) > 2) {
             $items = array();
             $sequenced = true;
-            for ($i=1;$i<count($list);$i++) {
+            for ($i = 1;$i<count($list);$i++) {
                 if (empty($list[$i])) {
                     continue;
                 }
@@ -271,7 +271,7 @@ class Fedora extends AbstractBase
                 }
                 $items[] = array(
                     'seq' => $seq,
-                    'id' =>$id
+                    'id' => $id
                 );
             }
             if ($sequenced) {
@@ -298,7 +298,7 @@ class Fedora extends AbstractBase
         $response = $this->query($query);
         $list = explode("\n", $response->getBody());
         $items = array();
-        for ($i=1;$i<count($list);$i++) {
+        for ($i = 1;$i<count($list);$i++) {
             if (empty($list[$i])) {
                 continue;
             }
@@ -332,7 +332,7 @@ class Fedora extends AbstractBase
         $response = $this->query($query);
         $list = explode("\n", trim($response->getBody(), "\n"));
         $tree = array();
-        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])) {
@@ -396,7 +396,7 @@ class Fedora extends AbstractBase
         }
         if ($renderer != null) {
             $ret['div'] = $renderer
-                ->render('vudl/techinfo.phtml', array('record'=>$record));
+                ->render('vudl/techinfo.phtml', array('record' => $record));
         }
         return $ret;
     }
@@ -445,7 +445,7 @@ class Fedora extends AbstractBase
             $xml = $this->getDatastreamContent($id, 'LICENSE');
             preg_match('/xlink:href="(.*?)"/', $xml, $license);
             $license = $license[1];
-            foreach ($setLicenses as $tell=>$value) {
+            foreach ($setLicenses as $tell => $value) {
                 if (strpos($license, $tell)) {
                     return array($license, $value);
                 }
@@ -469,10 +469,10 @@ class Fedora extends AbstractBase
             'type'  => 'tuples',
             'flush' => false,
             'lang'  => 'itql',
-            'format'=> 'CSV',
+            'format' => 'CSV',
             'query' => $query
         );
-        foreach ($options as $key=>$value) {
+        foreach ($options as $key => $value) {
             $data[$key] = $value;
         }
         $client = $this->getHttpClient($this->getQueryURL());
diff --git a/module/VuDL/src/VuDL/Connection/Solr.php b/module/VuDL/src/VuDL/Connection/Solr.php
index 75f646c966635dee9ecf727b7d15def722aea987..b8ec3661168c887e902a914e63cd77609389ac72 100644
--- a/module/VuDL/src/VuDL/Connection/Solr.php
+++ b/module/VuDL/src/VuDL/Connection/Solr.php
@@ -276,7 +276,7 @@ class Solr extends AbstractBase
             }
             // Get info on our record
             $parents = $data->response->docs[0];
-            foreach ($parents->hierarchy_parent_id as $i=>$cid) {
+            foreach ($parents->hierarchy_parent_id as $i => $cid) {
                 array_push($queue, $cid);
                 if (!isset($tree[$cid])) {
                     $tree[$cid] = array(
@@ -322,7 +322,7 @@ class Solr extends AbstractBase
         }
         $license = $docs->$licenseField;
         $license = $license[0];
-        foreach ($setLicenses as $tell=>$value) {
+        foreach ($setLicenses as $tell => $value) {
             if (strpos($license, $tell)) {
                 return array($license, $value);
             }
diff --git a/module/VuDL/src/VuDL/Controller/VudlController.php b/module/VuDL/src/VuDL/Controller/VudlController.php
index a2321c8a46bd1ad715fa3292ea891b3d4a2ae6ed..beb77496315479bc9a098ad0d513e57cfd8161d7 100644
--- a/module/VuDL/src/VuDL/Controller/VudlController.php
+++ b/module/VuDL/src/VuDL/Controller/VudlController.php
@@ -87,9 +87,9 @@ class VudlController extends AbstractVuDL
         // GET LISTS
         $lists = $this->getConnector()->getOrderedMembers($parent);
         // GET LIST ITEMS
-        foreach ($lists as $list=>$list_data) {
+        foreach ($lists as $list => $list_data) {
             $items = $this->getConnector()->getOrderedMembers($list_data);
-            foreach ($items as $i=>$id) {
+            foreach ($items as $i => $id) {
                 if ($id == $child) {
                     return array($list, $i);
                 }
@@ -138,7 +138,7 @@ class VudlController extends AbstractVuDL
      */
     public function ajaxAction()
     {
-        $method =(String) $this->params()->fromQuery('method');
+        $method = (String) $this->params()->fromQuery('method');
         return $this->jsonReturn($this->$method());
     }
 
@@ -151,7 +151,7 @@ class VudlController extends AbstractVuDL
      */
     protected function jsonReturn($data)
     {
-        $output = array('data'=>$data, 'status'=>'OK');
+        $output = array('data' => $data, 'status' => 'OK');
         $response = $this->getResponse();
         $headers = $response->getHeaders();
         $headers->addHeaderLine(
@@ -240,7 +240,7 @@ class VudlController extends AbstractVuDL
 
         $classes = $this->getConnector()->getClasses($id);
         if (in_array('FolderCollection', $classes)) {
-            return $this->forwardTo('Collection', 'Home', array('id'=>$id));
+            return $this->forwardTo('Collection', 'Home', array('id' => $id));
         }
         $view = $this->createViewModel();
 
@@ -256,7 +256,7 @@ class VudlController extends AbstractVuDL
         } catch(\Exception $e) {
         }
         if (isset($driver) && $driver->isProtected()) {
-            return $this->forwardTo('VuDL', 'Denied', array('id'=>$id));
+            return $this->forwardTo('VuDL', 'Denied', array('id' => $id));
         }
 
         // File information / description
@@ -368,14 +368,14 @@ class VudlController extends AbstractVuDL
         );
         $response = '';
         foreach ($queries as $q) {
-            $params = new \VuFindSearch\ParamBag(array('q'=>$q));
+            $params = new \VuFindSearch\ParamBag(array('q' => $q));
             $response .= $connector->search($params);
         }
         $result = array();
         preg_match_all('/"ngroups">([^<]*)/', $response, $result);
         $view->totals = array(
-            'folders'=>intval($result[1][0]),
-            'resources'=>intval($result[1][1]),
+            'folders' => intval($result[1][0]),
+            'resources' => intval($result[1][1]),
             // TODO: make these work:
             //'images'=>intval($result[1][2]),
             //'pdfs'=>intval($result[1][3])
@@ -420,7 +420,7 @@ class VudlController extends AbstractVuDL
                 //->toRoute('Collection', 'Home', array('id'=>$params['trail']));
         }
         $index = -1;
-        foreach ($members as $i=>$member) {
+        foreach ($members as $i => $member) {
             if ($member == $params['id']) {
                 $index = $i + count($members);
                 break;
@@ -428,14 +428,14 @@ class VudlController extends AbstractVuDL
         }
         if ($index == -1) {
             return $this->redirect()
-                ->toRoute('collection', array('id'=>$params['trail']));
+                ->toRoute('collection', array('id' => $params['trail']));
         } elseif (isset($params['prev'])) {
             return $this->redirect()->toRoute(
-                'vudl-record', array('id'=>$members[($index-1)%count($members)])
+                'vudl-record', array('id' => $members[($index-1)%count($members)])
             );
         } else {
             return $this->redirect()->toRoute(
-                'vudl-record', array('id'=>$members[($index+1)%count($members)])
+                'vudl-record', array('id' => $members[($index+1)%count($members)])
             );
         }
     }
diff --git a/module/VuDL/src/VuDL/OutlineGenerator.php b/module/VuDL/src/VuDL/OutlineGenerator.php
index 13d958c0094351c257e41cc6e34720382bbe7d1a..ce1f47f044c3ae720ff2b24dccd1350aab83a1d4 100644
--- a/module/VuDL/src/VuDL/OutlineGenerator.php
+++ b/module/VuDL/src/VuDL/OutlineGenerator.php
@@ -141,8 +141,8 @@ class OutlineGenerator
             $this->cache->setItem(
                 $key,
                 array(
-                    'moddate'=>date(DATE_ATOM),
-                    'outline'=>$data
+                    'moddate' => date(DATE_ATOM),
+                    'outline' => $data
                 )
             );
             return $data;
@@ -162,14 +162,14 @@ class OutlineGenerator
         // Reset the state of the class:
         $this->queue = $this->moddate = array();
         $this->outline = array(
-            'counts'=>array(),
-            'names'=>array(),
-            'lists'=>array()
+            'counts' => array(),
+            'names' => array(),
+            'lists' => array()
         );
         // Get lists
         $lists = $this->connector->getOrderedMembers($root);
         // Get list items
-        foreach ($lists as $i=>$list_id) {
+        foreach ($lists as $i => $list_id) {
             // Get list name
             $this->outline['names'][] = $this->connector->getLabel($list_id);
             $this->moddate[$i] = $this->connector->getModDate($list_id);
@@ -238,13 +238,13 @@ class OutlineGenerator
         }
 
         // Get data on all pages and docs
-        foreach ($this->queue as $parent=>$items) {
+        foreach ($this->queue as $parent => $items) {
             $this->outline['counts'][$parent] = count($items);
             if (count($items) < $start) {
                 continue;
             }
             $this->outline['lists'][$parent] = array();
-            for ($i=$start;$i < $start + $pageLength;$i++) {
+            for ($i = $start;$i < $start + $pageLength;$i++) {
                 if ($i >= count($items)) {
                     break;
                 }
@@ -267,8 +267,8 @@ class OutlineGenerator
      */
     protected function injectUrls()
     {
-        foreach ($this->outline['lists'] as $key=>$list) {
-            foreach ($list as $id=>$item) {
+        foreach ($this->outline['lists'] as $key => $list) {
+            foreach ($list as $id => $item) {
                 foreach ($item['datastreams'] as $ds) {
                     $routeParams = array('id' => $item['id'], 'type' => $ds);
                     $this->outline['lists'][$key][$id][strtolower($ds)]
diff --git a/module/VuDL/src/VuDL/RecordDriver/SolrVudl.php b/module/VuDL/src/VuDL/RecordDriver/SolrVudl.php
index 42603d43228ac92aecd8e5a4198b8879a08e6001..728036ce3b0cc981c7850abc5c5b0b7abf7f9917 100644
--- a/module/VuDL/src/VuDL/RecordDriver/SolrVudl.php
+++ b/module/VuDL/src/VuDL/RecordDriver/SolrVudl.php
@@ -95,7 +95,7 @@ class SolrVudl extends \VuFind\RecordDriver\SolrDefault
             'route' => 'files',
             'routeParams' => array(
                 'id' => $this->getUniqueID(),
-                'type'=>'THUMBNAIL'
+                'type' => 'THUMBNAIL'
             )
         );
         // We are currently storing only one size of thumbnail; we'll use this for
diff --git a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/FedoraTest.php b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/FedoraTest.php
index 10c6b238ddeadf5a43df219ec26e85dec858b6bf..3dcd1791e0b2c81d51735863bb000c8bd3f31448 100644
--- a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/FedoraTest.php
+++ b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/FedoraTest.php
@@ -44,7 +44,7 @@ class FedoraTest extends \VuFindTest\Unit\TestCase
             '\VuDL\Connection\Fedora',
             array('getDatastreamContent'),
             array((object) array(
-                'Fedora'=>(object) array(
+                'Fedora' => (object) array(
                     'url_base' => 'http://jsontest.com/',
                     'query_url' => 'QUERY',
                     'adminUser' => 'ADMIN',
@@ -69,7 +69,7 @@ class FedoraTest extends \VuFindTest\Unit\TestCase
 
         $this->assertTrue(is_array($subject->getDatastreamHeaders('id', 'fake')));
 
-        $this->assertEquals(array('title'=>'T','id'=>'ID'), $subject->getDetails('id'));
+        $this->assertEquals(array('title' => 'T','id' => 'ID'), $subject->getDetails('id'));
         // Detail formatting tested in Solr
 
         $this->assertEquals('Zend\Http\Client', get_class($subject->getHttpClient('url')));
diff --git a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php
index 64de44efaba33fa90afc8d809b6e993da06a6c3c..ebd0d619079e4ddd5bbad33b260683cff1189c9c 100644
--- a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php
+++ b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php
@@ -41,7 +41,7 @@ class SolrTest extends \VuFindTest\Unit\TestCase
     public function testMissingDetails()
     {
         $subject = new \VuDL\Connection\Solr(
-            (object) array('General'=>(object) array('page_length'=>8)),
+            (object) array('General' => (object) array('page_length' => 8)),
             new FakeBackend(array('{"response":{"docs":[{"author":"1,2"}]}}'))
         );
 
@@ -64,8 +64,8 @@ class SolrTest extends \VuFindTest\Unit\TestCase
     {
         $subject = new \VuDL\Connection\Solr(
             (object) array(
-                'General'=>(object) array('root_id'=>'ROOT'),
-                'Details'=>new FakeConfig(array('author,author2'=>'Author','series'=>'Series','bacon,eggs'=>'Yum','unused'=>':('))
+                'General' => (object) array('root_id' => 'ROOT'),
+                'Details' => new FakeConfig(array('author,author2' => 'Author','series' => 'Series','bacon,eggs' => 'Yum','unused' => ':('))
             ),
             new FakeBackend(
                 array(
@@ -105,18 +105,18 @@ class SolrTest extends \VuFindTest\Unit\TestCase
         $this->assertEquals(array("CLASS_ONE", "CLASS_TWO"), $subject->getClasses('id'));
 
         $this->assertEquals(null, $subject->getDetails('id', false));
-        $this->assertEquals(array("author"=>array("A1","A2"),"series"=>"S1"), $subject->getDetails('id', false));
+        $this->assertEquals(array("author" => array("A1","A2"),"series" => "S1"), $subject->getDetails('id', false));
         $this->assertEquals(array(
-            "author"=>array("title"=>"Author", "value"=>array("A1","A2")),
-            "bacon"=>array("title"=>"Yum", "value"=>array("MORE")),
-            "series"=>array("title"=>"Series", "value"=>"S1"),
+            "author" => array("title" => "Author", "value" => array("A1","A2")),
+            "bacon" => array("title" => "Yum", "value" => array("MORE")),
+            "series" => array("title" => "Series", "value" => "S1"),
         ), $subject->getDetails('id', true));
 
         $this->assertEquals(null, $subject->getLabel('id'));
         $this->assertEquals("LABEL", $subject->getLabel('id'));
 
         $this->assertEquals(array(), $subject->getMemberList('root'));
-        $this->assertEquals(array(array('id'=>'ID','title'=>'TOP')), $subject->getMemberList('root'));
+        $this->assertEquals(array(array('id' => 'ID','title' => 'TOP')), $subject->getMemberList('root'));
 
         $this->assertEquals(null, $subject->getModDate('id'));
         $this->assertEquals("DATE", $subject->getModDate('id'));
@@ -125,13 +125,13 @@ class SolrTest extends \VuFindTest\Unit\TestCase
         $this->assertEquals(array("ID1", "ID2"), $subject->getOrderedMembers('id', array('fake_filter')));
 
         $this->assertEquals(null, $subject->getParentList('id1'));
-        $this->assertEquals(array(array('id4'=>'title4'), array('id3'=>'title3','id2'=>'title2')), $subject->getParentList('id1'));
+        $this->assertEquals(array(array('id4' => 'title4'), array('id3' => 'title3','id2' => 'title2')), $subject->getParentList('id1'));
         // Cache test
-        $this->assertEquals(array(array('id4'=>'title4'), array('id3'=>'title3','id2'=>'title2')), $subject->getParentList('id1'));
+        $this->assertEquals(array(array('id4' => 'title4'), array('id3' => 'title3','id2' => 'title2')), $subject->getParentList('id1'));
 
         $this->assertEquals(null, $subject->getCopyright('id', array()));
-        $this->assertEquals(array("vuABC", "WTFPL"), $subject->getCopyright('id', array('A'=>'WTFPL')));
-        $this->assertEquals(array("vuABC", false), $subject->getCopyright('id', array('X'=>'WTFPL')));
+        $this->assertEquals(array("vuABC", "WTFPL"), $subject->getCopyright('id', array('A' => 'WTFPL')));
+        $this->assertEquals(array("vuABC", false), $subject->getCopyright('id', array('X' => 'WTFPL')));
 
         $this->assertEquals(16, $subject->getPageLength());
     }
diff --git a/module/VuFind/src/VuFind/Auth/Manager.php b/module/VuFind/src/VuFind/Auth/Manager.php
index 44eb99e55e43dc2b7e2712d062e61767ee824f9b..6901de079dc23e5c38e10a00913f51d517b33884 100644
--- a/module/VuFind/src/VuFind/Auth/Manager.php
+++ b/module/VuFind/src/VuFind/Auth/Manager.php
@@ -174,7 +174,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
      *
      * @return bool
      */
-    public function supportsCreation($authMethod=null)
+    public function supportsCreation($authMethod = null)
     {
         return $this->getAuth($authMethod)->supportsCreation();
     }
@@ -187,7 +187,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
      *
      * @return bool
      */
-    public function supportsRecovery($authMethod=null)
+    public function supportsRecovery($authMethod = null)
     {
         if ($this->getAuth($authMethod)->supportsPasswordRecovery()) {
             return isset($this->config->Authentication->recover_password)
@@ -204,7 +204,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
      *
      * @return bool
      */
-    public function supportsPasswordChange($authMethod=null)
+    public function supportsPasswordChange($authMethod = null)
     {
         if ($this->getAuth($authMethod)->supportsPasswordChange()) {
             return isset($this->config->Authentication->change_password)
@@ -221,7 +221,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
      *
      * @return array
      */
-    public function getPasswordPolicy($authMethod=null)
+    public function getPasswordPolicy($authMethod = null)
     {
         return $this->getAuth($authMethod)->getPasswordPolicy();
     }
diff --git a/module/VuFind/src/VuFind/Bootstrapper.php b/module/VuFind/src/VuFind/Bootstrapper.php
index b40bca078d765234b26d05dd95b5ec729754538b..d5b6f4e78d09dc31363acf494e9025b1e16c2693 100644
--- a/module/VuFind/src/VuFind/Bootstrapper.php
+++ b/module/VuFind/src/VuFind/Bootstrapper.php
@@ -298,7 +298,7 @@ class Bootstrapper
             return;
         }
 
-        $config =& $this->config;
+        $config = & $this->config;
         $browserCallback = array($this, 'detectBrowserLanguage');
         $callback = function ($event) use ($config, $browserCallback) {
             $validBrowserLanguage = call_user_func($browserCallback);
diff --git a/module/VuFind/src/VuFind/Config/Locator.php b/module/VuFind/src/VuFind/Config/Locator.php
index d19008764eabce3439c8745ca09a83780e9da734..d3039c78bfb5d2e8f1cbfed4eb1ec990fd63547b 100644
--- a/module/VuFind/src/VuFind/Config/Locator.php
+++ b/module/VuFind/src/VuFind/Config/Locator.php
@@ -73,7 +73,7 @@ class Locator
      *
      * @return string
      */
-    public static function getBaseConfigPath($filename, $path='config/vufind')
+    public static function getBaseConfigPath($filename, $path = 'config/vufind')
     {
         return APPLICATION_PATH . '/' . $path . '/' . $filename;
     }
diff --git a/module/VuFind/src/VuFind/Config/Writer.php b/module/VuFind/src/VuFind/Config/Writer.php
index 491e2a3c36059bb12712f5e0b95ed97786cbabe7..b253965b17eb80323a3d2c42788e238dfc299ae5 100644
--- a/module/VuFind/src/VuFind/Config/Writer.php
+++ b/module/VuFind/src/VuFind/Config/Writer.php
@@ -94,7 +94,7 @@ class Writer
         $lines = explode("\n", $this->content);
 
         // Reset some flags and prepare to rewrite the content:
-        $settingSet= false;
+        $settingSet = false;
         $currentSection = "";
         $this->content = "";
 
@@ -252,7 +252,7 @@ class Writer
     protected function buildContent($assoc_arr, $comments)
     {
         $content = "";
-        foreach ($assoc_arr as $key=>$elem) {
+        foreach ($assoc_arr as $key => $elem) {
             if (isset($comments['sections'][$key]['before'])) {
                 $content .= $comments['sections'][$key]['before'];
             }
@@ -261,7 +261,7 @@ class Writer
                 $content .= "\t" . $comments['sections'][$key]['inline'];
             }
             $content .= "\n";
-            foreach ($elem as $key2=>$elem2) {
+            foreach ($elem as $key2 => $elem2) {
                 if (isset($comments['sections'][$key]['settings'][$key2])) {
                     $settingComments
                         = $comments['sections'][$key]['settings'][$key2];
diff --git a/module/VuFind/src/VuFind/Connection/OpenLibrary.php b/module/VuFind/src/VuFind/Connection/OpenLibrary.php
index b64345aa6d12e5b04c0e4aaa1156b14d3914432f..5533ce015074d5cc25502385a037dd645f66e5c8 100644
--- a/module/VuFind/src/VuFind/Connection/OpenLibrary.php
+++ b/module/VuFind/src/VuFind/Connection/OpenLibrary.php
@@ -100,7 +100,7 @@ class OpenLibrary
                 // ebooks parameter does not work at present, so limit has been set
                 // to 50 to increase likelihood of full-text, public scans being
                 // returned. see https://bugs.launchpad.net/openlibrary/+bug/709772
-                $url= "http://openlibrary.org/subjects/" . $subjectType . $subject .
+                $url = "http://openlibrary.org/subjects/" . $subjectType . $subject .
                     ".json?ebooks=" . $ebooks . "&details=" . $details .
                     "&offset=" . $offset . "&limit=50&published_in=" . $publishedIn;
 
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index f4ace4ae512a03b1927eace2dd529e7142935b11..fdc2f84e3e2a5325233a20a6a0408cc78c7f0d06 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -224,7 +224,7 @@ class AjaxController extends AbstractBase
 
         // Loop through all the status information that came back
         $statuses = array();
-        foreach ($results as $recordNumber=>$record) {
+        foreach ($results as $recordNumber => $record) {
             // Filter out suppressed locations:
             $record = $this->filterSuppressedLocations($record);
 
@@ -531,7 +531,7 @@ class AjaxController extends AbstractBase
             $headers->addHeaderLine(
                 'Expires', 'Mon, 26 Jul 1997 05:00:00 GMT'
             );
-            $output = array('data'=>$data,'status'=>$status);
+            $output = array('data' => $data,'status' => $status);
             if ('development' == APPLICATION_ENV && count(self::$php_errors) > 0) {
                 $output['php_errors'] = self::$php_errors;
             }
@@ -665,7 +665,7 @@ class AjaxController extends AbstractBase
         // Build data structure for return:
         $tagList = array();
         foreach ($tags as $tag) {
-            $tagList[] = array('tag'=>$tag->tag, 'cnt'=>$tag->cnt);
+            $tagList[] = array('tag' => $tag->tag, 'cnt' => $tag->cnt);
         }
 
         // If we don't have any tags, provide a user-appropriate message:
@@ -697,7 +697,7 @@ class AjaxController extends AbstractBase
 
         $facets = $results->getFullFieldFacets($fields, false);
 
-        $markers=array();
+        $markers = array();
         $i = 0;
         $list = isset($facets['long_lat']['data']['list'])
             ? $facets['long_lat']['data']['list'] : array();
@@ -878,7 +878,7 @@ class AjaxController extends AbstractBase
         $ids = $this->params()->fromPost('ids', array());
         if (empty($ids)) {
             return $this->output(
-                array('result'=>$this->translate('bulk_error_missing')),
+                array('result' => $this->translate('bulk_error_missing')),
                 self::STATUS_ERROR
             );
         }
@@ -1305,7 +1305,7 @@ class AjaxController extends AbstractBase
         $ids = $this->params()->fromPost('ids');
         if (empty($ids)) {
             return $this->output(
-                array('result'=>$this->translate('bulk_error_missing')),
+                array('result' => $this->translate('bulk_error_missing')),
                 self::STATUS_ERROR
             );
         }
diff --git a/module/VuFind/src/VuFind/Controller/BrowseController.php b/module/VuFind/src/VuFind/Controller/BrowseController.php
index 3e49113e4141c9ec7d8cd6a9406613bd2caa83e9..6733a5642cbc8891193b83b90463d5009d1b1c02 100644
--- a/module/VuFind/src/VuFind/Controller/BrowseController.php
+++ b/module/VuFind/src/VuFind/Controller/BrowseController.php
@@ -327,7 +327,7 @@ class BrowseController extends AbstractBase
                     $this->config->Browse->result_limit
                 );
                 $resultList = array();
-                foreach ($tagList as $i=>$tag) {
+                foreach ($tagList as $i => $tag) {
                     $resultList[$i] = array(
                         'result' => $tag['tag'],
                         'count'    => $tag['cnt']
@@ -634,7 +634,7 @@ class BrowseController extends AbstractBase
      */
     protected function quoteValues($array)
     {
-        foreach ($array as $i=>$result) {
+        foreach ($array as $i => $result) {
             $result['value'] = '"'.$result['value'].'"';
             $array[$i] = $result;
         }
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/NewItems.php b/module/VuFind/src/VuFind/Controller/Plugin/NewItems.php
index b896624978ff051525c341e6b6a9bd7b1c9c515f..757bfa2e850d02b75166e1de5f490a1ccc8740b8 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 = array();
-        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/Controller/Plugin/ResultScroller.php b/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php
index f267e0cd16f7502fb682e20ba83b41829c4791a7..59c6920b1fe3406a95b04cb96cef20b9fc79d5bb 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/ResultScroller.php
@@ -300,8 +300,8 @@ class ResultScroller extends AbstractPlugin
     public function getScrollData($driver)
     {
         $retVal = array(
-            'previousRecord'=>null, 'nextRecord'=>null,
-            'currentPosition'=>null, 'resultTotal'=>null
+            'previousRecord' => null, 'nextRecord' => null,
+            'currentPosition' => null, 'resultTotal' => null
         );
 
         // Do nothing if disabled or data missing:
diff --git a/module/VuFind/src/VuFind/Controller/SearchController.php b/module/VuFind/src/VuFind/Controller/SearchController.php
index 6a68ba63c163e63564266758260f2e546645eb01..4a2ba539b7209273c8a7bfa5164c57cfee4d4a07 100644
--- a/module/VuFind/src/VuFind/Controller/SearchController.php
+++ b/module/VuFind/src/VuFind/Controller/SearchController.php
@@ -146,7 +146,7 @@ class SearchController extends AbstractSearch
      */
     protected function getIllustrationSettings($savedSearch = false)
     {
-        $illYes= array(
+        $illYes = array(
             'text' => 'Has Illustrations', 'value' => 1, 'selected' => false
         );
         $illNo = array(
diff --git a/module/VuFind/src/VuFind/Cover/Generator.php b/module/VuFind/src/VuFind/Cover/Generator.php
index a990f2eef1894f480350ea1b44e1de02f279c05e..8b326c04cbf8caee827fd5f85440fc37826092bc 100644
--- a/module/VuFind/src/VuFind/Cover/Generator.php
+++ b/module/VuFind/src/VuFind/Cover/Generator.php
@@ -77,7 +77,7 @@ class Generator
             'topPadding'   => 19,
             'wrapWidth'    => 80,
         );
-        foreach ($settings as $i=>$setting) {
+        foreach ($settings as $i => $setting) {
             $default[$i] = $setting;
         }
         $default['authorFont'] = $this->fontPath($default['authorFont']);
@@ -240,7 +240,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;
@@ -296,7 +296,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]);
@@ -362,7 +362,7 @@ class Generator
         // Scale author to fit by incrementing fontsizes down
         $fontSize = $this->settings->fontSize;
         do {
-            $txtWidth=$this->textWidth(
+            $txtWidth = $this->textWidth(
                 $author,
                 $this->settings->titleFont,
                 $fontSize
@@ -436,7 +436,7 @@ class Generator
      * @return void
      */
     protected function drawText($im, $text, $x, $y,
-        $font, $fontSize, $mcolor, $scolor=false, $align=null
+        $font, $fontSize, $mcolor, $scolor = false, $align = null
     ) {
         $txtWidth = $this->textWidth(
             $text,
@@ -487,12 +487,12 @@ class Generator
     protected function render($bc, $im, $color, $half, $box)
     {
         $bc = str_split($bc);
-        for ($k=0;$k<4;$k++) {
+        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 ($i = 0;$i<16;$i++) {
                 if ($bc[$i] == "1") {
                     imagefilledrectangle($im, $x, $y, $x+$box-1, $y+$box-1, $color);
                 }
diff --git a/module/VuFind/src/VuFind/Cover/Loader.php b/module/VuFind/src/VuFind/Cover/Loader.php
index f26d2aac9b004f0ec2c238b084dd3f3ebee0fd9d..b717974fe9696a2da030da2437c0104c8968949c 100644
--- a/module/VuFind/src/VuFind/Cover/Loader.php
+++ b/module/VuFind/src/VuFind/Cover/Loader.php
@@ -158,7 +158,7 @@ class Loader extends \VuFind\ImageLoader
     {
         return new \VuFind\Cover\Generator(
             $this->themeTools,
-            array('mode'=>$this->config->Content->makeDynamicCovers)
+            array('mode' => $this->config->Content->makeDynamicCovers)
         );
     }
 
diff --git a/module/VuFind/src/VuFind/Crypt/RC4.php b/module/VuFind/src/VuFind/Crypt/RC4.php
index 73b67bcae191bee114c0f05a45bbd1563cdc3a25..7b0f5134b71ce24046ae9775a8806eec80f8e071 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 = array();
-        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 eff244f722029eb0240abfb9ade0806ced70fe8b..fe8a1bffe11d4a70a594d0e42c18edf8e69ba762 100644
--- a/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
+++ b/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
@@ -59,7 +59,7 @@ class UserStatsFields extends Gateway
     public function save($stats, $userData)
     {
         // Statistics data
-        foreach ($stats as $field=>$value) {
+        foreach ($stats as $field => $value) {
             if (gettype($value) == "boolean") {
                 $value = ($value) ? "true":"false";
             }
@@ -97,7 +97,7 @@ class UserStatsFields extends Gateway
                 array($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(
                     array('field'.$i => 'user_stats_fields'),
@@ -105,7 +105,7 @@ class UserStatsFields extends Gateway
                     array($fields[$i] => 'field'.$i.'.value')
                 );
             }
-            foreach ($values as $key=>$value) {
+            foreach ($values as $key => $value) {
                 $select->where->equalTo($key, $value);
             }
         };
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
index 3bd93facabfd2d9d1df136c5b431571d212141a9..3c9cc984387e30cdc1989b1711f77d3b54f72ad9 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php
@@ -215,7 +215,7 @@ class JSTree extends AbstractBase
         );
         if (isset($node->children)) {
             $ret['children'] = array();
-            for ($i=0;$i<count($node->children);$i++) {
+            for ($i = 0;$i<count($node->children);$i++) {
                 $ret['children'][$i] = $this
                     ->formatJSON($node->children[$i], $context, $hierarchyID);
             }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
index a55a72cc889b0816ce6cdf88ae13a1a5109437a2..aebfdb260c343a2c464680944e6fefd2f378b827 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
@@ -176,11 +176,11 @@ class AlephTranslator
         $lib = $matches[1];
         $no1 = $matches[2];
         if ($no1 == "##") {
-            $no1="";
+            $no1 = "";
         }
         $no2 = $matches[3];
         if ($no2 == "##") {
-            $no2="";
+            $no2 = "";
         }
         $desc = iconv($charset, 'UTF-8', $matches[5]);
         $key = trim($lib) . "|" . trim($no1) . "|" . trim($no2);
@@ -432,7 +432,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      *
      * @return SimpleXMLElement
      */
-    protected function doXRequest($op, $params, $auth=false)
+    protected function doXRequest($op, $params, $auth = false)
     {
         if (!$this->xserver_enabled) {
             throw new \Exception(
@@ -472,7 +472,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      * @return SimpleXMLElement
      */
     protected function doRestDLFRequest($path_elements, $params = null,
-        $method='GET', $body = null
+        $method = 'GET', $body = null
     ) {
         $path = '';
         foreach ($path_elements as $path_element) {
@@ -510,7 +510,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
         $sep = (strpos($url, "?") === false)?'?':'&';
         if ($params != null) {
             foreach ($params as $key => $value) {
-                $url.= $sep . $key . "=" . urlencode($value);
+                $url .= $sep . $key . "=" . urlencode($value);
                 $sep = "&";
             }
         }
@@ -526,7 +526,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      *
      * @return SimpleXMLElement
      */
-    protected function doHTTPRequest($url, $method='GET', $body = null)
+    protected function doHTTPRequest($url, $method = 'GET', $body = null)
     {
         if ($this->debug_enabled) {
             $this->debug("URL: '$url'");
@@ -572,7 +572,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      */
     protected function parseId($id)
     {
-        if (count($this->bib)==1) {
+        if (count($this->bib) == 1) {
             return array($this->bib[0], $id);
         } else {
             return explode('-', $id);
@@ -866,7 +866,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      * @throws ILSException
      * @return array        Array of the patron's transactions on success.
      */
-    public function getMyTransactions($user, $history=false)
+    public function getMyTransactions($user, $history = false)
     {
         $userId = $user['id'];
         $transList = array();
@@ -1138,10 +1138,10 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
             $barcode = (string) $z30->{'z30-barcode'};
             $checkout = (string) $z31->{'z31-date'};
             $id = $this->barcodeToID($barcode);
-            if ($transactiontype=="Debit") {
-                $mult=-100;
-            } elseif ($transactiontype=="Credit") {
-                $mult=100;
+            if ($transactiontype == "Debit") {
+                $mult = -100;
+            } elseif ($transactiontype == "Credit") {
+                $mult = 100;
             }
             $amount
                 = (float)(preg_replace("/[\(\)]/", "", (string) $z31->{'z31-sum'}))
@@ -1215,7 +1215,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      */
     public function getMyProfileX($user)
     {
-        $recordList=array();
+        $recordList = array();
         if (!isset($user['college'])) {
             $user['college'] = $this->useradm;
         }
@@ -1346,7 +1346,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
         } catch (\Exception $ex) {
             throw new ILSException($ex->getMessage());
         }
-        $patron=array();
+        $patron = array();
         $name = $xml->z303->{'z303-name'};
         if (strstr($name, ",")) {
             list($lastName, $firstName) = explode(",", $name);
@@ -1545,7 +1545,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
                         false
                     );
                     $id = $result->xpath('//doc_number/text()');
-                    if (count($this->bib)==1) {
+                    if (count($this->bib) == 1) {
                         return $id[0];
                     } else {
                         return $base . "-" . $id[0];
@@ -1624,7 +1624,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      * @return array        An array of associative arrays with locationID and
      * locationDisplay keys
      */
-    public function getPickUpLocations($patron, $holdInfo=null)
+    public function getPickUpLocations($patron, $holdInfo = null)
     {
         if ($holdInfo != null) {
             $details = $this->getHoldingInfoForItem(
@@ -1656,7 +1656,7 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface,
      *
      * @return string       The default pickup location for the patron.
      */
-    public function getDefaultPickUpLocation($patron, $holdInfo=null)
+    public function getDefaultPickUpLocation($patron, $holdInfo = null)
     {
         if ($holdInfo != null) {
             $details = $this->getHoldingInfoForItem(
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
index 5bbf267770a49c4165ffc6ef4eae168ab4b0bd32..11508a7827bcf0569ce8d2a0cace2f5407ffd2fe 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Amicus.php
@@ -203,9 +203,9 @@ class Amicus extends AbstractBase implements TranslatorAwareInterface
         while ($row = $sqlStmt->fetch(PDO::FETCH_ASSOC)) {
             $prestados = $row['PRESTADO'];
             if ($row['PRESTADO'] == 0) {
-                $prestados="Disponible";
+                $prestados = "Disponible";
             } else {
-                $prestados="No disponible";
+                $prestados = "No disponible";
             }
         }
         return $prestados;
@@ -350,12 +350,12 @@ class Amicus extends AbstractBase implements TranslatorAwareInterface
                             'callnumber' => $textoSign
                         );
                     } else {
-                        $multiple=$row['LOCATION'];
-                        if ($multiple=='Deposito2') {
-                            $multiple="Depósito2";
+                        $multiple = $row['LOCATION'];
+                        if ($multiple == 'Deposito2') {
+                            $multiple = "Depósito2";
                         }
-                        if ($multiple=='Deposito') {
-                            $multiple="Depósito";
+                        if ($multiple == 'Deposito') {
+                            $multiple = "Depósito";
                         }
                         $data[$row['BIB_ITM_NBR']] = array(
                             'id' => $id,
@@ -474,12 +474,12 @@ class Amicus extends AbstractBase implements TranslatorAwareInterface
             $data = array();
             while ($row = $sqlStmt->fetch(PDO::FETCH_ASSOC)) {
                 // Determine Location
-                $loc=$row['LOCATION'];
-                if ($loc=='Deposito2') {
-                    $loc="Depósito2";
+                $loc = $row['LOCATION'];
+                if ($loc == 'Deposito2') {
+                    $loc = "Depósito2";
                 }
-                if ($loc=='Deposito') {
-                    $loc="Depósito";
+                if ($loc == 'Deposito') {
+                    $loc = "Depósito";
                 }
 
                 $status = $this->sacaStatus($row['CPY_ID_NBR']);
diff --git a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
index 3b7451ee9eb7e6e382543db5c9c349feaf5da6b2..ed441cad349d0256b1302537bae712b20eb2aa15 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
@@ -362,7 +362,7 @@ class ClaviusSQL extends AbstractBase
                     'id' => $originalId,
                     //'location' => $item['location'],
                     'location' => $locs[$item['location']],
-                    'callnumber' => ($item['callnumber']=="")
+                    'callnumber' => ($item['callnumber'] == "")
                         ? null : $item['callnumber'],
                     'number' => intval($item['number']),
                     'barcode' => ($this->useBarcodes)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
index b74750f26081abcc28cb1f8129e89d24d28ad5e5..1eb6629960465739d7280dc0ebfb5bd1f5300f2f 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
@@ -208,8 +208,8 @@ class DAIA extends AbstractBase implements \Zend\Log\LoggerAwareInterface
         $status = array();
         for ($b = 0; $documentlist->item($b) !== null; $b++) {
             $itemlist = $documentlist->item($b)->getElementsByTagName('item');
-            $ilslink='';
-            if ($documentlist->item($b)->attributes->getNamedItem('href')!==null) {
+            $ilslink = '';
+            if ($documentlist->item($b)->attributes->getNamedItem('href') !== null) {
                 $ilslink = $documentlist->item($b)->attributes
                     ->getNamedItem('href')->nodeValue;
             }
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
index 1b0514b8261359df69ac1f55efbfa58b0e6f6f6b..19930f06cc6a89c4855c22ebf52bade6c0189eb5 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
@@ -511,7 +511,7 @@ class Horizon extends AbstractBase
             $sqlStmt = mssql_query($sql);
             $row = mssql_fetch_assoc($sqlStmt);
             if ($row) {
-                list($lastname,$firstname)=explode(', ', $row['FULLNAME']);
+                list($lastname,$firstname) = explode(', ', $row['FULLNAME']);
                 $user = array('id' => $username,
                               'firstname' => $firstname,
                               'lastname' => $lastname,
@@ -626,7 +626,7 @@ class Horizon extends AbstractBase
                 $expire = $this->dateFormat->convertToDisplayDate(
                     "M d Y", trim($row['REQUEST_EXPIRE'])
                 );
-            } elseif ($row['STATUS']==2) {
+            } elseif ($row['STATUS'] == 2) {
                 // Items that are 'In Transit' have no expiration date.
                 $expire = 'In Transit';
             } else {
@@ -808,8 +808,8 @@ class Horizon extends AbstractBase
 
             $row = mssql_fetch_assoc($sqlStmt);
             if ($row) {
-                list($lastname,$firstname)=explode(', ', $row['FULLNAME']);
-                $profile= array('lastname' => $lastname,
+                list($lastname,$firstname) = explode(', ', $row['FULLNAME']);
+                $profile = array('lastname' => $lastname,
                                 'firstname' => $firstname,
                                 'address1' => $row['ADDRESS1'],
                                 'address2' => $row['ADDRESS2'],
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Innovative.php b/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
index a7132da4ce2c9ea9f2f1b300a930752bc6c688da..96dc8ead654526b4e0627710cfa8655eb3fb6f31 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Innovative.php
@@ -171,7 +171,7 @@ class Innovative extends AbstractBase implements
             $cols = preg_split("/<t(h|d)([^>]*)>/", $row);
 
             // for each th or td section, do the following.
-            for ($i=0; $i < sizeof($cols); $i++) {
+            for ($i = 0; $i < sizeof($cols); $i++) {
                 // replace non blocking space encodings with a space.
                 $cols[$i] = str_replace("&nbsp;", " ", $cols[$i]);
                 // remove html comment tags
diff --git a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
index fe1049afa0dc59b931d9a206ce581ec4c5a1b773..de4b629b6876ad436614bc89e68c1d3295457d5b 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
@@ -162,7 +162,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
                 }
                 if ($loan_status == 5) {
                     $available = false;
-                } else if ($loan_status==4) {
+                } else if ($loan_status == 4) {
                     $available = false;
                 }
 
@@ -192,13 +192,13 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
      */
     protected function getStatusText($indi, $status)
     {
-        if ($indi==0 && $status==0) {
+        if ($indi == 0 && $status == 0) {
             $text = 'Available';
-        } else if ($indi==0 && $status==4) {
+        } else if ($indi == 0 && $status == 4) {
             $text = 'On Reserve';
-        } else if ($indi==0 && $status==5) {
+        } else if ($indi == 0 && $status == 5) {
             $text = 'Checked Out';
-        } else if ($indi==3) {
+        } else if ($indi == 3) {
             $text = 'Presence';
         } else {
             $text = 'Not Available';
@@ -251,10 +251,10 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
                 //suppress multiple callnumbers, comma separated items
                 $callnumber = current(explode(',', substr($row[5], 4)));
 
-                if ($locid!='') {
+                if ($locid != '') {
                     $location = $this->opaciln."/". $locid;
                 }
-                if ($row[6]!='') {
+                if ($row[6] != '') {
                     $summary = array($row[6]);
                 }
                 $material = $row[7];
@@ -274,12 +274,12 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
                 }
 
                 $available = true;
-                if ($loan_status=='') {
+                if ($loan_status == '') {
                     $available = false;
-                } else if ($loan_status==4) {
+                } else if ($loan_status == 4) {
                     $available = false;
                     $reserve = 'Y';
-                } else if ($loan_status==5) {
+                } else if ($loan_status == 5) {
                     $available = false;
                     $duedate = $this->getLoanexpire($volnum);
                     $is_holdable = true;
@@ -323,13 +323,13 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
      */
     protected function checkHold($loanindi, $material)
     {
-        if ($loanindi==0) {
-            if (substr($material, 0, 2)=='Ab') {
+        if ($loanindi == 0) {
+            if (substr($material, 0, 2) == 'Ab') {
                 return true;
             }
-        } else if ($loanindi==3) {
+        } else if ($loanindi == 3) {
             return true;
-        } else if ($loanindi==6) {
+        } else if ($loanindi == 6) {
             return true;
         } else {
             return false;
@@ -351,7 +351,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
      */
     protected function getNote($loanind, $locid, $callnumber)
     {
-        if ($loanind == 0 && $locid=='000') {
+        if ($loanind == 0 && $locid == '000') {
             $note = $this->translate("Textbook Collection");
         } else if ($loanind == 1) {
             $note = $this->translate("Short loan");//Short time loan?
@@ -359,9 +359,9 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
             $note = "Interlibrary Loan";
         } else if ($loanind == 3) {
             $note = $this->translate("Presence");
-        } else if ($loanind==8) {
+        } else if ($loanind == 8) {
             $note = $this->translate("Missed");
-        } else if ($loanind==9) {
+        } else if ($loanind == 9) {
             $note = $this->translate("In Progress");
         }
         return $note;
@@ -568,16 +568,16 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
                           'phone'     => $row[12],
                           'group'     => $row[6],
                           );
-                if ($row[6]=='81') {
+                if ($row[6] == '81') {
                     $result['group'] = $this->translate('Staff');
-                } else if ($row[6]=='1') {
+                } else if ($row[6] == '1') {
                     $result['group'] = $this->translate('Student');
-                } else if ($row[6]=='30') {
+                } else if ($row[6] == '30') {
                     $result['group'] = $this->translate('Residents');
                 }
                 $row = sybase_fetch_row($sqlStmt);
                 if ($row) {
-                    if ($row[8]==$row[13]) { //reminder address first
+                    if ($row[8] == $row[13]) { //reminder address first
                         $result['address2'] = $result['address1'];
                         $result['address1'] = $row[10].', '.$row[9].' '.$row[11];
                     } else {
@@ -652,7 +652,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
         $aid = $patron['address_id_nr'];
         $iln = $patron['iln'];
         //$lang = $patron['lang'];
-        $sql="select o.ppn"
+        $sql = "select o.ppn"
             .", o.shorttitle"
             .", rtrim(convert(char(20),r.reservation_date_time,104))"
             .", rtrim(convert(char(20),l.expiry_date_reminder,104))"
@@ -720,7 +720,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
         $aid = $patron['address_id_nr'];
         $iln = $patron['iln'];
         //$lang = $patron['lang'];
-        $sql="select o.ppn"
+        $sql = "select o.ppn"
             .", r.costs_code"
             .", r.costs"
             .", rtrim(convert(char(20),r.date_of_issue,104))"
@@ -751,7 +751,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);
@@ -760,7 +760,7 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
                     'id'      => $this->prfz($row[0]),
                     'amount'  => $amount,
                     'balance' => $amount, //wtf
-                    'checkout'=> $checkout,
+                    'checkout' => $checkout,
                     'duedate' => $duedate,
                     'fine'    => $fine,
                     'title'   => $title,
@@ -798,17 +798,17 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
     {
         $x = 0; $y = 0; $w = 2;
         $stra = str_split($str);
-        for ($i=strlen($str); $i>0; $i--) {
+        for ($i = strlen($str); $i>0; $i--) {
             $c = $stra[$i-1];
             $x = ord($c) - 48;
             $y += $x*$w;
             $w++;
         }
         $p = 11-$y%11;
-        if ($p==11) {
-            $p=0;
+        if ($p == 11) {
+            $p = 0;
         }
-        if ($p==10) {
+        if ($p == 10) {
             $ret = $str."X";
         } else {
             $ret = $str.$p;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php b/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
index 59b492e56dbea83436547aba64e407d3ed671278..d7ffd0b45ef09254106aa11e50e73eaccf08bef8 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/NewGenLib.php
@@ -105,7 +105,7 @@ class NewGenLib extends AbstractBase
             }
             $duedate = "";
             while ($rowDD = $sqlStmt2->fetch(PDO::FETCH_ASSOC)) {
-                $duedate=$rowDD['due_date'];
+                $duedate = $rowDD['due_date'];
             }
             // add needed entries
             $holding[$i]['duedate'] = $duedate;
@@ -133,8 +133,8 @@ class NewGenLib extends AbstractBase
     public function getMyFines($patron)
     {
         $MyFines = array();
-        $pid=$patron['cat_username'];
-        $fine='Overdue';
+        $pid = $patron['cat_username'];
+        $fine = 'Overdue';
         $LibId = 1;
         $mainsql = "select d.volume_id as volume_id, c.status as status, " .
             "v.volume_id as volume_id, d.accession_number as " .
@@ -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[] = array('amount' => $amount,
@@ -181,7 +181,7 @@ class NewGenLib extends AbstractBase
                 'fine' => $fine,
                 'balance' => $balance,
                 'duedate' => $duedate,
-                'id'=>$id);
+                'id' => $id);
         }
 
         return $MyFines;
@@ -233,8 +233,8 @@ class NewGenLib extends AbstractBase
             $duedate = "";
             $tadate = "";
             while ($rowDD = $sqlStmt2->fetch(PDO::FETCH_ASSOC)) {
-                $duedate=$rowDD['due_date'];
-                $tadate=$rowDD['ta_date'];
+                $duedate = $rowDD['due_date'];
+                $tadate = $rowDD['ta_date'];
             }
             $holds[] = array('type' => $type,
                 'id' => $RecordId,
@@ -497,7 +497,7 @@ class NewGenLib extends AbstractBase
     public function getNewItems($page, $limit, $daysOld, $fundId = null)
     {
         // Do some initial work in solr so we aren't repeating it inside this loop.
-        $retVal[][]=array();
+        $retVal[][] = array();
 
         $offset = ($page - 1) * $limit;
         $sql = "select cataloguerecordid,owner_library_id from cataloguerecord " .
@@ -513,8 +513,8 @@ class NewGenLib extends AbstractBase
 
         $results = array();
         while ($row = $sqlStmt->fetch(PDO::FETCH_ASSOC)) {
-            $id=$row['cataloguerecordid'] . "_" . $row['owner_library_id'];
-            $results[]=$id;
+            $id = $row['cataloguerecordid'] . "_" . $row['owner_library_id'];
+            $results[] = $id;
         }
         $retVal = array('count' => count($results), 'results' => array());
         foreach ($results as $result) {
@@ -601,7 +601,7 @@ class NewGenLib extends AbstractBase
             }
             $location = "";
             while ($rowLoc = $sqlSmt1->fetch(PDO::FETCH_ASSOC)) {
-                $location=$rowLoc['location'];
+                $location = $rowLoc['location'];
             }
             $StatusResult[] = array('id' => $RecordID,
                 'status' => $status,
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PICA.php b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
index 3104af0e1b900662d681f2f9c38643df5f6db3cf..3abafc093e2ffab51b50466f76e0882b8e82babb 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PICA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
@@ -522,7 +522,7 @@ class PICA extends DAIA
             // so its not a valid identifier
             // we need to calculate the checksum
             $checksum = 0;
-            for ($i=0; $i<strlen($value);$i++) {
+            for ($i = 0; $i<strlen($value);$i++) {
                 $checksum += $value[$i]*(9-$i);
             }
             if ($checksum%11 === 1) {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Polaris.php b/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
index 11990fc54f12e06aaee47aefe56a06b9110d2756..bc5e09fe7080582255c58ca024c2cfd4f72aadee 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
@@ -117,7 +117,7 @@ class Polaris extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
      * @throws ILSException
      * @return obj
      */
-    protected function makeRequest($api_query, $http_method="GET",
+    protected function makeRequest($api_query, $http_method = "GET",
         $patronpassword = "", $json = false
     ) {
         // TODO, just make this for this one call
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
index ab801d1fb74a0e16557fd61ee9b8d0c784ebf1a4..a1d46c21eea055d14321f3c0ceb71e30f01de7fa 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
@@ -583,7 +583,7 @@ class Symphony extends AbstractBase
                      * it is insufficient to provide just the location
                      * description as the "location."
                      */
-                    if (count($this->config['LibraryFilter']['include_only'])!=1) {
+                    if (count($this->config['LibraryFilter']['include_only']) != 1) {
                         $location = "$library - $location";
                     }
                 }
@@ -1507,7 +1507,7 @@ class Symphony extends AbstractBase
                 $details[$barcode] = array(
                     'success' => true,
                     'new_date' => date('j-M-y', strtotime($renewal->dueDate)),
-                    'new_time' =>date('g:i a', strtotime($renewal->dueDate)),
+                    'new_time' => date('g:i a', strtotime($renewal->dueDate)),
                     'item_id' => $renewal->itemID,
                     'sysMessage' => $renewal->message
                 );
@@ -1653,7 +1653,7 @@ class Symphony extends AbstractBase
     {
         $libraries = array();
 
-        foreach ($this->getPolicyList('LIBR') as $key=>$library) {
+        foreach ($this->getPolicyList('LIBR') as $key => $library) {
             $libraries[] = array(
                 'locationID' => $key,
                 'locationDisplay' => $library
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
index 2b713d0212e84a99729d5f5f827bc2d52571ee55..1dacb87a58864dfce45695c560d60818877737f2 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
@@ -161,7 +161,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
      */
     public function getPickUpLocations($patron = false, $holdDetails = null)
     {
-        $params = array('query'=>'libraries');
+        $params = array('query' => 'libraries');
         $response = $this->querySirsi($params);
         $response = rtrim($response);
         $lines = explode("\n", $response);
@@ -702,7 +702,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         $patron = $cancelDetails['patron'];
         $details = $cancelDetails['details'];
         $params = array(
-            'query'=>'cancelHolds',
+            'query' => 'cancelHolds',
             'patronId' => $patron['cat_username'], 'pin' => $patron['cat_password'],
             'holdId' => implode('|', $details)
         );
@@ -1080,7 +1080,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
             && isset($this->config['UnavailableLocations'][$currLocCode])
         ) {
             $availability = 0;
-            $status= $this->config['UnavailableLocations'][$currLocCode];
+            $status = $this->config['UnavailableLocations'][$currLocCode];
         }
 
         $item = array(
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
index b3e1094ce23b70d06290f2d6ec62ab6476ce32f2..3c35b571da3eace726c91e07163f53be0b9eb6dd 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php
@@ -1535,7 +1535,7 @@ class Virtua extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterfa
         $last_date = $holdDetails['requiredBy'];
 
         // Assume an error response:
-        $response = array('success' => false, 'status' =>"hold_error_fail");
+        $response = array('success' => false, 'status' => "hold_error_fail");
 
         // Get the iPortal server
         $web_server = $this->config['Catalog']['webhost'];
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
index 3428c188c62b3c55b23b5d0dc25bcbc7dfa9b565..38a06769a0923803d273b2ca6c0049b04c872374 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Voyager.php
@@ -1499,7 +1499,7 @@ class Voyager extends AbstractBase
         try {
             $sqlStmt = $this->executeSQL($sql);
             while ($row = $sqlStmt->fetch(PDO::FETCH_ASSOC)) {
-                $processFine= $this->processFinesData($row);
+                $processFine = $this->processFinesData($row);
                 $fineList[] = $processFine;
             }
             return $fineList;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
index 1feaf83089661cf0d9c5bf719fe7073046291b12..7aa6e4a814aee114bbd70d7c045a5febe84a62ec 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
@@ -1452,7 +1452,7 @@ EOT;
         if (empty($patron) || empty($requestData) || empty($requestData['bibId'])
             || empty($type)
         ) {
-            return array('success' => false, 'status' =>"hold_error_fail");
+            return array('success' => false, 'status' => "hold_error_fail");
         }
 
         // Build request
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
index e0f86e48f8281aac53b45af47b2593037d816df8..6aea6f1989bfc5fd96b95447b8edc1cc11c37d0a 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorInfo.php
@@ -217,7 +217,7 @@ 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++) {
+        for ($i = 1;$i<count($nameParts);$i++) {
             $nameParts[$i-1] = $nameParts[$i];
         }
         $nameParts[count($nameParts)-1] = $last;
diff --git a/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php b/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php
index 8f494795e51525414a87ccf08dab47db66ae6c87..c2db4e9679094c6e5195ccf2c9517ce40a8c3620 100644
--- a/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php
+++ b/module/VuFind/src/VuFind/Recommend/AuthorityRecommend.php
@@ -162,7 +162,7 @@ class AuthorityRecommend implements RecommendInterface
         $this->results = $results;
 
         // function will return blank on Advanced Search
-        if ($results->getParams()->getSearchType()== 'advanced') {
+        if ($results->getParams()->getSearchType() == 'advanced') {
             return;
         }
 
diff --git a/module/VuFind/src/VuFind/Recommend/DPLATerms.php b/module/VuFind/src/VuFind/Recommend/DPLATerms.php
index 76d9d876f9d96af683b4f3823b7b670d65e1c3a2..334d848640eb242ab73597d8946530e0c58f4f79 100644
--- a/module/VuFind/src/VuFind/Recommend/DPLATerms.php
+++ b/module/VuFind/src/VuFind/Recommend/DPLATerms.php
@@ -195,7 +195,7 @@ class DPLATerms implements RecommendInterface
             'fields' => implode(',', $this->returnFields),
             'api_key' => $this->apiKey
         );
-        foreach ($filters as $field=>$filter) {
+        foreach ($filters as $field => $filter) {
             if (isset($this->formatMap[$field])) {
                 $params[$this->formatMap[$field]] = implode(',', $filter);
             }
diff --git a/module/VuFind/src/VuFind/RecordDriver/EDS.php b/module/VuFind/src/VuFind/RecordDriver/EDS.php
index f490e0704b152671a4693fb94ddcd9a8f73a9c4d..5d4077c899dafd0e6b625cdd2c6cce93c54629c7 100644
--- a/module/VuFind/src/VuFind/RecordDriver/EDS.php
+++ b/module/VuFind/src/VuFind/RecordDriver/EDS.php
@@ -334,7 +334,7 @@ class EDS extends SolrDefault
             foreach ($this->fields['RecordInfo']['BibRecord']['BibEntity']['Titles']
                 as $titleRecord
             ) {
-                if (isset($titleRecord['Type']) && 'main' ==$titleRecord['Type']) {
+                if (isset($titleRecord['Type']) && 'main' == $titleRecord['Type']) {
                     return $titleRecord['TitleFull'];
                 }
             }
@@ -351,7 +351,7 @@ class EDS extends SolrDefault
     {
         $authors = array();
         if (isset($this->fields['RecordInfo']['BibRecord']['BibRelationships'])) {
-            $bibRels =& $this->fields['RecordInfo']['BibRecord']['BibRelationships'];
+            $bibRels = & $this->fields['RecordInfo']['BibRecord']['BibRelationships'];
         }
         if (isset($bibRels['HasContributorRelationships'])
             && !empty($bibRels['HasContributorRelationships'])
@@ -468,7 +468,7 @@ class EDS extends SolrDefault
                 '<ulink'       => '<a',
                 '</ulink'      => '</a',
                 '<superscript' => '<sup',
-                '</superscript'=> '</sup',
+                '</superscript' => '</sup',
                 '<relatesTo'   => '<sup',
                 '</relatesTo'  => '</sup'
         );
diff --git a/module/VuFind/src/VuFind/RecordDriver/Pazpar2.php b/module/VuFind/src/VuFind/RecordDriver/Pazpar2.php
index d65d17df341c48d3a736836d632eecc73d1927cf..3c03ac8964d51e6b2deb9e350889172a3539bf2b 100644
--- a/module/VuFind/src/VuFind/RecordDriver/Pazpar2.php
+++ b/module/VuFind/src/VuFind/RecordDriver/Pazpar2.php
@@ -71,21 +71,21 @@ class Pazpar2 extends SolrDefault
     protected function xmlToArray($xml)
     {
         $array = array();
-        foreach ($xml as $key=>$data) {
+        foreach ($xml as $key => $data) {
             $children = array();
             // Attributes
             if (count($data->attributes()) > 0) {
                 $children['_attr_'] = array();
-                foreach ($data->attributes() as $name=>$attr) {
-                    $children['_attr_'][$name] =(string) $attr;
+                foreach ($data->attributes() as $name => $attr) {
+                    $children['_attr_'][$name] = (string) $attr;
                 }
             }
             // If there's no children, we're at data
             if ($data->count() == 0) {
                 if (!isset($children['_attr_'])) {
-                    $children =(string) $data; // Flatten
+                    $children = (string) $data; // Flatten
                 } else {
-                    $children[$key] =(string) $data;
+                    $children[$key] = (string) $data;
                 }
             } else {
                 // If there's children, recurse on this XML
@@ -111,8 +111,8 @@ class Pazpar2 extends SolrDefault
         // Top-level Attributes
         if (count($xml->attributes()) > 0) {
             $array['_attr_'] = array();
-            foreach ($xml->attributes() as $key=>$attr) {
-                $array['_attr_'][$key] =(string) $attr;
+            foreach ($xml->attributes() as $key => $attr) {
+                $array['_attr_'][$key] = (string) $attr;
             }
         }
         return $array;
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
index 3a9358bb9e70a50b191c29a011ada16d1fbf092f..3eece0eeeb6ba433d7b40ea93da8be647b04948a 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
@@ -959,7 +959,7 @@ class SolrMarc extends SolrDefault
                     } elseif ($split[1] == "false") {
                         $result = false;
                     } else {
-                        $result =$split[1];
+                        $result = $split[1];
                     }
                     $matches[$i][$key] = $result;
                 } else {
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php b/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php
index 192b598c1d709506450c6c7d40ed4e043b54f95c..091e1bf2f76ce2025734c5c1a1dda8c6e029e34a 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Threesixtylink.php
@@ -133,7 +133,7 @@ class Threesixtylink implements DriverInterface
                 }
                 if ($elems->length > 0) {
                     $href = $elems->item(0)->nodeValue;
-                    $record['href']= $href;
+                    $record['href'] = $href;
                     $record['service_type'] = 'getFullTxt';
                 } else {
                     $record['service_type'] = 'getHolding';
diff --git a/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php b/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php
index 6cc7e67571ba9cd3b419988f2c500ad7e4622ed4..864439e340277a587307a381a823deb3e4c3c3c3 100644
--- a/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php
+++ b/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php
@@ -95,12 +95,12 @@ class IpRange implements PermissionProviderInterface
         $inList = false;
         foreach ((array)$rangeIP as $range) {
             if (preg_match('/-/', $range)) {
-                $tmp=preg_split('/-/', $range);
-                $mylist[$count]['start']=$tmp[0];
-                $mylist[$count]['end']=$tmp[1];
+                $tmp = preg_split('/-/', $range);
+                $mylist[$count]['start'] = $tmp[0];
+                $mylist[$count]['end'] = $tmp[1];
             } else {
-                $mylist[$count]['start']=$range;
-                $mylist[$count]['end']=$range;
+                $mylist[$count]['start'] = $range;
+                $mylist[$count]['end'] = $range;
             }
             $count++;
         }
@@ -108,7 +108,7 @@ class IpRange implements PermissionProviderInterface
             if (ip2long($remoteIP) >= ip2long($check['start'])
                 && ip2long($remoteIP) <= ip2long($check['end'])
             ) {
-                $inList=true;
+                $inList = true;
             }
         }
         return $inList;
diff --git a/module/VuFind/src/VuFind/SMS/Mailer.php b/module/VuFind/src/VuFind/SMS/Mailer.php
index f060b7ec2c559d9636133262778d5ee0ca54e67d..a3289b77d9858a7d0ce91c41ac36a1be03b44c41 100644
--- a/module/VuFind/src/VuFind/SMS/Mailer.php
+++ b/module/VuFind/src/VuFind/SMS/Mailer.php
@@ -85,9 +85,9 @@ class Mailer extends AbstractBase
         // default list of US carriers.
         if (isset($config->Carriers) && count($config->Carriers) > 0) {
             $this->carriers = array();
-            foreach ($config->Carriers as $id=>$settings) {
+            foreach ($config->Carriers as $id => $settings) {
                 list($domain, $name) = explode(':', $settings, 2);
-                $this->carriers[$id] = array('name'=>$name, 'domain'=>$domain);
+                $this->carriers[$id] = array('name' => $name, 'domain' => $domain);
             }
         }
 
diff --git a/module/VuFind/src/VuFind/Search/Base/Params.php b/module/VuFind/src/VuFind/Search/Base/Params.php
index 2affc69cf13d09d964f7657b8800d13d46275720..16660a41608336f654797ae938c71463e08322c8 100644
--- a/module/VuFind/src/VuFind/Search/Base/Params.php
+++ b/module/VuFind/src/VuFind/Search/Base/Params.php
@@ -1329,7 +1329,7 @@ class Params implements ServiceLocatorAwareInterface
     protected function buildNumericRangeFilter($field, $from, $to)
     {
         // Make sure that $to is less than $from:
-        if ($to != '*' && $from!= '*' && $to < $from) {
+        if ($to != '*' && $from != '*' && $to < $from) {
             $tmp = $to;
             $to = $from;
             $from = $tmp;
@@ -1367,7 +1367,7 @@ class Params implements ServiceLocatorAwareInterface
     protected function buildFullDateRangeFilter($field, $from, $to)
     {
         // Make sure that $to is less than $from:
-        if ($to != '*' && $from!= '*' && strtotime($to) < strtotime($from)) {
+        if ($to != '*' && $from != '*' && strtotime($to) < strtotime($from)) {
             $tmp = $to;
             $to = $from;
             $from = $tmp;
diff --git a/module/VuFind/src/VuFind/Search/EDS/Options.php b/module/VuFind/src/VuFind/Search/EDS/Options.php
index 4e900dcf7b65330661bebd7d514f52e6ffe90407..d8d2544b77310dda01d42fe35303ae6c6cb1f9d4 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Options.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Options.php
@@ -129,7 +129,7 @@ class Options extends \VuFind\Search\Base\Options
         parent::__construct($configLoader);
         $this->viewOptions = array(
             'list|title' => 'Title View', 'list|brief' => 'Brief View',
-            'list|detailed'=>'Detailed View'
+            'list|detailed' => 'Detailed View'
         );
         $this->apiInfo = $apiInfo;
         $this->setOptionsFromApi($searchSettings);
@@ -462,7 +462,7 @@ class Options extends \VuFind\Search\Base\Options
             if (isset($availCriteria['AvailableSearchModes'])) {
                 foreach ($availCriteria['AvailableSearchModes'] as $mode) {
                     $this->modeOptions[$mode['Mode']] = array(
-                        'Label'=>$mode['Label'], 'Value' => $mode['Mode']
+                        'Label' => $mode['Label'], 'Value' => $mode['Mode']
                     );
                     if (isset($mode['DefaultOn'])
                         &&  'y' == $mode['DefaultOn']
@@ -489,7 +489,7 @@ class Options extends \VuFind\Search\Base\Options
             }
 
             //Limiters
-            $this->limiterOptions= array();
+            $this->limiterOptions = array();
             if (isset($availCriteria['AvailableLimiters'])) {
                 foreach ($availCriteria['AvailableLimiters'] as $limiter) {
                     $val = '';
diff --git a/module/VuFind/src/VuFind/Search/EDS/Params.php b/module/VuFind/src/VuFind/Search/EDS/Params.php
index 6983bd0480d5df17e3d62bd0edc085f3381c7c98..529befa4d3e1b9334e466cc776754b4304eb2ba7 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Params.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Params.php
@@ -111,7 +111,7 @@ class Params extends \VuFind\Search\Base\Params
             $backendParams->set('view', $view);
         }
 
-        $mode= $options->getSearchMode();
+        $mode = $options->getSearchMode();
         if (isset($mode)) {
             $backendParams->set('searchMode', $mode);
         }
@@ -213,7 +213,7 @@ class Params extends \VuFind\Search\Base\Params
         //group limiters with same id together
         $edsLimiters = array();
         foreach ($this->limiters as $limiter) {
-            if (isset($limiter) &&!empty($limiter)) {
+            if (isset($limiter) && !empty($limiter)) {
                 // split the id/value
                 list($key, $value) = explode(':', $limiter, 2);
                 $value = SearchRequestModel::escapeSpecialCharacters($value);
diff --git a/module/VuFind/src/VuFind/Search/EDS/QueryAdapter.php b/module/VuFind/src/VuFind/Search/EDS/QueryAdapter.php
index 2b5a0e32b871db867677febc57b3eb1b1c0275b4..9136957100ab0631d8d5f6b5b990fe156b979e6b 100644
--- a/module/VuFind/src/VuFind/Search/EDS/QueryAdapter.php
+++ b/module/VuFind/src/VuFind/Search/EDS/QueryAdapter.php
@@ -83,7 +83,7 @@ class QueryAdapter extends \VuFind\Search\QueryAdapter
             if ($search instanceof QueryGroup) {
                 // Process each search group. There should only be 1 with EDS queries
                 $groupQueries = $search->getQueries();
-                for ($i=0; $i < count($groupQueries); $i++) {
+                for ($i = 0; $i < count($groupQueries); $i++) {
                     $group = $groupQueries[$i];
                     if ($group instanceof Query) {
                         // Build this group individually as a basic search
diff --git a/module/VuFind/src/VuFind/Search/Pazpar2/Params.php b/module/VuFind/src/VuFind/Search/Pazpar2/Params.php
index c081c2a3a8ef7f57845251465fa0e881333bd515..8ae480e7c82bedfe2b8d0be4686aae4f68d5c783 100644
--- a/module/VuFind/src/VuFind/Search/Pazpar2/Params.php
+++ b/module/VuFind/src/VuFind/Search/Pazpar2/Params.php
@@ -52,7 +52,7 @@ class Params extends \VuFind\Search\Base\Params
         $sources = $this->getSelectedShards();
         if (!empty($sources)) {
             $allShards = $this->getOptions()->getShards();
-            foreach ($sources as $i=>$current) {
+            foreach ($sources as $i => $current) {
                 $sources[$i] = $allShards[$current];
             }
             $backendParams->set('filter', 'pz:id='.implode('|', $sources));
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/File.php b/module/VuFind/src/VuFind/Statistics/Driver/File.php
index 34e90c3c25379493f06bd26e8fcc5de74762b4eb..f1dd79ce24e13fe3398157c02d0a4a53668a97dd 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/File.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/File.php
@@ -111,7 +111,7 @@ class File extends AbstractBase
     {
         $xml = str_repeat("\t", $tab)."<doc>\n";
         $tab++;
-        foreach ($data as $tag=>$value) {
+        foreach ($data as $tag => $value) {
             $xml .= str_repeat("\t", $tab);
             $insert = (strtolower(gettype($value)) == 'boolean')
                 ? ($value)
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/Solr.php b/module/VuFind/src/VuFind/Statistics/Driver/Solr.php
index e9f6c2bc9dc71e583830545c77399e0d65f99ab6..fd9dafc012b1f5d5355898f3d5f310f9b72a26de 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/Solr.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/Solr.php
@@ -160,13 +160,13 @@ class Solr extends AbstractBase
             $start += $limit;
         } while (count($groups['session']['groups']) > 0);
         $solrBrowsers = array();
-        foreach ($hashes as $browser=>$count) {
+        foreach ($hashes as $browser => $count) {
             $newBrowser = array(
                 'browserName' => $browser,
                 '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, array($newBrowser));
diff --git a/module/VuFind/src/VuFind/Statistics/Record.php b/module/VuFind/src/VuFind/Statistics/Record.php
index cd82b6173f82c3b13ecd3d63f4c94eaa7564dda5..aea6a83f3c8c64a73c8518f0a1c31dba19c2faf3 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 = array();
                 // 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]
@@ -84,22 +84,22 @@ class Record extends AbstractBase
                 }
                 $top = array();
                 // For each source
-                foreach ($hashes as $source=>$records) {
+                foreach ($hashes as $source => $records) {
                     // Using a reference to consolidate code dramatically
-                    $reference =& $top;
+                    $reference = & $top;
                     if ($bySource) {
                         $top[$source] = array();
-                        $reference =& $top[$source];
+                        $reference = & $top[$source];
                     }
                     // For each record
-                    foreach ($records as $id=>$count) {
+                    foreach ($records as $id => $count) {
                         $newRecord = array(
                             'value'  => $id,
                             'count'  => $count,
                             '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, array($newRecord));
diff --git a/module/VuFind/src/VuFind/Statistics/Search.php b/module/VuFind/src/VuFind/Statistics/Search.php
index cb42bcfab5b9eaa7247ad6c24c1f13fe2f713bdb..bbc3eb9e29cc9f4385ee266586f398408dbe50cc 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 = array();
                 // 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 {
@@ -95,15 +95,15 @@ class Search extends AbstractBase
                 }
                 $top = array();
                 // For each source
-                foreach ($hashes as $source=>$records) {
+                foreach ($hashes as $source => $records) {
                     // Using a reference to consolidate code dramatically
-                    $reference =& $top;
+                    $reference = & $top;
                     if ($bySource) {
                         $top[$source] = array();
-                        $reference =& $top[$source];
+                        $reference = & $top[$source];
                     }
                     // For each record
-                    foreach ($records as $phrase=>$count) {
+                    foreach ($records as $phrase => $count) {
                         $value = ($phrase == '' || $phrase == '*:*')
                             ? '(empty)'
                             : $phrase;
@@ -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, array($newRecord));
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php
index 87ab95abb739f6a9a333463faeadfeaf91afbe31..4a5ee9f7a9cad21daa75067bb07a020a346d6c8d 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php
@@ -53,8 +53,8 @@ class ResultScrollerTest extends TestCase
         $results = $this->getMockResults();
         $this->assertFalse($plugin->init($results));
         $expected = array(
-            'previousRecord'=>null, 'nextRecord'=>null,
-            'currentPosition'=>null, 'resultTotal'=>null
+            'previousRecord' => null, 'nextRecord' => null,
+            'currentPosition' => null, 'resultTotal' => null
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(1)));
     }
@@ -70,8 +70,8 @@ class ResultScrollerTest extends TestCase
         $plugin = $this->getMockResultScroller($results);
         $this->assertTrue($plugin->init($results));
         $expected = array(
-            'previousRecord'=>'VuFind|4', 'nextRecord'=>'VuFind|6',
-            'currentPosition'=>5, 'resultTotal'=>10
+            'previousRecord' => 'VuFind|4', 'nextRecord' => 'VuFind|6',
+            'currentPosition' => 5, 'resultTotal' => 10
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(5)));
     }
@@ -87,8 +87,8 @@ class ResultScrollerTest extends TestCase
         $plugin = $this->getMockResultScroller($results);
         $this->assertTrue($plugin->init($results));
         $expected = array(
-            'previousRecord'=>null, 'nextRecord'=>'VuFind|2',
-            'currentPosition'=>1, 'resultTotal'=>10
+            'previousRecord' => null, 'nextRecord' => 'VuFind|2',
+            'currentPosition' => 1, 'resultTotal' => 10
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(1)));
     }
@@ -104,8 +104,8 @@ class ResultScrollerTest extends TestCase
         $plugin = $this->getMockResultScroller($results);
         $this->assertTrue($plugin->init($results));
         $expected = array(
-            'previousRecord'=>'VuFind|9', 'nextRecord'=>null,
-            'currentPosition'=>10, 'resultTotal'=>10
+            'previousRecord' => 'VuFind|9', 'nextRecord' => null,
+            'currentPosition' => 10, 'resultTotal' => 10
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(10)));
     }
@@ -121,8 +121,8 @@ class ResultScrollerTest extends TestCase
         $plugin = $this->getMockResultScroller($results);
         $this->assertTrue($plugin->init($results));
         $expected = array(
-            'previousRecord'=>'VuFind|16', 'nextRecord'=>null,
-            'currentPosition'=>17, 'resultTotal'=>17
+            'previousRecord' => 'VuFind|16', 'nextRecord' => null,
+            'currentPosition' => 17, 'resultTotal' => 17
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(17)));
     }
@@ -138,8 +138,8 @@ class ResultScrollerTest extends TestCase
         $plugin = $this->getMockResultScroller($results);
         $this->assertTrue($plugin->init($results));
         $expected = array(
-            'previousRecord'=>'VuFind|10', 'nextRecord'=>'VuFind|12',
-            'currentPosition'=>11, 'resultTotal'=>30
+            'previousRecord' => 'VuFind|10', 'nextRecord' => 'VuFind|12',
+            'currentPosition' => 11, 'resultTotal' => 30
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(11)));
     }
@@ -155,8 +155,8 @@ class ResultScrollerTest extends TestCase
         $plugin = $this->getMockResultScroller($results);
         $this->assertTrue($plugin->init($results));
         $expected = array(
-            'previousRecord'=>'VuFind|19', 'nextRecord'=>'VuFind|21',
-            'currentPosition'=>20, 'resultTotal'=>30
+            'previousRecord' => 'VuFind|19', 'nextRecord' => 'VuFind|21',
+            'currentPosition' => 20, 'resultTotal' => 30
         );
         $this->assertEquals($expected, $plugin->getScrollData($results->getMockRecordDriver(20)));
     }
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 b25f3580195e84f947d158379523ac0ee5f2f301..fe8ca9ea33a5ef770cc720dc47aca6995f3fe35c 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
@@ -114,7 +114,7 @@ class MultiBackendTest extends \VuFindTest\Unit\TestCase
     {
         $driver = $this->getDriver();
 
-        $drivers = array('d1' => 'Voyager', 'd2'=> 'Demo');
+        $drivers = array('d1' => 'Voyager', 'd2' => 'Demo');
         $this->setProperty($driver, 'drivers', $drivers);
 
         $result = $this->callMethod($driver, 'getSourceFromParams', array(''));
diff --git a/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php b/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php
index 9cd4e1ebb70d6d4f2abee8081861c122da0a9a60..1e0c59c54d6a7a244d91feef1a70ea01cddfedf0 100644
--- a/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php
+++ b/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php
@@ -222,7 +222,7 @@ class TagsController extends AbstractAdmin
             'msg' => 'tag_delete_warning',
             'tokens' => array('%count%' => $count)
         );
-        if (false !== $user || false!== $tag || false !== $resource) {
+        if (false !== $user || false !== $tag || false !== $resource) {
             $messages[] = array(
                 'msg' => 'tag_delete_filter',
                 'tokens' => array(
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
index 81910efa6ebc63424bc5e2db83a829e6625989ec..bcd06a4e43b6792107b758016b35debbb454c486 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
@@ -308,7 +308,7 @@ class Backend extends AbstractBackend
                 throw $e;
             }
         }
-        $collection = $this->createRecordCollection(array('Records'=> $response));
+        $collection = $this->createRecordCollection(array('Records' => $response));
         $this->injectSourceIdentifier($collection);
         return $collection;
     }
@@ -322,7 +322,7 @@ class Backend extends AbstractBackend
      */
     protected function paramBagToEBSCOSearchModel(ParamBag $params)
     {
-        $params= $params->getArrayCopy();
+        $params = $params->getArrayCopy();
         $options = array();
         // Most parameters need to be flattened from array format, but a few
         // should remain as arrays:
@@ -529,7 +529,7 @@ class Backend extends AbstractBackend
      *
      * @return string
      */
-    public function createSession($isGuest, $profile='')
+    public function createSession($isGuest, $profile = '')
     {
         try {
             $authToken = $this->getAuthenticationToken();
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
index 9669f3c002b964cceb2ded6358856bb1a62f272d..846a4a8ee074ca41ad7399b63d24dae69bafb6e1 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/QueryBuilder.php
@@ -105,7 +105,7 @@ class QueryBuilder
     protected function abstractQueryToArray(AbstractQuery $query)
     {
         if ($query instanceof Query) {
-            return array('1'=>$this->queryToEdsQuery($query));
+            return array('1' => $this->queryToEdsQuery($query));
         } else {
             return $this->queryGroupToArray($query);
         }
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php
index 5778aba51468e00490f466ec2cd28bef8efaac2b..3ef2d1d1106847b3901aa5f30ac5e15c36b95677 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/SearchRequestModel.php
@@ -260,7 +260,7 @@ class SearchRequestModel
         }
 
         $highlightVal = isset($this->highlight) && $this->highlight ? 'y' : 'n';
-        $qs['highlight']= $highlightVal;
+        $qs['highlight'] = $highlightVal;
 
         return $qs;
     }
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php
index 88a6f760e7119c04b6325e13b51a998142b5001b..b0a34530d77fd4df58ea71c057e8934664a53f7e 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php
@@ -95,7 +95,7 @@ class Zend2 extends EdsApi_REST_Base implements LoggerAwareInterface
     {
         parent::__construct($settings);
         $this->client = is_object($client) ? $client : new Zend2HttpClient();
-        $this->client->setOptions(array('timeout'=>120));
+        $this->client->setOptions(array('timeout' => 120));
         $adapter = new CurlAdapter();
         $adapter->setOptions(
             array(
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Connector.php
index 515d88e168289b49b1eb0a68f9771d698ab8b4b4..f5f4344654df9f54b8f999883646415f16e610c1 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Connector.php
@@ -201,7 +201,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
      */
     public function record($id)
     {
-        return $this->query('record', new ParamBag(array('id'=>$id)));
+        return $this->query('record', new ParamBag(array('id' => $id)));
     }
 
     /**
@@ -308,6 +308,6 @@ class Connector implements \Zend\Log\LoggerAwareInterface
      */
     public function bytarget($id)
     {
-        return $this->query('bytarget', new ParamBag(array('id'=>$id)));
+        return $this->query('bytarget', new ParamBag(array('id' => $id)));
     }
 }
\ No newline at end of file
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php
index f10824b56953b0d8dca2ba638d58322221e3aa09..eb4f9396a8afc53eeb0d45925a38a1fafeaaa057 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php
@@ -125,7 +125,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
      * @return array             An array of query results
      * @link http://www.exlibrisgroup.org/display/PrimoOI/Brief+Search
      */
-    public function query($institution, $terms, $params=null)
+    public function query($institution, $terms, $params = null)
     {
         // defaults for params
         $args = array(
@@ -255,7 +255,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
             // have a query to send to primo or it hates us
 
             // QUERYSTRING: institution
-            $qs[] ="institution=$institution";
+            $qs[] = "institution=$institution";
 
             // QUERYSTRING: onCampus
             if ($args["onCampus"]) {
@@ -268,7 +268,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
             if ($args["didYouMean"]) {
                 $qs[] = "dym=true";
             } else {
-                $qs[] ="dym=false";
+                $qs[] = "dym=false";
             }
 
             // QUERYSTRING: query (filter list)
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/NamedListTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/NamedListTest.php
index 26dd4278a33dafdf4f91123caed521bf4490388d..89a365c4bd68c4931aea18ef934aed6fbb793b10 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/NamedListTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/NamedListTest.php
@@ -53,7 +53,7 @@ class NamedListTest extends TestCase
         $list = new NamedList(array(array('first term', 'info'), array('second term', 'info')));
         $keys = array();
         foreach ($list as $key => $value) {
-            $keys []= $key;
+            $keys [] = $key;
         }
         $this->assertEquals(array('first term', 'second term'), $keys);
     }
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
index cb4bcdb55490f36fe3c766e13a8ed8fc72493a46..051442a18210bd7aa06bd0e286887b0b1d74f270 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
@@ -340,7 +340,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')));
diff --git a/module/VuFindTheme/src/VuFindTheme/Initializer.php b/module/VuFindTheme/src/VuFindTheme/Initializer.php
index 94058e1d5587374a56ee6d08bb4a1435421e97a7..53440dd3c7e28022f57799015f87874eddc617c7 100644
--- a/module/VuFindTheme/src/VuFindTheme/Initializer.php
+++ b/module/VuFindTheme/src/VuFindTheme/Initializer.php
@@ -329,14 +329,14 @@ class Initializer
 
         $lessActive = false;
         // Find LESS activity
-        foreach ($themes as $key=>$currentThemeInfo) {
+        foreach ($themes as $key => $currentThemeInfo) {
             if (isset($currentThemeInfo['less']['active'])) {
                 $lessActive = $currentThemeInfo['less']['active'];
             }
         }
 
         // Apply the loaded theme settings in reverse for proper inheritance:
-        foreach ($themes as $key=>$currentThemeInfo) {
+        foreach ($themes as $key => $currentThemeInfo) {
             if (isset($currentThemeInfo['helpers'])) {
                 $this->setUpThemeViewHelpers($currentThemeInfo['helpers']);
             }
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeResourceContainerTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeResourceContainerTest.php
index 1d7f7a3b68eb99c837d45c08526dc5ba82261b4e..e2b6373393d21a1dfcd3ebf7b2e47527e3d57395 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeResourceContainerTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeResourceContainerTest.php
@@ -64,7 +64,7 @@ class ThemeResourceContainerTest extends Unit\TestCase
     {
         $container = new ResourceContainer();
         $container->addCss(array('c', 'd.css'));
-        $container->addLessCss(array('active'=>true, 'a', 'b', 'c'));
+        $container->addLessCss(array('active' => true, 'a', 'b', 'c'));
         $container->addLessCss('c');
         $container->addLessCss('d');
         $this->assertEquals(array(), array_diff(array('a', 'b', 'c', 'd'), $container->getLessCss()));