diff --git a/module/VuDL/src/VuDL/Factory.php b/module/VuDL/src/VuDL/Factory.php
index 33b4ea110765cafbbc8e343143924c9c5b01ece3..1505cc6545dc2fcff42c5f295d86680ecc4a8317 100644
--- a/module/VuDL/src/VuDL/Factory.php
+++ b/module/VuDL/src/VuDL/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Auth/Factory.php b/module/VuFind/src/VuFind/Auth/Factory.php
index a26ca28428ae6bd936908f50dc1f1810fe779dfe..9358d3157b6ca3c1d3bcb9db4135a36f938613a5 100644
--- a/module/VuFind/src/VuFind/Auth/Factory.php
+++ b/module/VuFind/src/VuFind/Auth/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Autocomplete/Factory.php b/module/VuFind/src/VuFind/Autocomplete/Factory.php
index 8d3de323584382681470e561e7fd966e05e76249..8df4b6ae8e9eb9b658313ed7ffe404333f256232 100644
--- a/module/VuFind/src/VuFind/Autocomplete/Factory.php
+++ b/module/VuFind/src/VuFind/Autocomplete/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Content/AuthorNotes/Factory.php b/module/VuFind/src/VuFind/Content/AuthorNotes/Factory.php
index 236ae8ff060fa0707c52364ce687675334591cf0..90aeff0b0729d436176438986fa401071f0155c2 100644
--- a/module/VuFind/src/VuFind/Content/AuthorNotes/Factory.php
+++ b/module/VuFind/src/VuFind/Content/AuthorNotes/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Content/Covers/Factory.php b/module/VuFind/src/VuFind/Content/Covers/Factory.php
index 1ca954db4a1c0ae7046580797367d198652f888a..2c228883bf634f2ce1830b4ea970c4fd1744d9ab 100644
--- a/module/VuFind/src/VuFind/Content/Covers/Factory.php
+++ b/module/VuFind/src/VuFind/Content/Covers/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Content/Excerpts/Factory.php b/module/VuFind/src/VuFind/Content/Excerpts/Factory.php
index a9c41df368e1b63b978aaaea9dfcdbfd459ce26f..cd7b57e470932f1e128d7846ff105b2325b7d08c 100644
--- a/module/VuFind/src/VuFind/Content/Excerpts/Factory.php
+++ b/module/VuFind/src/VuFind/Content/Excerpts/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Content/Factory.php b/module/VuFind/src/VuFind/Content/Factory.php
index 48876ca7f599728b3124c45c82af8ec314c670ad..779d3c8a0b5782ead82e34e0e4aa69506805bdae 100644
--- a/module/VuFind/src/VuFind/Content/Factory.php
+++ b/module/VuFind/src/VuFind/Content/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Content/Reviews/Factory.php b/module/VuFind/src/VuFind/Content/Reviews/Factory.php
index a59c71045c99a1d6d6cca0c57f2277f1abbd27a2..420b6c952a4c13067bbc205768d31a378e740ce4 100644
--- a/module/VuFind/src/VuFind/Content/Reviews/Factory.php
+++ b/module/VuFind/src/VuFind/Content/Reviews/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Controller/Factory.php b/module/VuFind/src/VuFind/Controller/Factory.php
index 0cf4bbc41b530da479eae35c94bcbf4990c3a5f3..79163b4087d096557b2f9302205fa9ef9f7b043e 100644
--- a/module/VuFind/src/VuFind/Controller/Factory.php
+++ b/module/VuFind/src/VuFind/Controller/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/Factory.php b/module/VuFind/src/VuFind/Controller/Plugin/Factory.php
index 376573e89f9b935be17aaccba7cd83cf372a8dae..5edc80608130f737f032ac15d25ba5716bf5ef63 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/Factory.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Db/Table/Factory.php b/module/VuFind/src/VuFind/Db/Table/Factory.php
index 5497763a6ca5d0165e0c382a29d93d9dbc7bd679..2cddfa4e2d1cf82f8d5fcd7c9b44a67d3f54730f 100644
--- a/module/VuFind/src/VuFind/Db/Table/Factory.php
+++ b/module/VuFind/src/VuFind/Db/Table/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php b/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php
index bc7b29f78b12564d1c00d483014f836b44194d40..b87ff024399637e9c3f22799bcc81f7f2e3e54d5 100644
--- a/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/Driver/Factory.php
@@ -38,6 +38,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Factory.php b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Factory.php
index 234ea10388a958d87f5b8f9e9968cf4cba9d5d9c..5786514afeb7bbb99ce4664d84fd8c7eb84b6e3b 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Factory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Factory.php
@@ -38,6 +38,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/Factory.php b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/Factory.php
index 99dbf6205a693683fa3d61b4186b2a12fcf7db14..25b5511a3c9aded96b4d069e7ed9371ac2b536e4 100644
--- a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/Factory.php
+++ b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/Factory.php
@@ -38,6 +38,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
index cd758064b5652f34fb4e9cd228f3dc32c182c2ee..3b89e607205d71160cdc73b839fcb29ceb111b91 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
@@ -163,10 +163,10 @@ class AlephTranslator
     }
 
     /**
-     * tab15 callback (modify $tab15 by reference)
+     * Callback for tab15 (modify $tab15 by reference)
      *
      * @param array  $matches preg_match() return array
-     * @param array  &$tab15  result array to generate
+     * @param array  $tab15   result array to generate
      * @param string $charset character set
      *
      * @return void
@@ -191,10 +191,10 @@ class AlephTranslator
     }
 
     /**
-     * tab40 callback (modify $tab40 by reference)
+     * Callback for tab40 (modify $tab40 by reference)
      *
      * @param array  $matches preg_match() return array
-     * @param array  &$tab40  result array to generate
+     * @param array  $tab40   result array to generate
      * @param string $charset character set
      *
      * @return void
@@ -210,11 +210,11 @@ class AlephTranslator
     }
 
     /**
-     * sub-library callback (modify $tab_sub_library by reference)
+     * Sub-library callback (modify $tab_sub_library by reference)
      *
-     * @param array  $matches          preg_match() return array
-     * @param array  &$tab_sub_library result array to generate
-     * @param string $charset          character set
+     * @param array  $matches         preg_match() return array
+     * @param array  $tab_sub_library result array to generate
+     * @param string $charset         character set
      *
      * @return void
      */
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Factory.php b/module/VuFind/src/VuFind/ILS/Driver/Factory.php
index 325f1ec2c3377e4ae7b026eb65195c42c2b0e85c..78b83c70376144b5455b5a5ad37b62baae9eb556 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Factory.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
index bd11517119ad4c4db06947479b5e9dfdc7b9aed7..6f4f06fa74c62debae912b930de94aa63b43cb47 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Horizon.php
@@ -128,7 +128,6 @@ class Horizon extends AbstractBase
      * @param string $status Item status code
      *
      * @return array
