[CLEANUP] Fix case mismatch of functions / methods 26/47526/2
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Thu, 7 Apr 2016 06:50:41 +0000 (08:50 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 7 Apr 2016 10:41:39 +0000 (12:41 +0200)
Resolves: #75433
Releases: master
Change-Id: Ic73beb093efc5c0648d2ea6e66286b0a6b439e4e
Reviewed-on: https://review.typo3.org/47526
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
63 files changed:
typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
typo3/sysext/backend/Classes/Clipboard/Clipboard.php
typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
typo3/sysext/backend/Classes/Form/Container/FlexFormContainerContainer.php
typo3/sysext/backend/Classes/Form/Container/FlexFormSectionContainer.php
typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
typo3/sysext/backend/Classes/Form/FormResultCompiler.php
typo3/sysext/backend/Classes/History/RecordHistory.php
typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
typo3/sysext/beuser/Classes/Controller/PermissionController.php
typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
typo3/sysext/core/Classes/Database/QueryGenerator.php
typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
typo3/sysext/core/Classes/Package/PackageManager.php
typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
typo3/sysext/core/Classes/TypoScript/TemplateService.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/LogicalOr.php
typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/fluid/Classes/View/StandaloneView.php
typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
typo3/sysext/form/Classes/Domain/Builder/FormBuilder.php
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
typo3/sysext/frontend/Classes/Page/PageGenerator.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/install/Classes/Service/CoreUpdateService.php
typo3/sysext/linkvalidator/Classes/Linktype/FileLinktype.php
typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
typo3/sysext/lowlevel/Classes/LostFilesCommand.php
typo3/sysext/lowlevel/Classes/VersionsCommand.php
typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
typo3/sysext/version/Classes/Hook/PreviewHook.php
typo3/sysext/version/ext_localconf.php
typo3/sysext/workspaces/Classes/Service/HistoryService.php

index 7db8093..19d84bd 100644 (file)
@@ -1113,7 +1113,7 @@ class ClickMenu
         $isSel = '';
         // Pseudo table name for use in the clipboard.
         $table = '_FILE';
-        $uid = GeneralUtility::shortmd5($path);
+        $uid = GeneralUtility::shortMD5($path);
         if ($this->clipObj->current === 'normal') {
             $isSel = $this->clipObj->isSelected($table, $uid);
         }
index 639f8fe..1cf074e 100644 (file)
@@ -427,7 +427,7 @@ class Clipboard
                                                                        <td nowrap="nowrap" width="95%">' . $this->linkItemText(htmlspecialchars(GeneralUtility::fixed_lgd_cs($fileObject->getName(), $this->getBackendUser()->uc['titleLen'])), $fileObject->getName()) . ($pad == 'normal' ? ' <strong>(' . ($this->clipData['normal']['mode'] == 'copy' ? $this->clLabel('copy', 'cm') : $this->clLabel('cut', 'cm')) . ')</strong>' : '') . '&nbsp;' . $thumb . '</td>
                                                                        <td nowrap="nowrap" class="col-control">
                                                                                <div class="btn-group">
-                                                                                       <a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($v) . '); return false;')) . '"title="' . $this->clLabel('info', 'cm') . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>' . '<a class="btn btn-default" href="' . htmlspecialchars($this->removeUrl('_FILE', GeneralUtility::shortmd5($v))) . '#clip_head" title="' . $this->clLabel('removeItem') . '">' . $this->iconFactory->getIcon('actions-selection-delete', Icon::SIZE_SMALL)->render() . '</a>
+                                                                                       <a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($v) . '); return false;')) . '"title="' . $this->clLabel('info', 'cm') . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>' . '<a class="btn btn-default" href="' . htmlspecialchars($this->removeUrl('_FILE', GeneralUtility::shortMD5($v))) . '#clip_head" title="' . $this->clLabel('removeItem') . '">' . $this->iconFactory->getIcon('actions-selection-delete', Icon::SIZE_SMALL)->render() . '</a>
                                                                                </div>
                                                                        </td>
                                                                </tr>';
