Normalize case of view helper service names (#1070)

module/VuFind/src/VuFind/View/Helper/Root/Factory.php

@@ -305,7 +305,7 @@ class Factory
         $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config');
         $config = isset($config->SearchHistoryLabels)
             ? $config->SearchHistoryLabels->toArray() : [];
-        return new HistoryLabel($config, $sm->get('transesc'));
+        return new HistoryLabel($config, $sm->get('transEsc'));
     }
 
     /**
@@ -329,7 +329,7 @@ class Factory
      */
     public static function getJsTranslations(ServiceManager $sm)
     {
-        return new JsTranslations($sm->get('transesc'));
+        return new JsTranslations($sm->get('transEsc'));
     }
 
     /**

module/VuFindTheme/Module.php

@@ -89,12 +89,12 @@ class Module
     {
         return [
             'factories' => [
-                'headlink' => 'VuFindTheme\View\Helper\Factory::getHeadLink',
-                'headscript' => 'VuFindTheme\View\Helper\Factory::getHeadScript',
-                'headthemeresources' =>
+                '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' =>
+                'imageLink' => 'VuFindTheme\View\Helper\Factory::getImageLink',
+                'inlineScript' =>
                     'VuFindTheme\View\Helper\Factory::getInlineScript',
                 'mobileurl' => 'VuFindTheme\View\Helper\Factory::getMobileUrl',
             ],

themes/bootstrap3/templates/error/index.phtml

@@ -10,7 +10,7 @@
   <p>
     <?=$this->transEsc('Please contact the Library Reference Department for assistance')?>
     <br/>
-    <? $supportEmail = $this->escapeHtmlAttr($this->systememail()); ?>
+    <? $supportEmail = $this->escapeHtmlAttr($this->systemEmail()); ?>
     <a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a>
   </p>
 </div>

themes/bootstrap3/templates/install/home.phtml

@@ -9,7 +9,7 @@
 <?=$this->flashmessages()?>
 <? $errors = 0; foreach ($this->checks as $check): ?>
 <? if (!$check['status']) $errors++; ?>
-  <div class="alert alert-<?=$check['status'] ? 'success':'danger'?>"><?=$this->escapeHtml($check['title'])?>... <?=$check['status'] ? $this->transEsc('test_ok') : $this->transesc('test_fail') . ' <a class="btn btn-danger" href="' . $this->url('install-' . strtolower($check['fix'])) . '">' . $this->transEsc('test_fix') . '</a>' ?></div>
+  <div class="alert alert-<?=$check['status'] ? 'success':'danger'?>"><?=$this->escapeHtml($check['title'])?>... <?=$check['status'] ? $this->transEsc('test_ok') : $this->transEsc('test_fail') . ' <a class="btn btn-danger" href="' . $this->url('install-' . strtolower($check['fix'])) . '">' . $this->transEsc('test_fix') . '</a>' ?></div>
 <? endforeach; ?>
 
 <? if ($errors == 0): ?>

themes/bootstrap3/templates/layout/layout.phtml

@@ -102,9 +102,9 @@
       }
 
       // Session keep-alive
-      if ($this->KeepAlive()) {
+      if ($this->keepAlive()) {
           $this->headScript()->appendScript('var keepAliveInterval = '
-            . $this->KeepAlive());
+            . $this->keepAlive());
           $this->headScript()->appendFile("keep_alive.js");
       }
     ?>

themes/bootstrap3/theme.config.php

@@ -29,7 +29,7 @@ return [
     'helpers' => [
         'factories' => [
             'flashmessages' => 'VuFind\View\Helper\Bootstrap3\Factory::getFlashmessages',
-            'layoutclass' => 'VuFind\View\Helper\Bootstrap3\Factory::getLayoutClass',
+            'layoutClass' => 'VuFind\View\Helper\Bootstrap3\Factory::getLayoutClass',
             'recaptcha' => 'VuFind\View\Helper\Bootstrap3\Factory::getRecaptcha',
         ],
         'invokables' => [

themes/root/theme.config.php

@@ -3,43 +3,43 @@ return [
     'extends' => false,
     'helpers' => [
         'factories' => [
-            'accountcapabilities' => 'VuFind\View\Helper\Root\Factory::getAccountCapabilities',
-            'addthis' => 'VuFind\View\Helper\Root\Factory::getAddThis',
+            'accountCapabilities' => 'VuFind\View\Helper\Root\Factory::getAccountCapabilities',
+            'addThis' => 'VuFind\View\Helper\Root\Factory::getAddThis',
             'alphabrowse' => 'VuFind\View\Helper\Root\Factory::getAlphaBrowse',
             'auth' => 'VuFind\View\Helper\Root\Factory::getAuth',
-            'authornotes' => 'VuFind\View\Helper\Root\Factory::getAuthorNotes',
+            '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',
+            'dateTime' => 'VuFind\View\Helper\Root\Factory::getDateTime',
+            'displayLanguageOption' => 'VuFind\View\Helper\Root\Factory::getDisplayLanguageOption',
             'export' => 'VuFind\View\Helper\Root\Factory::getExport',
             'feedback' => 'VuFind\View\Helper\Root\Factory::getFeedback',
             'flashmessages' => 'VuFind\View\Helper\Root\Factory::getFlashmessages',
             'geocoords' => 'VuFind\View\Helper\Root\Factory::getGeoCoords',
             'googleanalytics' => 'VuFind\View\Helper\Root\Factory::getGoogleAnalytics',
-            'helptext' => 'VuFind\View\Helper\Root\Factory::getHelpText',
+            'helpText' => 'VuFind\View\Helper\Root\Factory::getHelpText',
             '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',
+            'jsTranslations' => 'VuFind\View\Helper\Root\Factory::getJsTranslations',
+            'keepAlive' => 'VuFind\View\Helper\Root\Factory::getKeepAlive',
             'permission' => 'VuFind\View\Helper\Root\Factory::getPermission',
-            'proxyurl' => 'VuFind\View\Helper\Root\Factory::getProxyUrl',
-            'openurl' => 'VuFind\View\Helper\Root\Factory::getOpenUrl',
+            'proxyUrl' => 'VuFind\View\Helper\Root\Factory::getProxyUrl',
+            'openUrl' => 'VuFind\View\Helper\Root\Factory::getOpenUrl',
             'piwik' => 'VuFind\View\Helper\Root\Factory::getPiwik',
             'recaptcha' => 'VuFind\View\Helper\Root\Factory::getRecaptcha',
             'record' => 'VuFind\View\Helper\Root\Factory::getRecord',
-            'recorddataformatter' => 'VuFind\View\Helper\Root\RecordDataFormatterFactory',
-            'recordlink' => 'VuFind\View\Helper\Root\Factory::getRecordLink',
+            'recordDataFormatter' => 'VuFind\View\Helper\Root\RecordDataFormatterFactory',
+            'recordLink' => 'VuFind\View\Helper\Root\Factory::getRecordLink',
             'related' => 'VuFind\View\Helper\Root\Factory::getRelated',
-            'safemoneyformat' => 'VuFind\View\Helper\Root\Factory::getSafeMoneyFormat',
+            'safeMoneyFormat' => 'VuFind\View\Helper\Root\Factory::getSafeMoneyFormat',
             'searchbox' => 'VuFind\View\Helper\Root\Factory::getSearchBox',
-            'searchmemory' => 'VuFind\View\Helper\Root\Factory::getSearchMemory',
-            'searchoptions' => 'VuFind\View\Helper\Root\Factory::getSearchOptions',
-            'searchparams' => 'VuFind\View\Helper\Root\Factory::getSearchParams',
+            'searchMemory' => 'VuFind\View\Helper\Root\Factory::getSearchMemory',
+            'searchOptions' => 'VuFind\View\Helper\Root\Factory::getSearchOptions',
+            'searchParams' => 'VuFind\View\Helper\Root\Factory::getSearchParams',
             'searchtabs' => 'VuFind\View\Helper\Root\Factory::getSearchTabs',
             'summaries' => 'VuFind\View\Helper\Root\Factory::getSummaries',
-            'syndeticsplus' => 'VuFind\View\Helper\Root\Factory::getSyndeticsPlus',
-            'systememail' => 'VuFind\View\Helper\Root\Factory::getSystemEmail',
+            'syndeticsPlus' => 'VuFind\View\Helper\Root\Factory::getSyndeticsPlus',
+            'systemEmail' => 'VuFind\View\Helper\Root\Factory::getSystemEmail',
             'userlist' => 'VuFind\View\Helper\Root\Factory::getUserList',
             'usertags' => 'VuFind\View\Helper\Root\Factory::getUserTags',
         ],
@@ -47,17 +47,17 @@ return [
             'addellipsis' => 'VuFind\View\Helper\Root\AddEllipsis',
             'browse' => 'VuFind\View\Helper\Root\Browse',
             'context' => 'VuFind\View\Helper\Root\Context',
-            'currentpath' => 'VuFind\View\Helper\Root\CurrentPath',
+            'currentPath' => 'VuFind\View\Helper\Root\CurrentPath',
             'highlight' => 'VuFind\View\Helper\Root\Highlight',
             'jqueryvalidation' => 'VuFind\View\Helper\Root\JqueryValidation',
             'localizedNumber' => 'VuFind\View\Helper\Root\LocalizedNumber',
             'printms' => 'VuFind\View\Helper\Root\Printms',
             'recommend' => 'VuFind\View\Helper\Root\Recommend',
-            'renderarray' => 'VuFind\View\Helper\Root\RenderArray',
+            'renderArray' => 'VuFind\View\Helper\Root\RenderArray',
             'resultfeed' => 'VuFind\View\Helper\Root\ResultFeed',
-            'sortfacetlist' => 'VuFind\View\Helper\Root\SortFacetList',
+            'sortFacetList' => 'VuFind\View\Helper\Root\SortFacetList',
             'summon' => 'VuFind\View\Helper\Root\Summon',
-            'transesc' => 'VuFind\View\Helper\Root\TransEsc',
+            'transEsc' => 'VuFind\View\Helper\Root\TransEsc',
             'translate' => 'VuFind\View\Helper\Root\Translate',
             'truncate' => 'VuFind\View\Helper\Root\Truncate',
         ]