diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index e39d27a8de70f74c3ff7297f0471fdb9a33f66bb..cca8b9a7783a2cf4a668ceca5073c90ef5b389a5 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -589,7 +589,7 @@ $config = array(
                 'defaultTab' => null,
             ),
             'VuFind\RecordDriver\Pazpar2' => array(
-                'tabs' => array (
+                'tabs' => array(
                     'Details' => 'StaffViewMARC',
                  ),
                 'defaultTab' => null,
@@ -605,13 +605,13 @@ $config = array(
                 'defaultTab' => null,
             ),
             'VuFind\RecordDriver\SolrAuth' => array(
-                'tabs' => array (
+                'tabs' => array(
                     'Details' => 'StaffViewMARC',
                  ),
                 'defaultTab' => null,
             ),
             'VuFind\RecordDriver\SolrDefault' => array(
-                'tabs' => array (
+                'tabs' => array(
                     'Holdings' => 'HoldingsILS', 'Description' => 'Description',
                     'TOC' => 'TOC', 'UserComments' => 'UserComments',
                     'Reviews' => 'Reviews', 'Excerpt' => 'Excerpt',
@@ -645,7 +645,7 @@ $config = array(
                 'defaultTab' => null,
             ),
             'VuFind\RecordDriver\WorldCat' => array(
-                'tabs' => array (
+                'tabs' => array(
                     'Holdings' => 'HoldingsWorldCat', 'Description' => 'Description',
                     'TOC' => 'TOC', 'UserComments' => 'UserComments',
                     'Reviews' => 'Reviews', 'Excerpt' => 'Excerpt',
diff --git a/module/VuFind/src/VuFind/Auth/CAS.php b/module/VuFind/src/VuFind/Auth/CAS.php
index af48f230a6093345019d9e414f1045d94969e722..6a83695866f9ba90c54dc1313cd8403335551fec 100644
--- a/module/VuFind/src/VuFind/Auth/CAS.php
+++ b/module/VuFind/src/VuFind/Auth/CAS.php
@@ -152,7 +152,7 @@ class CAS extends AbstractBase
         }
 
         // Save credentials if applicable:
-        if (!empty ($catPassword) && !empty($user->cat_username)) {
+        if (!empty($catPassword) && !empty($user->cat_username)) {
             $user->saveCredentials($user->cat_username, $catPassword);
         }
 
diff --git a/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php b/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php
index ae435dd87bdc68bfe015649a0eede19860d092ad..d7e5e1f70213ed729128a21b1c4ed185a71e3a89 100644
--- a/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php
+++ b/module/VuFind/src/VuFind/Config/Reader/CacheDecorator.php
@@ -66,7 +66,7 @@ class CacheDecorator implements ReaderInterface
      *
      * @return void
      */
-    public function __construct (ReaderInterface $reader, StorageInterface $storage)
+    public function __construct(ReaderInterface $reader, StorageInterface $storage)
     {
         $this->reader  = $reader;
         $this->storage = $storage;
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
index 302f1f216878f4e43d0807c5a07f3546c534fc71..e3e65bc00b87fbed9a8f0aab28f99201576203de 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
@@ -955,7 +955,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
                 && (empty($courseId) || $courseId == $course_id)
                 && (empty($departmentId) || $departmentId == $dept_id)
             ) {
-                $items[] = array (
+                $items[] = array(
                     'BIB_ID' => $bib_id,
                     'INSTRUCTOR_ID' => $instructor_id,
                     'COURSE_ID' => $course_id,
@@ -1000,7 +1000,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         $rescount = 0;
         foreach ($item_lines as $item) {
             $item = rtrim($item, '|');
-            $items[$item] = array (
+            $items[$item] = array(
                 'id' => $item
             );
             $rescount++;
@@ -1083,7 +1083,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
             $status= $this->config['UnavailableLocations'][$currLocCode];
         }
 
-        $item = array (
+        $item = array(
             'status' => $status,
             'availability' => $availability,
             'id' => $catkey,
diff --git a/module/VuFind/src/VuFind/Mailer/Factory.php b/module/VuFind/src/VuFind/Mailer/Factory.php
index 3c792e596ce85e0d67bc4f98dd3954787c9a4821..83afbc254c8d265eec120f8c27b0c5a814a05d4b 100644
--- a/module/VuFind/src/VuFind/Mailer/Factory.php
+++ b/module/VuFind/src/VuFind/Mailer/Factory.php
@@ -54,7 +54,7 @@ class Factory implements \Zend\ServiceManager\FactoryInterface
         $config = $sm->get('VuFind\Config')->get('config');
 
         // Create mail transport:
-        $settings = array (
+        $settings = array(
             'host' => $config->Mail->host, 'port' => $config->Mail->port
         );
         if (isset($config->Mail->username) && isset($config->Mail->password)) {
diff --git a/module/VuFind/src/VuFind/Recommend/Factory.php b/module/VuFind/src/VuFind/Recommend/Factory.php
index 9fb465cc6a92522e8b25e5f5d1a8e26e3920ff40..e57b6aac84792608b73e595c1538267088dba86c 100644
--- a/module/VuFind/src/VuFind/Recommend/Factory.php
+++ b/module/VuFind/src/VuFind/Recommend/Factory.php
@@ -67,7 +67,7 @@ class Factory
         return new AuthorInfo(
             $sm->getServiceLocator()->get('VuFind\SearchResultsPluginManager'),
             $sm->getServiceLocator()->get('VuFind\Http')->createClient(),
-            isset ($config->Content->authors) ? $config->Content->authors : ''
+            isset($config->Content->authors) ? $config->Content->authors : ''
         );
     }
 
diff --git a/module/VuFind/src/VuFind/Search/EDS/Params.php b/module/VuFind/src/VuFind/Search/EDS/Params.php
index b627c9de7d4e146c89eacfcd28fe23eb68c0abb8..6983bd0480d5df17e3d62bd0edc085f3381c7c98 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Params.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Params.php
@@ -215,7 +215,7 @@ class Params extends \VuFind\Search\Base\Params
         foreach ($this->limiters as $limiter) {
             if (isset($limiter) &&!empty($limiter)) {
                 // split the id/value
-                list ($key, $value) = explode(':', $limiter, 2);
+                list($key, $value) = explode(':', $limiter, 2);
                 $value = SearchRequestModel::escapeSpecialCharacters($value);
                 $edsLimiters[$key] = (!isset($edsLimiters[$key]))
                      ? $value : $edsLimiters[$key].','.$value;
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php
index f5f0d2e83b028d36029cfe87b61aa0df833bc146..6726ecea62d3c978894c7f9cd4ab9d27fbfc2265 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php
@@ -108,7 +108,7 @@ class ExportTest extends \PHPUnit_Framework_TestCase
             "<?xml version=\"1.0\"?>\n"
             . '<collection xmlns="http://www.loc.gov/MARC21/slim">'
             . '<record><id>a</id></record><record><id>b</id></record></collection>',
-            trim (
+            trim(
                 $this->getExport(array(), $config)->processGroup(
                     'foo',
                     array($this->getFakeMARCXML('a'), $this->getFakeMARCXML('b'))
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php
index dbb55cdea330a8c42244652845f31933adda77b0..6eb8d64109970ade163c38c6939f6db9aaa5ebaf 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php
@@ -86,7 +86,7 @@ class BackendManagerTest extends TestCase
      *
      * @return void
      */
-    public function testAttachDetachShared ()
+    public function testAttachDetachShared()
     {
         $registry = $this->getMockForAbstractClass('Zend\ServiceManager\ServiceLocatorInterface');
         $events   = new SharedEventManager();
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php
index 9598bd1f1f66f628cd5e6877fcae0762923850ec..9797ab7e618e51c1c6b3ea34669909960db8bf4e 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php
@@ -320,7 +320,7 @@ class CitationTest extends \VuFindTest\Unit\ViewHelperTestCase
      *
      * @return void
      */
-    protected function setup ()
+    protected function setup()
     {
         parent::setup();
         if (!ini_get('short_open_tag')) {