@@ -606,7 +606,7 @@ class Clipboard
      */
     public function selUrlFile($path, $copy = 0, $deselect = 0, $baseArray = array())
     {
-        $CB = array('el' => array(rawurlencode('_FILE|' . GeneralUtility::shortmd5($path)) => $deselect ? '' : $path));
+        $CB = array('el' => array(rawurlencode('_FILE|' . GeneralUtility::shortMD5($path)) => $deselect ? '' : $path));
         if ($copy) {
             $CB['setCopyMode'] = 1;
         }
index 304c903..72d3cc4 100644 (file)
@@ -213,9 +213,9 @@ class TranslationConfigurationProvider
     protected function getDefaultLanguageLabel(array $modSharedTSconfig)
     {
         if (strlen($modSharedTSconfig['properties']['defaultLanguageLabel'])) {
-            $defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sl('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')';
+            $defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')';
         } else {
-            $defaultLanguageLabel = $this->getLanguageService()->sl('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
+            $defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
         }
         return $defaultLanguageLabel;
     }
index 329e41a..56d4252 100644 (file)
@@ -172,7 +172,7 @@ class RenameFileController extends AbstractModule
         // back button
         if ($this->returnUrl) {
             $backButton = $buttonBar->makeLinkButton()
-                ->sethref($this->returnUrl)
+                ->setHref($this->returnUrl)
                 ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($backButton);
index 61d7e96..35ebf97 100644 (file)
@@ -385,7 +385,7 @@ class ColorpickerController extends AbstractWizardController
      */
     public function getIndex($im, $x, $y)
     {
-        $rgb = ImageColorAt($im, $x, $y);
+        $rgb = imagecolorat($im, $x, $y);
         $colorRgb = imagecolorsforindex($im, $rgb);
         $index['r'] = dechex($colorRgb['red']);
         $index['g'] = dechex($colorRgb['green']);
index f344fd0..7f60714 100644 (file)
@@ -44,7 +44,7 @@ class FlexFormContainerContainer extends AbstractContainer
         $parameterArray = $this->data['parameterArray'];
 
         // Every container adds its own part to the id prefix
-        $flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMd5(uniqid('id', true));
+        $flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMD5(uniqid('id', true));
 
         $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
         $toggleIcons = '<span class="t3js-flex-control-toggle-icon-open" style="' . ($flexFormContainerElementCollapsed ? 'display: none;' : '') . '">'
index 8ec95b3..52bf394 100644 (file)
@@ -55,7 +55,7 @@ class FlexFormSectionContainer extends AbstractContainer
         // Creating IDs for form fields:
         // It's important that the IDs "cascade" - otherwise we can't dynamically expand the flex form
         // because this relies on simple string substitution of the first parts of the id values.
-        $flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMd5(uniqid('id', true));
+        $flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMD5(uniqid('id', true));
 
         // Render each existing container
         foreach ($flexFormRowData as $flexFormContainerCounter => $existingSectionContainerData) {
index 16e6c6c..01177f7 100644 (file)
@@ -134,7 +134,7 @@ abstract class AbstractFormElement extends AbstractNode
 
         $fieldChangeFunc = $PA['fieldChangeFunc'];
         $item = $itemKinds[0];
-        $md5ID = 'ID' . GeneralUtility::shortmd5($itemName);
+        $md5ID = 'ID' . GeneralUtility::shortMD5($itemName);
         $prefixOfFormElName = 'data[' . $table . '][' . $row['uid'] . '][' . $field . ']';
         $flexFormPath = '';
         if (GeneralUtility::isFirstPartOfStr($PA['itemFormElName'], $prefixOfFormElName)) {
index f34816d..21a0967 100644 (file)
@@ -156,7 +156,7 @@ class CheckboxElement extends AbstractFormElement
      */
     protected function checkBoxParams($itemName, $formElementValue, $checkbox, $checkboxesCount, $additionalJavaScript = '')
     {
-        $elementName = 'document.editform[' . Generalutility::quoteJSvalue($itemName) . ']';
+        $elementName = 'document.editform[' . GeneralUtility::quoteJSvalue($itemName) . ']';
         $checkboxPow = pow(2, $checkbox);
         $onClick = $elementName . '.value=this.checked?(' . $elementName . '.value|' . $checkboxPow . '):('
             . $elementName . '.value&' . (pow(2, $checkboxesCount) - 1 - $checkboxPow) . ');' . $additionalJavaScript;
index c8c6f0a..c1caf2a 100644 (file)
@@ -694,7 +694,7 @@ abstract class AbstractItemProvider
                 }
                 // Get all sheets and title
                 foreach ($flexForms as $extIdent => $extConf) {
-                    $extTitle = $languageService->sl(trim($extConf['title']));
+                    $extTitle = $languageService->sL(trim($extConf['title']));
                     // Get all fields in sheet
                     foreach ($extConf['ds']['sheets'] as $sheetName => $sheet) {
                         if (empty($sheet['ROOT']['el']) || !is_array($sheet['ROOT']['el'])) {
index 66cbfbd..2ef165e 100644 (file)
@@ -60,7 +60,7 @@ class TcaInputPlaceholders implements FormDataProviderInterface
 
             // Resolve placeholders from language files
             if (StringUtility::beginsWith($fieldConfig['config']['placeholder'], 'LLL:')) {
-                $result['processedTca']['columns'][$fieldName]['config']['placeholder'] = $this->getLanguageService()->sl($fieldConfig['config']['placeholder']);
+                $result['processedTca']['columns'][$fieldName]['config']['placeholder'] = $this->getLanguageService()->sL($fieldConfig['config']['placeholder']);
             }
 
             // Remove empty placeholders
index a6a004a..3e45671 100644 (file)
@@ -256,7 +256,7 @@ class FormResultCompiler
 
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Filelist/FileListLocalisation');
 
-        $pageRenderer->addInlineLanguagelabelFile(
+        $pageRenderer->addInlineLanguageLabelFile(
             \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('lang') . 'locallang_core.xlf',
             'file_upload'
         );
index 0c8097e..cf17cc7 100644 (file)
@@ -463,7 +463,7 @@ class RecordHistory
                     // Re-write field names with labels
                     $tmpFieldList = explode(',', $entry['fieldlist']);
                     foreach ($tmpFieldList as $key => $value) {
-                        $tmp = str_replace(':', '', $languageService->sl(BackendUtility::getItemLabel($entry['tablename'], $value), true));
+                        $tmp = str_replace(':', '', $languageService->sL(BackendUtility::getItemLabel($entry['tablename'], $value), true));
                         if ($tmp) {
                             $tmpFieldList[$key] = $tmp;
                         } else {
@@ -567,7 +567,7 @@ class RecordHistory
                     );
                     $lines[] = array(
                         'title' => ($rollbackUid ? $this->createRollbackLink(($table . ':' . $rollbackUid . ':' . $fN), $languageService->getLL('revertField', true), 2) : '') . '
-                          ' . $languageService->sl(BackendUtility::getItemLabel($table, $fN), true),
+                          ' . $languageService->sL(BackendUtility::getItemLabel($table, $fN), true),
                         'result' => str_replace('\n', PHP_EOL, str_replace('\r\n', '\n', $diffres))
                     );
                 }
index cff57ed..2d919c9 100644 (file)
@@ -173,7 +173,7 @@ abstract class AbstractFunctionModule
         $this->pObj = $pObj;
         // Path of this script:
         $reflector = new \ReflectionObject($this);
-        $this->thisPath = dirname($reflector->getFilename());
+        $this->thisPath = dirname($reflector->getFileName());
         if (!@is_dir($this->thisPath)) {
             throw new \RuntimeException('TYPO3 Fatal Error: Could not find path for class ' . get_class($this), 1381164687);
         }
index 50db1b6..6f788f9 100644 (file)
@@ -481,7 +481,7 @@ abstract class AbstractRecordList
             if ($launchViewParameter !== '') {
                 $htmlCode .= ' onclick="' . htmlspecialchars(('top.launchView(' . $launchViewParameter . '); return false;')) . '"';
             }
-            $htmlCode .= ' title="' . htmlspecialchars($this->getLanguageService()->sl('LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references') . ' (' .  $references . ')') . '">';
+            $htmlCode .= ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references') . ' (' .  $references . ')') . '">';
             $htmlCode .= $references;
             $htmlCode .= '</a>';
         }
index 01b0c50..9559a83 100644 (file)
@@ -192,7 +192,7 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre
                 'dropZoneElementRemoved' => $GLOBALS['LANG']->sL($file . 'tree.dropZoneElementRemoved', true),
                 'dropZoneElementRestored' => $GLOBALS['LANG']->sL($file . 'tree.dropZoneElementRestored', true),
                 'searchTermInfo' => $GLOBALS['LANG']->sL($file . 'tree.searchTermInfo', true),
-                'temporaryMountPointIndicatorInfo' => $GLOBALS['LANG']->sl($file . 'labels.temporaryDBmount', true),
+                'temporaryMountPointIndicatorInfo' => $GLOBALS['LANG']->sL($file . 'labels.temporaryDBmount', true),
                 'deleteDialogTitle' => $GLOBALS['LANG']->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteItem', true),
                 'deleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteWarning', true),
                 'recursiveDeleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:recursiveDeleteWarning', true)
index 9cadfd1..c9b066f 100644 (file)
@@ -219,7 +219,7 @@ class FolderTreeView extends AbstractTreeView
      */
     public function getId($folderObject)
     {
-        return GeneralUtility::md5Int($folderObject->getCombinedIdentifier());
+        return GeneralUtility::md5int($folderObject->getCombinedIdentifier());
     }
 
     /**
index 7382337..724dbfb 100644 (file)
@@ -119,7 +119,7 @@ class PermissionController extends ActionController
         parent::initializeView($view);
         $view->assign(
             'previewUrl',
-            BackendUtility::viewonclick(
+            BackendUtility::viewOnClick(
                 $this->pageInfo['uid'], '',
                 BackendUtility::BEgetRootLine($this->pageInfo['uid'])
             )
index 161777c..6272244 100644 (file)
@@ -421,7 +421,7 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
     public function flush()
     {
         if ($this->connected) {
-            $this->redis->flushdb();
+            $this->redis->flushDB();
         }
     }
 
index 51a3a5f..da70c68 100644 (file)
@@ -1145,7 +1145,7 @@ class QueryGenerator
         $out[] = '<option value=""></option>';
         foreach ($GLOBALS['TCA'] as $tN => $value) {
             if ($this->getBackendUserAuthentication()->check('tables_select', $tN)) {
-                $out[] = '<option value="' . htmlspecialchars($tN) . '"' . ($tN === $cur ? ' selected' : '') . '>' . htmlspecialchars($this->getLanguageService()->sl($GLOBALS['TCA'][$tN]['ctrl']['title'])) . '</option>';
+                $out[] = '<option value="' . htmlspecialchars($tN) . '"' . ($tN === $cur ? ' selected' : '') . '>' . htmlspecialchars($this->getLanguageService()->sL($GLOBALS['TCA'][$tN]['ctrl']['title'])) . '</option>';
             }
         }
         $out[] = '</select>';
index 299cce4..8f5487d 100644 (file)
@@ -49,8 +49,8 @@ class BackendUserGroupIntegrityCheck
                     /** @var $flashMessage FlashMessage */
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
-                        $this->getLanguageService()->sl('LLL:EXT:lang/locallang_core.xlf:error.backendUserGroupListTypeError.message'),
-                        $this->getLanguageService()->sl('LLL:EXT:lang/locallang_core.xlf:error.backendUserGroupListTypeError.header'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:error.backendUserGroupListTypeError.message'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:error.backendUserGroupListTypeError.header'),
                         FlashMessage::WARNING,
                         true
                     );
index 84d8382..3658c57 100644 (file)
@@ -316,7 +316,7 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
         $registerOnlyNewPackages = !empty($this->packages);
         $this->registerPackagesFromConfiguration($registerOnlyNewPackages);
         if ($this->packageStatesConfiguration != $previousPackageStatesConfiguration) {
-            $this->sortAndsavePackageStates();
+            $this->sortAndSavePackageStates();
         }
     }
 
index bf8c1a1..3b899c1 100644 (file)
@@ -184,7 +184,7 @@ class ConfigurationForm extends ExtendedTemplateService
     {
         $iFile = $this->ext_localGfxPrefix . $imgConf;
         $tFile = $this->ext_localWebGfxPrefix . $imgConf;
-        $imageInfo = @getImagesize($iFile);
+        $imageInfo = @getimagesize($iFile);
         return '<img src="' . $tFile . '" ' . $imageInfo[3] . '>';
     }
 
index c1acf27..e8418c9 100644 (file)
@@ -1113,7 +1113,7 @@ class ExtendedTemplateService extends TemplateService
             }
         }
         if ($iFile !== null) {
-            $imageInfo = @getImagesize($iFile);
+            $imageInfo = @getimagesize($iFile);
             return '<img src="' . $tFile . '" ' . $imageInfo[3] . '>';
         }
         return '';
@@ -1552,17 +1552,17 @@ class ExtendedTemplateService extends TemplateService
                                 if ($var && !GeneralUtility::inList($this->HTMLcolorList, strtolower($var))) {
                                     $var = preg_replace('/[^A-Fa-f0-9]*/', '', $var);
                                     $useFulHex = strlen($var) > 3;
-                                    $col[] = HexDec($var[0]);
-                                    $col[] = HexDec($var[1]);
-                                    $col[] = HexDec($var[2]);
+                                    $col[] = hexdec($var[0]);
+                                    $col[] = hexdec($var[1]);
+                                    $col[] = hexdec($var[2]);
                                     if ($useFulHex) {
-                                        $col[] = HexDec($var[3]);
-                                        $col[] = HexDec($var[4]);
-                                        $col[] = HexDec($var[5]);
+                                        $col[] = hexdec($var[3]);
+                                        $col[] = hexdec($var[4]);
+                                        $col[] = hexdec($var[5]);
                                     }
-                                    $var = substr(('0' . DecHex($col[0])), -1) . substr(('0' . DecHex($col[1])), -1) . substr(('0' . DecHex($col[2])), -1);
+                                    $var = substr(('0' . dechex($col[0])), -1) . substr(('0' . dechex($col[1])), -1) . substr(('0' . dechex($col[2])), -1);
                                     if ($useFulHex) {
-                                        $var .= substr(('0' . DecHex($col[3])), -1) . substr(('0' . DecHex($col[4])), -1) . substr(('0' . DecHex($col[5])), -1);
+                                        $var .= substr(('0' . dechex($col[3])), -1) . substr(('0' . dechex($col[4])), -1) . substr(('0' . dechex($col[5])), -1);
                                     }
                                     $var = '#' . strtoupper($var);
                                 }
index 0725243..65e11f9 100644 (file)
@@ -499,11 +499,11 @@ class TemplateService
                 // If TypoScript setup structure was cached we unserialize it here:
                 $this->setup = $setupData;
                 if ($this->tt_track) {
-                    $this->getTimeTracker()->setTSLogMessage('Using cached TS template data');
+                    $this->getTimeTracker()->setTSlogMessage('Using cached TS template data');
                 }
             } else {
                 if ($this->tt_track) {
-                    $this->getTimeTracker()->setTSLogMessage('Not using any cached TS data');
+                    $this->getTimeTracker()->setTSlogMessage('Not using any cached TS data');
                 }
 
                 // Make configuration
index f9c5cc3..2c88650 100644 (file)
@@ -104,7 +104,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'new' => 'new',
         );
 
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getLocalConfiguration',
                 'writeLocalConfiguration',
@@ -125,7 +125,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getDefaultConfigurationValueByPathReturnsCorrectValue()
     {
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getDefaultConfiguration',
             )
@@ -145,7 +145,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getLocalConfigurationValueByPathReturnsCorrectValue()
     {
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getLocalConfiguration',
             )
@@ -165,7 +165,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getConfigurationValueByPathReturnsCorrectValue()
     {
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getDefaultConfiguration',
                 'getLocalConfiguration',
@@ -192,7 +192,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setLocalConfigurationValueByPathReturnFalseIfPathIsNotValid()
     {
-        $this->createsubjectWithMockedMethods(array(
+        $this->createSubjectWithMockedMethods(array(
                 'isValidLocalConfigurationPath',
             ));
         $this->subject->expects($this->once())
@@ -216,7 +216,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'toUpdate' => 'updated',
         );
 
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'isValidLocalConfigurationPath',
                 'getLocalConfiguration',
@@ -251,7 +251,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'new' => 'new',
         );
 
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'isValidLocalConfigurationPath',
                 'getLocalConfiguration',
@@ -289,7 +289,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'notChanged' => 23,
         );
 
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getLocalConfiguration',
                 'writeLocalConfiguration',
@@ -317,7 +317,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $currentLocalConfiguration = array(
             'notChanged' => 23,
         );
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getLocalConfiguration',
                 'writeLocalConfiguration',
@@ -341,7 +341,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $currentLocalConfiguration = array(
             'notChanged' => 23,
         );
-        $this->createsubjectWithMockedMethods(
+        $this->createSubjectWithMockedMethods(
             array(
                 'getLocalConfiguration',
                 'writeLocalConfiguration',
index 3f014b7..5eb0a0a 100644 (file)
@@ -116,7 +116,7 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function generateTokenReturns32CharacterHexToken()
     {
-        $this->assertRegexp('/^[0-9a-f]{40}$/', $this->subject->generateToken('foo'));
+        $this->assertRegExp('/^[0-9a-f]{40}$/', $this->subject->generateToken('foo'));
     }
 
     /**
index f895a37..4eca0ac 100644 (file)
@@ -166,7 +166,7 @@ class IntrospectionProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->processor->expects($this->any())->method('getDebugBacktrace')->will($this->returnValue($this->dummyBacktrace));
 
-        $this->processor->setAppendFullBacktrace(true);
+        $this->processor->setAppendFullBackTrace(true);
 
         $logRecord = new \TYPO3\CMS\Core\Log\LogRecord('test.core.log', \TYPO3\CMS\Core\Log\LogLevel::DEBUG, 'test');
         $logRecord = $this->processor->processLogRecord($logRecord);
index 4f3d0b9..f4d3540 100644 (file)
@@ -97,7 +97,7 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'class' => $className
             )
         );
-        $this->initializesubject();
+        $this->initializeSubject();
         $this->assertEquals($className, $this->subject->getDriverClass($shortName));
     }
 
@@ -113,7 +113,7 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'class' => $className
             )
         );
-        $this->initializesubject();
+        $this->initializeSubject();
         $this->assertTrue($this->subject->driverExists($shortName));
         $this->assertFalse($this->subject->driverExists($this->getUniqueId()));
     }
@@ -125,7 +125,7 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['fal']['registeredDrivers'] = array(
         );
-        $this->initializesubject();
+        $this->initializeSubject();
         $this->assertFalse($this->subject->driverExists($this->getUniqueId()));
     }
 }
index 2931cd8..5b60fd4 100644 (file)
@@ -4377,7 +4377,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLog'] = 'file,' . $testLogFilename . ',0';
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['fileCreateMask'] = '0777';
         // Call method, get actual permissions and clean up
-        GeneralUtility::syslog('testLog', 'test', GeneralUtility::SYSLOG_SEVERITY_NOTICE);
+        GeneralUtility::sysLog('testLog', 'test', GeneralUtility::SYSLOG_SEVERITY_NOTICE);
         $this->testFilesToDelete[] = $testLogFilename;
         clearstatcache();
         $this->assertEquals('0777', substr(decoct(fileperms($testLogFilename)), 2));
index 96fd788..f1bada8 100644 (file)
@@ -2357,7 +2357,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection
      * Free result memory
      * free_result() wrapper function
      *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+     * @param bool|\mysqli_result|\ADORecordSet|object $res MySQLi result object / DBAL object
      * @return bool Returns TRUE on success or FALSE on failure.
      */
     public function sql_free_result($res)
index 77d6d0c..db0f310 100644 (file)
@@ -224,7 +224,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
     {
         $query = $this->emitBeforeGettingObjectDataSignal($query);
         $result = $this->storageBackend->getObjectDataByQuery($query);
-        $result = $this->emitafterGettingObjectDataSignal($query, $result);
+        $result = $this->emitAfterGettingObjectDataSignal($query, $result);
         return $result;
     }
 
index 4470442..431c2bc 100644 (file)
@@ -52,8 +52,8 @@ class LogicalOr implements OrInterface
      */
     public function collectBoundVariableNames(&$boundVariables)
     {
-        $this->constraint1->collectBoundVariablenames($boundVariables);
-        $this->constraint2->collectBoundVariablenames($boundVariables);
+        $this->constraint1->collectBoundVariableNames($boundVariables);
+        $this->constraint2->collectBoundVariableNames($boundVariables);
     }
 
     /**
index e167d8f..2472fc1 100644 (file)
@@ -408,7 +408,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallBack(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = array(
             'Controller1' => array(
@@ -435,7 +435,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallBack(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = array(
             'Controller1' => array(
@@ -462,7 +462,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallBack(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = array();
         $actualResult = $mergedConfiguration['controllerConfiguration'];
@@ -486,7 +486,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallBack(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = array(
             'Controller1' => array(
index cceb4da..1100304 100644 (file)
@@ -419,7 +419,7 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setDirectoryOperationAllowedSetsDirectoryOperationAllowed()
     {
         $this->subject->setFileOperationPermissions(0);
-        $this->subject->setDirectoryoperationAllowed(true);
+        $this->subject->setDirectoryOperationAllowed(true);
         $this->assertTrue($this->subject->isDirectoryOperationAllowed());
     }
 
index 30bf1a3..136360c 100644 (file)
@@ -136,7 +136,7 @@ class ExtensionListUtility implements \SplObserver
         }
         $zlibStream = 'compress.zlib://';
         $this->sumRecords = 0;
-        $this->parser->parseXML($zlibStream . $localExtensionListFile);
+        $this->parser->parseXml($zlibStream . $localExtensionListFile);
         // flush last rows to database if existing
         if (!empty($this->arrRows)) {
             $GLOBALS['TYPO3_DB']->exec_INSERTmultipleRows('tx_extensionmanager_domain_model_extension', self::$fieldNames, $this->arrRows, self::$fieldIndicesNoQuote);
index 9d34f06..0981d76 100644 (file)
@@ -496,7 +496,7 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
      */
     public function importStaticSql($rawDefinitions)
     {
-        $statements = $this->installToolSqlParser->getStatementarray($rawDefinitions, 1);
+        $statements = $this->installToolSqlParser->getStatementArray($rawDefinitions, 1);
         list($statementsPerTable, $insertCount) = $this->installToolSqlParser->getCreateTables($statements, 1);
         $db = $this->getDatabaseConnection();
         // Traverse the tables
index 0fa0011..a63cbc3 100644 (file)
@@ -110,7 +110,7 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
             'this.blur();' .
             'vHWin=window.open(' .
                 GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_colorpicker', array('P' => $params))) . ' + \'&P[currentValue]=\' + encodeURIComponent(document.getElementById(' . GeneralUtility::quoteJSvalue($elementId) . ').value),' .
-                '\'popUpem-' . GeneralUtility::shortmd5($elementName) . '\',' .
+                '\'popUpem-' . GeneralUtility::shortMD5($elementName) . '\',' .
                 '\'height=400,width=400,status=0,menubar=0,scrollbars=1\'' .
             ');' .
             'vHWin.focus();' .
index 8d6a55d..01bcce3 100644 (file)
@@ -414,7 +414,7 @@ class FileList extends AbstractRecordList
                 }
             }
 
-            $out .= '<thead>' . $this->addelement(1, '', $theData, '', '', '', 'th') . '</thead>';
+            $out .= '<thead>' . $this->addElement(1, '', $theData, '', '', '', 'th') . '</thead>';
             $out .= '<tbody>' . $iOut . '</tbody>';
             // half line is drawn
             // finish
@@ -559,7 +559,7 @@ class FileList extends AbstractRecordList
                     }
                 }
             }
-            $out .= $this->addelement(1, $theIcon, $theData);
+            $out .= $this->addElement(1, $theIcon, $theData);
         }
         return $out;
     }
