Fixed config syntax to allow better overriding.

module/VuDL/config/module.config.php

@@ -9,16 +9,16 @@ $config = array(
     ),
     'service_manager' => array(
         'factories' => array(
-            'VuDL\Connection\Manager' => array('VuDL\Factory', 'getConnectionManager'),
-            'VuDL\Connection\Fedora' => array('VuDL\Factory', 'getConnectionFedora'),
-            'VuDL\Connection\Solr' => array('VuDL\Factory', 'getConnectionSolr'),
+            'VuDL\Connection\Manager' => 'VuDL\Factory::getConnectionManager',
+            'VuDL\Connection\Fedora' => 'VuDL\Factory::getConnectionFedora',
+            'VuDL\Connection\Solr' => 'VuDL\Factory::getConnectionSolr',
         ),
     ),
     'vufind' => array(
         'plugin_managers' => array(
             'recorddriver' => array(
                 'factories' => array(
-                    'solrvudl' => array('VuDL\Factory', 'getRecordDriver'),
+                    'solrvudl' => 'VuDL\Factory::getRecordDriver',
                 ),
             ),
         ),

module/VuFindTheme/Module.php

@@ -63,8 +63,7 @@ class Module
     {
         return array(
             'factories' => array(
-                'VuFindTheme\ThemeInfo' =>
-                    array('VuFindTheme\Module', 'getThemeInfo'),
+                'VuFindTheme\ThemeInfo' => 'VuFindTheme\Module::getThemeInfo',
             ),
             'invokables' => array(
                 'VuFindTheme\Mobile' => 'VuFindTheme\Mobile',
@@ -82,19 +81,14 @@ class Module
     {
         return array(
             'factories' => array(
-                'headlink' =>
-                    array('VuFindTheme\View\Helper\Factory', 'getHeadLink'),
-                'headscript' =>
-                    array('VuFindTheme\View\Helper\Factory', 'getHeadScript'),
-                'headthemeresources' => array(
-                    'VuFindTheme\View\Helper\Factory', 'getHeadThemeResources'
-                ),
-                'imagelink' =>
-                    array('VuFindTheme\View\Helper\Factory', 'getImageLink'),
+                'headlink' => 'VuFindTheme\View\Helper\Factory::getHeadLink',
+                'headscript' => 'VuFindTheme\View\Helper\Factory::getHeadScript',
+                'headthemeresources' =>
+                    'VuFindTheme\View\Helper\Factory::getHeadThemeResources',
+                'imagelink' => 'VuFindTheme\View\Helper\Factory::getImageLink',
                 'inlinescript' =>
-                    array('VuFindTheme\View\Helper\Factory', 'getInlineScript'),
-                'mobileurl' =>
-                    array('VuFindTheme\View\Helper\Factory', 'getMobileUrl'),
+                    'VuFindTheme\View\Helper\Factory::getInlineScript',
+                'mobileurl' => 'VuFindTheme\View\Helper\Factory::getMobileUrl',
             ),
         );
     }

themes/blueprint/theme.config.php

@@ -22,7 +22,7 @@ return array(
     'favicon' => 'vufind-favicon.ico',
     'helpers' => array(
         'factories' => array(
-            'layoutclass' => array('VuFind\View\Helper\Blueprint\Factory', 'getLayoutClass'),
+            'layoutclass' => 'VuFind\View\Helper\Blueprint\Factory::getLayoutClass',
         ),
         'invokables' => array(
             'search' => 'VuFind\View\Helper\Blueprint\Search',

themes/bootprint/theme.config.php

@@ -7,7 +7,7 @@ return array(
     ),
     'helpers' => array(
         'factories' => array(
-            'layoutclass' => array('VuFind\View\Helper\Bootprint\Factory', 'getLayoutClass'),
+            'layoutclass' => 'VuFind\View\Helper\Bootprint\Factory::getLayoutClass',
         )
     )
 );

themes/bootstrap/theme.config.php

@@ -20,8 +20,8 @@ return array(
     'favicon' => 'vufind-favicon.ico',
     'helpers' => array(
         'factories' => array(
-            'flashmessages' => array('VuFind\View\Helper\Bootstrap\Factory', 'getFlashmessages'),
-            'layoutclass' => array('VuFind\View\Helper\Bootstrap\Factory', 'getLayoutClass'),
+            'flashmessages' => 'VuFind\View\Helper\Bootstrap\Factory::getFlashmessages',
+            'layoutclass' => 'VuFind\View\Helper\Bootstrap\Factory::getLayoutClass',
         ),
         'invokables' => array(
             'highlight' => 'VuFind\View\Helper\Bootstrap\Highlight',

themes/root/theme.config.php

@@ -3,37 +3,37 @@ return array(
     'extends' => false,
     'helpers' => array(
         'factories' => array(
-            'addthis' => array('VuFind\View\Helper\Root\Factory', 'getAddThis'),
-            'auth' => array('VuFind\View\Helper\Root\Factory', 'getAuth'),
-            'authornotes' => array('VuFind\View\Helper\Root\Factory', 'getAuthorNotes'),
-            'cart' => array('VuFind\View\Helper\Root\Factory', 'getCart'),
-            'citation' => array('VuFind\View\Helper\Root\Factory', 'getCitation'),
-            'datetime' => array('VuFind\View\Helper\Root\Factory', 'getDateTime'),
-            'displaylanguageoption' => array('VuFind\View\Helper\Root\Factory', 'getDisplayLanguageOption'),
-            'excerpt' => array('VuFind\View\Helper\Root\Factory', 'getExcerpt'),
-            'export' => array('VuFind\View\Helper\Root\Factory', 'getExport'),
-            'feedback' => array('VuFind\View\Helper\Root\Factory', 'getFeedback'),
-            'flashmessages' => array('VuFind\View\Helper\Root\Factory', 'getFlashmessages'),
-            'googleanalytics' => array('VuFind\View\Helper\Root\Factory', 'getGoogleAnalytics'),
-            'getlastsearchlink' => array('VuFind\View\Helper\Root\Factory', 'getGetLastSearchLink'),
-            'historylabel' => array('VuFind\View\Helper\Root\Factory', 'getHistoryLabel'),
-            'ils' => array('VuFind\View\Helper\Root\Factory', 'getIls'),
-            'jstranslations' => array('VuFind\View\Helper\Root\Factory', 'getJsTranslations'),
-            'keepalive' => array('VuFind\View\Helper\Root\Factory', 'getKeepAlive'),
-            'proxyurl' => array('VuFind\View\Helper\Root\Factory', 'getProxyUrl'),
-            'openurl' => array('VuFind\View\Helper\Root\Factory', 'getOpenUrl'),
-            'record' => array('VuFind\View\Helper\Root\Factory', 'getRecord'),
-            'recordlink' => array('VuFind\View\Helper\Root\Factory', 'getRecordLink'),
-            'related' => array('VuFind\View\Helper\Root\Factory', 'getRelated'),
-            'reviews' => array('VuFind\View\Helper\Root\Factory', 'getReviews'),
-            'searchbox' => array('VuFind\View\Helper\Root\Factory', 'getSearchBox'),
-            'searchoptions' => array('VuFind\View\Helper\Root\Factory', 'getSearchOptions'),
-            'searchparams' => array('VuFind\View\Helper\Root\Factory', 'getSearchParams'),
-            'searchtabs' => array('VuFind\View\Helper\Root\Factory', 'getSearchTabs'),
-            'syndeticsplus' => array('VuFind\View\Helper\Root\Factory', 'getSyndeticsPlus'),
-            'systememail' => array('VuFind\View\Helper\Root\Factory', 'getSystemEmail'),
-            'videoclips' => array('VuFind\View\Helper\Root\Factory', 'getVideoClips'),
-            'worldcat' => array('VuFind\View\Helper\Root\Factory', 'getWorldCat'),
+            'addthis' => 'VuFind\View\Helper\Root\Factory::getAddThis',
+            'auth' => 'VuFind\View\Helper\Root\Factory::getAuth',
+            'authornotes' => 'VuFind\View\Helper\Root\Factory::getAuthorNotes',
+            'cart' => 'VuFind\View\Helper\Root\Factory::getCart',
+            'citation' => 'VuFind\View\Helper\Root\Factory::getCitation',
+            'datetime' => 'VuFind\View\Helper\Root\Factory::getDateTime',
+            'displaylanguageoption' => 'VuFind\View\Helper\Root\Factory::getDisplayLanguageOption',
+            'excerpt' => 'VuFind\View\Helper\Root\Factory::getExcerpt',
+            'export' => 'VuFind\View\Helper\Root\Factory::getExport',
+            'feedback' => 'VuFind\View\Helper\Root\Factory::getFeedback',
+            'flashmessages' => 'VuFind\View\Helper\Root\Factory::getFlashmessages',
+            'googleanalytics' => 'VuFind\View\Helper\Root\Factory::getGoogleAnalytics',
+            'getlastsearchlink' => 'VuFind\View\Helper\Root\Factory::getGetLastSearchLink',
+            'historylabel' => 'VuFind\View\Helper\Root\Factory::getHistoryLabel',
+            'ils' => 'VuFind\View\Helper\Root\Factory::getIls',
+            'jstranslations' => 'VuFind\View\Helper\Root\Factory::getJsTranslations',
+            'keepalive' => 'VuFind\View\Helper\Root\Factory::getKeepAlive',
+            'proxyurl' => 'VuFind\View\Helper\Root\Factory::getProxyUrl',
+            'openurl' => 'VuFind\View\Helper\Root\Factory::getOpenUrl',
+            'record' => 'VuFind\View\Helper\Root\Factory::getRecord',
+            'recordlink' => 'VuFind\View\Helper\Root\Factory::getRecordLink',
+            'related' => 'VuFind\View\Helper\Root\Factory::getRelated',
+            'reviews' => 'VuFind\View\Helper\Root\Factory::getReviews',
+            'searchbox' => 'VuFind\View\Helper\Root\Factory::getSearchBox',
+            'searchoptions' => 'VuFind\View\Helper\Root\Factory::getSearchOptions',
+            'searchparams' => 'VuFind\View\Helper\Root\Factory::getSearchParams',
+            'searchtabs' => 'VuFind\View\Helper\Root\Factory::getSearchTabs',
+            'syndeticsplus' => 'VuFind\View\Helper\Root\Factory::getSyndeticsPlus',
+            'systememail' => 'VuFind\View\Helper\Root\Factory::getSystemEmail',
+            'videoclips' => 'VuFind\View\Helper\Root\Factory::getVideoClips',
+            'worldcat' => 'VuFind\View\Helper\Root\Factory::getWorldCat',
         ),
         'invokables' => array(
             'addellipsis' => 'VuFind\View\Helper\Root\AddEllipsis',