-     *
      */
     protected function parseStatus($status)
     {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
index 19c40b630f7776a972535d88a2d400865b98899d..51ce40a441918ba52fcd67a0882eda83fdd1f7a3 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/HorizonXMLAPI.php
@@ -548,23 +548,23 @@ class HorizonXMLAPI extends Horizon implements \VuFindHttp\HttpServiceAwareInter
         $initResponse = $this->makeRequest($params);
 
         if ($initResponse->request_confirm) {
-
-              $confirmParams =  array("session" => $session,
-                        "profile" => $this->wsProfile,
-                        "bibkey" => $requestDetails['bibId'],
-                        "aspect" => "advanced",
-                        "lang" => "eng",
-                        "menu" => "request",
-                        "submenu" => "none",
-                        "source" => "~!horizon",
-                        "uri" => "",
-                        "link" => "direct",
-                        "request_finish" => "Request",
-                        "cl" => "PlaceRequestjsp",
-                        "pickuplocation" => $requestDetails['pickuplocation'],
-                        "notifyby" => $requestDetails['notify'],
-                        "GetXML" => "true"
-                        );
+            $confirmParams =  array(
+                "session" => $session,
+                "profile" => $this->wsProfile,
+                "bibkey" => $requestDetails['bibId'],
+                "aspect" => "advanced",
+                "lang" => "eng",
+                "menu" => "request",
+                "submenu" => "none",
+                "source" => "~!horizon",
+                "uri" => "",
+                "link" => "direct",
+                "request_finish" => "Request",
+                "cl" => "PlaceRequestjsp",
+                "pickuplocation" => $requestDetails['pickuplocation'],
+                "notifyby" => $requestDetails['notify'],
+                "GetXML" => "true"
+            );
 
             $request = $this->makeRequest($confirmParams);
 
diff --git a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
index b5fbbc271343a9d251292a4947b88d7e94beaf28..28e70d2e215cf62c5471c8f87240a7aa60fbc030 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
@@ -189,7 +189,6 @@ class LBS4 extends AbstractBase implements TranslatorAwareInterface
      * @param string $status status as retrieved from db
      *
      * @return string the message to be displayed
-     *
      */
     protected function getStatusText($indi, $status)
     {
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PICA.php b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
index 90b73b3e110d1c6795d406fde32b437e8e08f0c7..ecd871e98cbc90792d1c6d2129e28c1b9553ac0b 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PICA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PICA.php
@@ -346,7 +346,7 @@ class PICA extends DAIA
     }
 
     /**
-     * get the number of renewals
+     * Get the number of renewals
      *
      * @param string $barcode Barcode of the medium
      *
@@ -619,7 +619,7 @@ class PICA extends DAIA
     // protected functions to connect to PICA
 
     /**
-     * post something to a foreign host
+     * Post something to a foreign host
      *
      * @param string $file         POST target URL
      * @param string $data_to_send POST data
@@ -660,7 +660,7 @@ class PICA extends DAIA
     }
 
     /**
-     * gets a PPN by its barcode
+     * Gets a PPN by its barcode
      *
      * @param string $barcode Barcode to use for lookup
      *
@@ -684,7 +684,7 @@ class PICA extends DAIA
     }
 
     /**
-     * gets holdings of magazine and journal exemplars
+     * Gets holdings of magazine and journal exemplars
      *
      * @param string $ppn PPN identifier
      *
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Polaris.php b/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
index b3d4a054faecb9143918f17871ff697abb261e9d..2a64497f0cda98425cd8d942e12932dacc87d877 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Polaris.php
@@ -164,7 +164,7 @@ class Polaris extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
     }
 
     /**
-     * return human-readable date from text like Date(1360051200000-0800)
+     * Return human-readable date from text like Date(1360051200000-0800)
      *
      * @param string $jsontime Input
      *
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Sierra.php b/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
index 2ee624ccb66066932b4a35fba7c4c1ac076f05ac..f197fd9d48928c191bd065d9752329be406b0494 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Sierra.php
@@ -38,7 +38,6 @@ use VuFind\Exception\ILS as ILSException;
  * @author   Julia Bauder <bauderj@grinnell.edu>
  * @license  http://opensource.org/licenses/GPL-3.0 GNU General Public License
  * @link     http://vufind.org/wiki/building_an_ils_driver Wiki
- *
  */
 class Sierra extends AbstractBase
 {
diff --git a/module/VuFind/src/VuFind/Mailer/Factory.php b/module/VuFind/src/VuFind/Mailer/Factory.php
index 83afbc254c8d265eec120f8c27b0c5a814a05d4b..97cbbf8d34d96e59a3ea91660f931c99d46f1187 100644
--- a/module/VuFind/src/VuFind/Mailer/Factory.php
+++ b/module/VuFind/src/VuFind/Mailer/Factory.php
@@ -37,6 +37,7 @@ use Zend\ServiceManager\ServiceLocatorInterface;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory implements \Zend\ServiceManager\FactoryInterface
diff --git a/module/VuFind/src/VuFind/Recommend/Factory.php b/module/VuFind/src/VuFind/Recommend/Factory.php
index e57b6aac84792608b73e595c1538267088dba86c..3d1eac471aac06f5662544603ef22f842f11facb 100644
--- a/module/VuFind/src/VuFind/Recommend/Factory.php
+++ b/module/VuFind/src/VuFind/Recommend/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/RecordDriver/Factory.php b/module/VuFind/src/VuFind/RecordDriver/Factory.php
index 5cb0e78f792a4b9cd0f26ca3b655e22e7d14c961..f788c9aa6cacebb37e629b7eaa64735bcb55e973 100644
--- a/module/VuFind/src/VuFind/RecordDriver/Factory.php
+++ b/module/VuFind/src/VuFind/RecordDriver/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/RecordTab/Factory.php b/module/VuFind/src/VuFind/RecordTab/Factory.php
index 56fdc2b9fc2141497933a2ebfce5a32aa3be4d09..05176450b4c39ff8b350dd71c6e3af71f1e4f7c1 100644
--- a/module/VuFind/src/VuFind/RecordTab/Factory.php
+++ b/module/VuFind/src/VuFind/RecordTab/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Related/Factory.php b/module/VuFind/src/VuFind/Related/Factory.php
index f8af30e36ec273ac5b7056a1b1a28bdbed14ae90..756d2d3355f35444e6374bd18a7486ccb7a87413 100644
--- a/module/VuFind/src/VuFind/Related/Factory.php
+++ b/module/VuFind/src/VuFind/Related/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Factory.php b/module/VuFind/src/VuFind/Resolver/Driver/Factory.php
index ede51b3e204cfec7cfb155ba8e984212d1034ddb..8441cb4ad59764a7ab5fc3b6d853d9d092352623 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/Factory.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Role/PermissionProvider/Factory.php b/module/VuFind/src/VuFind/Role/PermissionProvider/Factory.php
index 87a1af81e60650f4b0df3d949f25dc3a441034a1..463820ae950ee89ca21cdbd799a57ef181b509a7 100644
--- a/module/VuFind/src/VuFind/Role/PermissionProvider/Factory.php
+++ b/module/VuFind/src/VuFind/Role/PermissionProvider/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/SMS/Factory.php b/module/VuFind/src/VuFind/SMS/Factory.php
index 4c1bc67e17b87859390af22b6c2cbf53b846da6d..14ca9e400b44b5b927c03554738e4f1733600d42 100644
--- a/module/VuFind/src/VuFind/SMS/Factory.php
+++ b/module/VuFind/src/VuFind/SMS/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceLocatorInterface;
  * @author   Ronan McHugh <vufind-tech@lists.sourceforge.net>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory implements \Zend\ServiceManager\FactoryInterface
diff --git a/module/VuFind/src/VuFind/Search/Options/Factory.php b/module/VuFind/src/VuFind/Search/Options/Factory.php
index f94ab30cf0dcd2c630e8aed2295a67cf952d6121..289729add7717112fc4df3ea9ad32a11c3ded470 100644
--- a/module/VuFind/src/VuFind/Search/Options/Factory.php
+++ b/module/VuFind/src/VuFind/Search/Options/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Search/Results/Factory.php b/module/VuFind/src/VuFind/Search/Results/Factory.php
index f2b0ef68220eadd9a9931db17b719f1bac210b07..d97123075bd030017126ff994683a935d402a38e 100644
--- a/module/VuFind/src/VuFind/Search/Results/Factory.php
+++ b/module/VuFind/src/VuFind/Search/Results/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php
index 72ca05e285ec9ce7fb219d07fe143601ab131bea..be0ff7ce4342c5f39d0b23556ee3fb49cad4ca5e 100644
--- a/module/VuFind/src/VuFind/Service/Factory.php
+++ b/module/VuFind/src/VuFind/Service/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/Factory.php b/module/VuFind/src/VuFind/Statistics/Driver/Factory.php
index 7ca7c5f145b3344c6b0e19ecf1795b2efe118e22..be597a307a2de840c2dcdc1c8ec095f761e903e0 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/Factory.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/View/Helper/Blueprint/Factory.php b/module/VuFind/src/VuFind/View/Helper/Blueprint/Factory.php
index bf17596eafec9a4dd0305ea533d56bef4403d39f..27ef1985263a8ebb93cf0e7b22100bbb465234f8 100644
--- a/module/VuFind/src/VuFind/View/Helper/Blueprint/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Blueprint/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/View/Helper/Bootprint/Factory.php b/module/VuFind/src/VuFind/View/Helper/Bootprint/Factory.php
index 519e636144b65fb782614c7fca28e583f9b559f1..6a84eeb1ced50e06a27ec5fe20237dbd59d34c90 100644
--- a/module/VuFind/src/VuFind/View/Helper/Bootprint/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Bootprint/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php b/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php
index 828c42d9bf2d3e4207b90c7e14689ba4d5841403..cc3871317778d1da72250ed1feaccaada2920bed 100644
--- a/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Bootstrap3/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Factory.php b/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
index 88cf9d1dbe023eb7bc7d0e66b9cf06fedc1e5c6c..fd3cef08bc1db7b894819edd73ad7ed87c532c69 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/Factory.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/Factory.php
index bf39b62bdcad2a08f49a6b1aca4813f05d7f3997..297b73a2f6617e282bb0406e27ab3ebbb19b6fca 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/Factory.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/Factory.php
@@ -36,6 +36,7 @@ use Zend\ServiceManager\ServiceManager;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:developer_manual Wiki
+ *
  * @codeCoverageIgnore
  */
 class Factory