@@ -763,7 +763,7 @@ class FileList extends AbstractRecordList
                         }
                 }
             }
-            $out .= $this->addelement(1, $theIcon, $theData);
+            $out .= $this->addElement(1, $theIcon, $theData);
         }
         return $out;
     }
@@ -846,7 +846,7 @@ class FileList extends AbstractRecordList
         $cells = array();
         $fullIdentifier = $fileOrFolderObject->getCombinedIdentifier();
         $fullName = $fileOrFolderObject->getName();
-        $md5 = GeneralUtility::shortmd5($fullIdentifier);
+        $md5 = GeneralUtility::shortMD5($fullIdentifier);
         // For normal clipboard, add copy/cut buttons:
         if ($this->clipObj->current === 'normal') {
             $isSel = $this->clipObj->isSelected('_FILE', $md5);
index fb88a33..7716b3a 100644 (file)
@@ -53,8 +53,8 @@ class StandaloneView extends AbstractTemplateView
 
         /** @var WebRequest $request */
         $request = $this->objectManager->get(WebRequest::class);
-        $request->setRequestURI(GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
-        $request->setBaseURI(GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
+        $request->setRequestUri(GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
+        $request->setBaseUri(GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
         /** @var UriBuilder $uriBuilder */
         $uriBuilder = $this->objectManager->get(UriBuilder::class);
         $uriBuilder->setRequest($request);
index c8a873c..a0ad3e4 100644 (file)
@@ -369,7 +369,7 @@ class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewH
     protected function renderRequestHashField()
     {
         $formFieldNames = $this->viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'formFieldNames');
-        $this->postProcessUriArgumentsForRequesthash($this->formActionUriArguments, $formFieldNames);
+        $this->postProcessUriArgumentsForRequestHash($this->formActionUriArguments, $formFieldNames);
         $requestHash = $this->requestHashService->generateRequestHash($formFieldNames, $this->getFieldNamePrefix());
         // in v4, we need to prefix __hmac as well to make it show up in the request object.
         return '<input type="hidden" name="' . $this->prefixFieldName('__hmac') . '" value="' . htmlspecialchars($requestHash) . '" />';
index 2343c44..e6d798e 100644 (file)
@@ -277,7 +277,7 @@ class FormBuilder
             ));
         } else {
             $this->setAttributes($elementBuilder, $element, $userConfiguredElementTypoScript);
-            $userConfiguredElementTypoScript = $elementBuilder->getUserConfiguredElementTypoScript();
+            $userConfiguredElementTypoScript = $elementBuilder->getUserConfiguredElementTyposcript();
             $this->setValidationMessages($element);
 
             $this->signalSlotDispatcher->dispatch(
@@ -386,7 +386,7 @@ class FormBuilder
         $elementBuilder->setViewHelperDefaulArgumentsToAdditionalArguments();
         $elementBuilder->moveAllOtherUserdefinedPropertiesToAdditionalArguments();
         $htmlAttributes = $elementBuilder->getHtmlAttributes();
-        $userConfiguredElementTypoScript = $elementBuilder->getUserConfiguredElementTypoScript();
+        $userConfiguredElementTypoScript = $elementBuilder->getUserConfiguredElementTyposcript();
         $additionalArguments = $elementBuilder->getAdditionalArguments();
         $element->setHtmlAttributes($htmlAttributes);
         $additionalArguments = $this->typoScriptService->convertTypoScriptArrayToPlainArray($additionalArguments);
index ffe15de..62d17e5 100644 (file)
@@ -1497,7 +1497,7 @@ class ContentObjectRenderer
             $extension = $fileInfo['fileext'];
             if ($extension === 'jpg' || $extension === 'jpeg' || $extension === 'gif' || $extension === 'png') {
                 $imgFile = $incFile;
-                $imgInfo = @getImageSize($imgFile);
+                $imgInfo = @getimagesize($imgFile);
                 return '<img src="' . $tsfe->absRefPrefix . $imgFile . '" width="' . (int)$imgInfo[0] . '" height="' . (int)$imgInfo[1] . '"' . $this->getBorderAttr(' border="0"') . ' ' . $addParams . ' />';
             } elseif (filesize($incFile) < 1024 * 1024) {
                 return $tsfe->tmpl->fileContent($incFile);
@@ -4843,7 +4843,7 @@ class ContentObjectRenderer
                     if (GeneralUtility::inList($allowTags, $tag[0]) || $denyTags != '*' && !GeneralUtility::inList($denyTags, $tag[0])) {
                         $contentAccum[$contentAccumP] .= $data;
                     } else {
-                        $contentAccum[$contentAccumP] .= HTMLSpecialChars($data);
+                        $contentAccum[$contentAccumP] .= htmlspecialchars($data);
                     }
                 }
                 $inside = false;
index d4c6a2b..88f8725 100644 (file)
@@ -591,7 +591,7 @@ abstract class AbstractMenuContentObject
                     $menuItems = $this->prepareMenuItemsForRootlineMenu();
                     break;
                 case 'browse':
-                    $menuItems = $this->prepareMenuitemsForBrowseMenu($value, $alternativeSortingField, $additionalWhere);
+                    $menuItems = $this->prepareMenuItemsForBrowseMenu($value, $alternativeSortingField, $additionalWhere);
                     break;
             }
             if ($this->mconf['sectionIndex']) {
index cffab2c..297a040 100644 (file)
@@ -2370,7 +2370,7 @@ class TypoScriptFrontendController
                     if ($debugCacheTime) {
                         $dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'];
                         $timeFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'];
-                        $this->content .= LF . '<!-- Cached page generated ' . date(($dateFormat . ' ' . $timeFormat), $row['tstamp']) . '. Expires ' . Date(($dateFormat . ' ' . $timeFormat), $row['expires']) . ' -->';
+                        $this->content .= LF . '<!-- Cached page generated ' . date(($dateFormat . ' ' . $timeFormat), $row['tstamp']) . '. Expires ' . date(($dateFormat . ' ' . $timeFormat), $row['expires']) . ' -->';
                     }
                 }
                 $this->getTimeTracker()->pull();
index d40e665..a30ed65 100644 (file)
@@ -394,8 +394,8 @@ class GifBuilder extends GraphicalFunctions
         } else {
             // Fill the background with the given color
             $BGcols = $this->convertColor($this->setup['backColor']);
-            $Bcolor = ImageColorAllocate($this->im, $BGcols[0], $BGcols[1], $BGcols[2]);
-            ImageFilledRectangle($this->im, 0, 0, $XY[0], $XY[1], $Bcolor);
+            $Bcolor = imagecolorallocate($this->im, $BGcols[0], $BGcols[1], $BGcols[2]);
+            imagefilledrectangle($this->im, 0, 0, $XY[0], $XY[1], $Bcolor);
         }
         // Traverse the GIFBUILDER objects an render each one:
         if (is_array($this->setup)) {
@@ -515,7 +515,7 @@ class GifBuilder extends GraphicalFunctions
         if (!$this->saveAlphaLayer) {
             if ($this->setup['transparentBackground']) {
                 // Auto transparent background is set
-                $Bcolor = ImageColorClosest($this->im, $BGcols[0], $BGcols[1], $BGcols[2]);
+                $Bcolor = imagecolorclosest($this->im, $BGcols[0], $BGcols[1], $BGcols[2]);
                 imagecolortransparent($this->im, $Bcolor);
             } elseif (is_array($this->setup['transparentColor_array'])) {
                 // Multiple transparent colors are set. This is done via the trick that all transparent colors get
index f8f4884..01e84d5 100644 (file)
@@ -531,12 +531,12 @@ class PageGenerator
                 } else {
                     $namespace = PageRenderer::JQUERY_NAMESPACE_NONE;
                 }
-                $pageRenderer->loadJQuery($version, $source, $namespace);
+                $pageRenderer->loadJquery($version, $source, $namespace);
             }
             if ($tsfe->pSetup['javascriptLibs.']['ExtJs']) {
                 $css = (bool)$tsfe->pSetup['javascriptLibs.']['ExtJs.']['css'];
                 $theme = (bool)$tsfe->pSetup['javascriptLibs.']['ExtJs.']['theme'];
-                $pageRenderer->loadExtJs($css, $theme);
+                $pageRenderer->loadExtJS($css, $theme);
                 if ($tsfe->pSetup['javascriptLibs.']['ExtJs.']['debug']) {
                     $pageRenderer->enableExtJsDebug();
                 }
index 6b34b79..72c7b21 100644 (file)
@@ -498,9 +498,9 @@ class ImportExportController extends BaseScriptClass
             // Export for download:
             if ($inData['download_export']) {
                 $mimeType = 'application/octet-stream';
-                Header('Content-Type: ' . $mimeType);
-                Header('Content-Length: ' . strlen($out));
-                Header('Content-Disposition: attachment; filename=' . basename($dlFile));
+                header('Content-Type: ' . $mimeType);
+                header('Content-Length: ' . strlen($out));
+                header('Content-Disposition: attachment; filename=' . basename($dlFile));
                 echo $out;
                 die;
             }
index cb7b949..d642de5 100644 (file)
@@ -217,7 +217,7 @@ class CoreUpdateService
 
             if (!$this->checkCoreFilesAvailable($version)) {
                 // Explicit write check to upper directory of current core location
-                $coreLocation = @realPath($this->symlinkToCoreFiles . '/../');
+                $coreLocation = @realpath($this->symlinkToCoreFiles . '/../');
                 $file = $coreLocation . '/' . StringUtility::getUniqueId('install-core-update-test-');
                 $result = @touch($file);
                 if (!$result) {
@@ -435,7 +435,7 @@ class CoreUpdateService
             $messages[] = $message;
         } else {
             $downloadedCoreLocation = $this->downloadTargetPath . 'typo3_src-' . $version;
-            $newCoreLocation = @realPath($this->symlinkToCoreFiles . '/../') . '/typo3_src-' . $version;
+            $newCoreLocation = @realpath($this->symlinkToCoreFiles . '/../') . '/typo3_src-' . $version;
 
             if (!@is_dir($downloadedCoreLocation)) {
                 $success = false;
@@ -471,7 +471,7 @@ class CoreUpdateService
      */
     public function activateVersion($version)
     {
-        $newCoreLocation = @realPath($this->symlinkToCoreFiles . '/../') . '/typo3_src-' . $version;
+        $newCoreLocation = @realpath($this->symlinkToCoreFiles . '/../') . '/typo3_src-' . $version;
 
         $messages = array();
         $success = true;
@@ -555,7 +555,7 @@ class CoreUpdateService
      */
     protected function checkCoreFilesAvailable($version)
     {
-        $newCoreLocation = @realPath($this->symlinkToCoreFiles . '/../') . '/typo3_src-' . $version;
+        $newCoreLocation = @realpath($this->symlinkToCoreFiles . '/../') . '/typo3_src-' . $version;
         return @is_dir($newCoreLocation);
     }
 }
index cd1b29a..6b1599b 100644 (file)
@@ -34,7 +34,7 @@ class FileLinktype extends AbstractLinktype
      */
     public function fetchType($value, $type, $key)
     {
-        if (StringUtility::beginswith(strtolower($value['tokenValue']), 'file:')) {
+        if (StringUtility::beginsWith(strtolower($value['tokenValue']), 'file:')) {
             $type = 'file';
         }
         return $type;
index fa99caf..1055573 100644 (file)
@@ -91,7 +91,7 @@ Cleaning XML for FlexForm fields.
                         if ($echoLevel > 2) {
                             echo ' was DIRTY, needs cleanup!';
                         }
-                        $this->cleanFlexForm_dirtyFields[\TYPO3\CMS\Core\Utility\GeneralUtility::shortMd5($tableName . ':' . $uid . ':' . $colName)] = $tableName . ':' . $uid . ':' . $colName;
+                        $this->cleanFlexForm_dirtyFields[\TYPO3\CMS\Core\Utility\GeneralUtility::shortMD5($tableName . ':' . $uid . ':' . $colName)] = $tableName . ':' . $uid . ':' . $colName;
                     } else {
                         if ($echoLevel > 2) {
                             echo ' was CLEAN';
index 998cb9f..b1b267f 100644 (file)
@@ -117,7 +117,7 @@ This will check the system for double files relations.';
         foreach ($resultArray['dirname_registry'] as $dir => $temp) {
             ksort($resultArray['dirname_registry'][$dir]);
             if (!\TYPO3\CMS\Core\Utility\GeneralUtility::isFirstPartOfStr($dir, 'uploads/')) {
-                $resultArray['warnings'][\TYPO3\CMS\Core\Utility\GeneralUtility::shortmd5($dir)] = 'Directory "' . $dir . '" was outside uploads/ which is unusual practice in TYPO3 although not forbidden. Directory used by the following table:field pairs: ' . implode(',', array_keys($temp));
+                $resultArray['warnings'][\TYPO3\CMS\Core\Utility\GeneralUtility::shortMD5($dir)] = 'Directory "' . $dir . '" was outside uploads/ which is unusual practice in TYPO3 although not forbidden. Directory used by the following table:field pairs: ' . implode(',', array_keys($temp));
             }
         }
         return $resultArray;
index 8c08c1f..20d2bdb 100644 (file)
@@ -95,7 +95,7 @@ Will report lost files.';
                     $include = false;
                 }
             }
-            $shortKey = \TYPO3\CMS\Core\Utility\GeneralUtility::shortmd5($value);
+            $shortKey = \TYPO3\CMS\Core\Utility\GeneralUtility::shortMD5($value);
             if ($include) {
                 // First, allow "index.html", ".htaccess" files since they are often used for good reasons
                 if (substr($value, -11) == '/index.html' || substr($value, -10) == '/.htaccess') {
index 3fbfa9c..043249d 100644 (file)
@@ -90,7 +90,7 @@ Automatic Repair:
                 );
                 foreach ($placeHolders as $phrec) {
                     if (count(BackendUtility::selectVersionsOfRecord($table, $phrec['uid'], 'uid', '*', null)) <= 1) {
-                        $resultArray['versions_unused_placeholders'][GeneralUtility::shortmd5($table . ':' . $phrec['uid'])] = $table . ':' . $phrec['uid'];
+                        $resultArray['versions_unused_placeholders'][GeneralUtility::shortMD5($table . ':' . $phrec['uid'])] = $table . ':' . $phrec['uid'];
                     }
                 }
             }
@@ -107,7 +107,7 @@ Automatic Repair:
                     't3ver_state=' . new VersionState(VersionState::MOVE_PLACEHOLDER) . ' AND pid>=0' . BackendUtility::deleteClause($table)
                 );
                 foreach ($placeHolders as $phrec) {
-                    $shortID = GeneralUtility::shortmd5($table . ':' . $phrec['uid']);
+                    $shortID = GeneralUtility::shortMD5($table . ':' . $phrec['uid']);
                     if ((int)$phrec['t3ver_wsid'] != 0) {
                         $phrecCopy = $phrec;
                         if (BackendUtility::movePlhOL($table, $phrec)) {
index 39fb568..20f3edc 100644 (file)
@@ -151,7 +151,7 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn
             return '';
         }
         $link = '<p><a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('setTempDBmount' => 0))) . '" class="btn btn-primary">'
-            . $this->getLanguageService()->sl('LLL:EXT:lang/locallang_core.xlf:labels.temporaryDBmount', true) . '</a></p>';
+            . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.temporaryDBmount', true) . '</a></p>';
 
         return $link;
     }
index e06b064..fac0d98 100644 (file)
@@ -86,7 +86,7 @@ class ConfigurationStatus implements StatusProviderInterface
             $value = $this->getLanguageService()->getLL('status_empty');
             $severity = ReportStatus::WARNING;
             $url =  BackendUtility::getModuleUrl('system_dbint') . '&id=0&SET[function]=refindex';
-            $message = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.backend_reference_index'), '<a href="' . htmlspecialchars($url) . '">', '</a>', BackendUtility::dateTime($lastRefIndexUpdate));
+            $message = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.backend_reference_index'), '<a href="' . htmlspecialchars($url) . '">', '</a>', BackendUtility::datetime($lastRefIndexUpdate));
         }
         return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_referenceIndex'), $value, $message, $severity);
     }
index 6ffe289..2864877 100644 (file)
@@ -58,7 +58,7 @@ class IconViewHelper extends AbstractBackendViewHelper
         $title = $arguments['title'];
 
         if (!empty($icon)) {
-            $absIconPath = GeneralUtility::getFileAbsFilename($icon);
+            $absIconPath = GeneralUtility::getFileAbsFileName($icon);
             if (file_exists($absIconPath)) {
                 $icon = '../' . str_replace(PATH_site, '', $absIconPath);
             }
index 51783b9..55503dc 100644 (file)
@@ -210,7 +210,7 @@ class BlowfishSalt extends Md5Salt
         }
         // Check whether the iteration count used differs from the standard number.
         $countLog2 = $this->getCountLog2($saltedPW);
-        return !is_NULL($countLog2) && $countLog2 < $this->getHashCount();
+        return !is_null($countLog2) && $countLog2 < $this->getHashCount();
     }
 
     /**
@@ -272,7 +272,7 @@ class BlowfishSalt extends Md5Salt
      */
     public function setHashCount($hashCount = null)
     {
-        self::$hashCount = !is_NULL($hashCount) && is_int($hashCount) && $hashCount >= $this->getMinHashCount() && $hashCount <= $this->getMaxHashCount() ? $hashCount : self::HASH_COUNT;
+        self::$hashCount = !is_null($hashCount) && is_int($hashCount) && $hashCount >= $this->getMinHashCount() && $hashCount <= $this->getMaxHashCount() ? $hashCount : self::HASH_COUNT;
     }
 
     /**
@@ -285,7 +285,7 @@ class BlowfishSalt extends Md5Salt
      */
     public function setMaxHashCount($maxHashCount = null)
     {
-        self::$maxHashCount = !is_NULL($maxHashCount) && is_int($maxHashCount) ? $maxHashCount : self::MAX_HASH_COUNT;
+        self::$maxHashCount = !is_null($maxHashCount) && is_int($maxHashCount) ? $maxHashCount : self::MAX_HASH_COUNT;
     }
 
     /**
@@ -298,6 +298,6 @@ class BlowfishSalt extends Md5Salt
      */
     public function setMinHashCount($minHashCount = null)
     {
-        self::$minHashCount = !is_NULL($minHashCount) && is_int($minHashCount) ? $minHashCount : self::MIN_HASH_COUNT;
+        self::$minHashCount = !is_null($minHashCount) && is_int($minHashCount) ? $minHashCount : self::MIN_HASH_COUNT;
     }
 }
index 294af8b..92a5e16 100644 (file)
@@ -371,7 +371,7 @@ class PhpassSalt extends AbstractSalt implements SaltInterface
      */
     public function setHashCount($hashCount = null)
     {
-        self::$hashCount = !is_NULL($hashCount) && is_int($hashCount) && $hashCount >= $this->getMinHashCount() && $hashCount <= $this->getMaxHashCount() ? $hashCount : self::HASH_COUNT;
+        self::$hashCount = !is_null($hashCount) && is_int($hashCount) && $hashCount >= $this->getMinHashCount() && $hashCount <= $this->getMaxHashCount() ? $hashCount : self::HASH_COUNT;
     }
 
     /**
@@ -384,7 +384,7 @@ class PhpassSalt extends AbstractSalt implements SaltInterface
      */
     public function setMaxHashCount($maxHashCount = null)
     {
-        self::$maxHashCount = !is_NULL($maxHashCount) && is_int($maxHashCount) ? $maxHashCount : self::MAX_HASH_COUNT;
+        self::$maxHashCount = !is_null($maxHashCount) && is_int($maxHashCount) ? $maxHashCount : self::MAX_HASH_COUNT;
     }
 
     /**
@@ -397,6 +397,6 @@ class PhpassSalt extends AbstractSalt implements SaltInterface
      */
     public function setMinHashCount($minHashCount = null)
     {
-        self::$minHashCount = !is_NULL($minHashCount) && is_int($minHashCount) ? $minHashCount : self::MIN_HASH_COUNT;
+        self::$minHashCount = !is_null($minHashCount) && is_int($minHashCount) ? $minHashCount : self::MIN_HASH_COUNT;
     }
 }
index b225277..d539e90 100644 (file)
@@ -513,7 +513,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                 $this->addMessage($this->getLanguageService()->getLL('msg.maynotDeleteRunningTask'), FlashMessage::ERROR);
             } else {
                 if ($this->scheduler->removeTask($task)) {
-                    $this->getBackendUser()->writeLog(4, 0, 0, 0, 'Scheduler task "%s" (UID: %s, Class: "%s") was deleted', array($task->getTaskTitle(), $task->getTaskUid(), $task->getTaskClassName()));
+                    $this->getBackendUser()->writelog(4, 0, 0, 0, 'Scheduler task "%s" (UID: %s, Class: "%s") was deleted', array($task->getTaskTitle(), $task->getTaskUid(), $task->getTaskClassName()));
                     $this->addMessage($this->getLanguageService()->getLL('msg.deleteSuccess'));
                 } else {
                     $this->addMessage($this->getLanguageService()->getLL('msg.deleteError'), FlashMessage::ERROR);
@@ -1287,7 +1287,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
             // Save to database
             $result = $this->scheduler->saveTask($task);
             if ($result) {
-                $this->getBackendUser()->writeLog(4, 0, 0, 0, 'Scheduler task "%s" (UID: %s, Class: "%s") was updated', array($task->getTaskTitle(), $task->getTaskUid(), $task->getTaskClassName()));
+                $this->getBackendUser()->writelog(4, 0, 0, 0, 'Scheduler task "%s" (UID: %s, Class: "%s") was updated', array($task->getTaskTitle(), $task->getTaskUid(), $task->getTaskClassName()));
                 $this->addMessage($this->getLanguageService()->getLL('msg.updateSuccess'));
             } else {
                 $this->addMessage($this->getLanguageService()->getLL('msg.updateError'), FlashMessage::ERROR);
@@ -1321,7 +1321,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
             // Add to database
             $result = $this->scheduler->addTask($task);
             if ($result) {
-                $this->getBackendUser()->writeLog(4, 0, 0, 0, 'Scheduler task "%s" (UID: %s, Class: "%s") was added', array($task->getTaskTitle(), $task->getTaskUid(), $task->getTaskClassName()));
+                $this->getBackendUser()->writelog(4, 0, 0, 0, 'Scheduler task "%s" (UID: %s, Class: "%s") was added', array($task->getTaskTitle(), $task->getTaskUid(), $task->getTaskClassName()));
                 $this->addMessage($this->getLanguageService()->getLL('msg.addSuccess'));
 
                 // set the uid of the just created task so that we
index 2b3b049..1cb869f 100644 (file)
@@ -197,7 +197,7 @@ class PreviewHook implements \TYPO3\CMS\Core\SingletonInterface
                         if (GeneralUtility::_GP($this->previewKey)) {
                             // Lifetime is 1 hour, does it matter much?
                             // Requires the user to click the link from their email again if it expires.
-                            SetCookie($this->previewKey, GeneralUtility::_GP($this->previewKey), 0, GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'));
+                            setcookie($this->previewKey, GeneralUtility::_GP($this->previewKey), 0, GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'));
                         }
                         return $previewConfig;
                     } elseif (GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'index.php?' . $this->previewKey . '=' . $inputCode === GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL')) {
index e43691f..df60adc 100644 (file)
@@ -11,7 +11,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['postBeUser']['v
 
 if (TYPO3_MODE === 'BE') {
     // add default notification options to every page
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSconfig('
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
        tx_version.workspaces.stageNotificationEmail.subject = LLL:EXT:version/Resources/Private/Language/locallang_emails.xlf:subject
        tx_version.workspaces.stageNotificationEmail.message = LLL:EXT:version/Resources/Private/Language/locallang_emails.xlf:message
        # tx_version.workspaces.stageNotificationEmail.additionalHeaders =
index 9fbb3aa..c872bb6 100644 (file)
@@ -108,7 +108,7 @@ class HistoryService implements \TYPO3\CMS\Core\SingletonInterface
                     );
                     if (!empty($fieldDifferences)) {
                         $differences[] = array(
-                            'label' => $this->getLanguageService()->sl((string)BackendUtility::getItemLabel($tableName, $field)),
+                            'label' => $this->getLanguageService()->sL((string)BackendUtility::getItemLabel($tableName, $field)),
                             'html' => nl2br(trim($fieldDifferences)),
                         );
                     }