diff --git a/Classes/Service/AssetService.php b/Classes/Service/AssetService.php index cfd05c7dd..d2eb1a4e9 100644 --- a/Classes/Service/AssetService.php +++ b/Classes/Service/AssetService.php @@ -279,9 +279,9 @@ protected function buildAssetsChunk(array $assets): string $chunk = []; foreach ($spooledAssets as $name => $asset) { $assetSettings = $this->extractAssetSettings($asset); - $standalone = (boolean) $assetSettings['standalone']; - $external = (boolean) $assetSettings['external']; - $rewrite = (boolean) $assetSettings['rewrite']; + $standalone = (bool) $assetSettings['standalone']; + $external = (bool) $assetSettings['external']; + $rewrite = (bool) $assetSettings['rewrite']; $path = $assetSettings['path']; if (!$standalone) { $chunk[$name] = $asset; @@ -674,7 +674,7 @@ protected function assertAssetAllowedInFooter($asset): bool if ($asset instanceof AssetInterface) { return $asset->assertAllowedInFooter(); } - return (boolean) ($asset['movable'] ?? true); + return (bool) ($asset['movable'] ?? true); } /** diff --git a/Classes/Service/PageService.php b/Classes/Service/PageService.php index 527da1bdf..774f07a99 100644 --- a/Classes/Service/PageService.php +++ b/Classes/Service/PageService.php @@ -43,7 +43,7 @@ public function getMenu( ): array { $pageRepository = $this->getPageRepository(); $pageConstraints = $this->getPageConstraints($excludePages, $includeNotInMenu, $includeMenuSeparator); - $cacheKey = md5($pageUid . $pageConstraints . (integer) $disableGroupAccessCheck); + $cacheKey = md5($pageUid . $pageConstraints . (int) $disableGroupAccessCheck); if (!isset(static::$cachedMenus[$cacheKey])) { if ($disableGroupAccessCheck && version_compare(VersionNumberUtility::getCurrentTypo3Version(), '12.1', '<=') @@ -65,7 +65,7 @@ function ($page) use ($includeNotInMenu) { public function getPage(int $pageUid, bool $disableGroupAccessCheck = false): array { - $cacheKey = md5($pageUid . (integer) $disableGroupAccessCheck); + $cacheKey = md5($pageUid . (int) $disableGroupAccessCheck); if (!isset(static::$cachedPages[$cacheKey])) { static::$cachedPages[$cacheKey] = $this->getPageRepository()->getPage($pageUid, $disableGroupAccessCheck); } @@ -140,7 +140,7 @@ public function hidePageForLanguageUid($page = null, int $languageUid = -1, bool $pageUid = $page['uid']; $pageRecord = $page; } else { - $pageUid = (0 === (integer) $page) ? $GLOBALS['TSFE']->id : (integer) $page; + $pageUid = (0 === (int) $page) ? $GLOBALS['TSFE']->id : (int) $page; $pageRecord = $this->getPage($pageUid); } if (-1 === $languageUid) { @@ -165,8 +165,8 @@ public function hidePageForLanguageUid($page = null, int $languageUid = -1, bool $hideIfNotTranslated = $visibilityBitSet->shouldHideTranslationIfNoTranslatedRecordExists(); $hideIfDefaultLanguage = $visibilityBitSet->shouldBeHiddenInDefaultLanguage(); } else { - $hideIfNotTranslated = (boolean) GeneralUtility::hideIfNotTranslated($l18nCfg); - $hideIfDefaultLanguage = (boolean) GeneralUtility::hideIfDefaultLanguage($l18nCfg); + $hideIfNotTranslated = (bool) GeneralUtility::hideIfNotTranslated($l18nCfg); + $hideIfDefaultLanguage = (bool) GeneralUtility::hideIfDefaultLanguage($l18nCfg); } $pageOverlay = []; @@ -184,7 +184,7 @@ public function hidePageForLanguageUid($page = null, int $languageUid = -1, bool public function getItemLink(array $page, bool $forceAbsoluteUrl = false): string { $parameter = $page['uid']; - if ((integer) $page['doktype'] === PageRepository::DOKTYPE_LINK) { + if ((int) $page['doktype'] === PageRepository::DOKTYPE_LINK) { $redirectTo = $page['url'] ?? ''; if (!empty($redirectTo)) { $uI = parse_url($redirectTo); @@ -212,7 +212,7 @@ public function getItemLink(array $page, bool $forceAbsoluteUrl = false): string public function isAccessProtected(array $page): bool { - return (0 !== (integer) $page['fe_group']); + return (0 !== (int) $page['fe_group']); } public function isAccessGranted(array $page): bool @@ -235,14 +235,14 @@ public function isAccessGranted(array $page): bool public function isCurrent(int $pageUid): bool { - return ($pageUid === (integer) $GLOBALS['TSFE']->id); + return ($pageUid === (int) $GLOBALS['TSFE']->id); } public function isActive(int $pageUid): bool { $rootLineData = $this->getRootLine(); foreach ($rootLineData as $page) { - if ((integer) $page['uid'] === $pageUid) { + if ((int) $page['uid'] === $pageUid) { return true; } } @@ -252,9 +252,9 @@ public function isActive(int $pageUid): bool public function shouldUseShortcutTarget(array $arguments): bool { - $useShortcutTarget = (boolean) $arguments['useShortcutData']; + $useShortcutTarget = (bool) $arguments['useShortcutData']; if (array_key_exists('useShortcutTarget', $arguments)) { - $useShortcutTarget = (boolean) $arguments['useShortcutTarget']; + $useShortcutTarget = (bool) $arguments['useShortcutTarget']; } return $useShortcutTarget; @@ -262,9 +262,9 @@ public function shouldUseShortcutTarget(array $arguments): bool public function shouldUseShortcutUid(array $arguments): bool { - $useShortcutUid = (boolean) $arguments['useShortcutData']; + $useShortcutUid = (bool) $arguments['useShortcutData']; if (array_key_exists('useShortcutUid', $arguments)) { - $useShortcutUid = (boolean) $arguments['useShortcutUid']; + $useShortcutUid = (bool) $arguments['useShortcutUid']; } return $useShortcutUid; @@ -277,7 +277,7 @@ public function shouldUseShortcutUid(array $arguments): bool */ public function getShortcutTargetPage(array $page): ?array { - $dokType = (integer) ($page['doktype'] ?? PageRepository::DOKTYPE_DEFAULT); + $dokType = (int) ($page['doktype'] ?? PageRepository::DOKTYPE_DEFAULT); if ($dokType !== PageRepository::DOKTYPE_SHORTCUT) { return null; } diff --git a/Classes/Traits/SlideViewHelperTrait.php b/Classes/Traits/SlideViewHelperTrait.php index 3b2a3d176..092c75403 100644 --- a/Classes/Traits/SlideViewHelperTrait.php +++ b/Classes/Traits/SlideViewHelperTrait.php @@ -81,7 +81,7 @@ protected function getSlideRecords(int $pageUid, ?int $limit = null): array $limit = $limit ?? $this->arguments['limit']; /** @var int $slide */ $slide = $this->arguments['slide']; - $slideCollectReverse = (boolean) $this->arguments['slideCollectReverse']; + $slideCollectReverse = (bool) $this->arguments['slideCollectReverse']; /** @var int $slideCollect */ $slideCollect = $this->arguments['slideCollect']; @@ -106,14 +106,14 @@ protected function getSlideRecords(int $pageUid, ?int $limit = null): array $storagePageUids = []; foreach ($rootLine as $page) { - $storagePageUids[] = (integer) $page['uid']; + $storagePageUids[] = (int) $page['uid']; } // select records, respecting slide and slideCollect. $records = []; $limitRemaining = $limit; while (!empty($storagePageUids) && ($limitRemaining > 0 || !$limit)) { - $storagePageUid = (integer) array_shift($storagePageUids); + $storagePageUid = (int) array_shift($storagePageUids); $recordsFromPageUid = $this->getSlideRecordsFromPage($storagePageUid, $limitRemaining); $numberOfReturnedRecords = count($recordsFromPageUid); if ($numberOfReturnedRecords > $limitRemaining && $limitRemaining !== null) { diff --git a/Classes/Traits/SourceSetViewHelperTrait.php b/Classes/Traits/SourceSetViewHelperTrait.php index 223e95107..e296ae40e 100644 --- a/Classes/Traits/SourceSetViewHelperTrait.php +++ b/Classes/Traits/SourceSetViewHelperTrait.php @@ -37,7 +37,7 @@ public function addSourceSet(TagBuilder $tag, string $src): array $quality = $this->arguments['quality']; /** @var string|null $crop */ $crop = $this->arguments['crop']; - $treatIdAsReference = (boolean) $this->arguments['treatIdAsReference']; + $treatIdAsReference = (bool) $this->arguments['treatIdAsReference']; if ($treatIdAsReference) { /** @var string $src */ $src = $this->arguments['src']; diff --git a/Classes/Traits/TagViewHelperTrait.php b/Classes/Traits/TagViewHelperTrait.php index aa5b66e5a..66461cb33 100644 --- a/Classes/Traits/TagViewHelperTrait.php +++ b/Classes/Traits/TagViewHelperTrait.php @@ -143,7 +143,7 @@ protected function renderTag( array $nonEmptyAttributes = ['id', 'class'] ): string { $trimmedContent = trim((string) $content); - $forceClosingTag = (boolean) ($this->arguments['forceClosingTag'] ?? false); + $forceClosingTag = (bool) ($this->arguments['forceClosingTag'] ?? false); if (empty($trimmedContent) && ($this->arguments['hideIfEmpty'] ?? false)) { return ''; } diff --git a/Classes/Utility/ErrorUtility.php b/Classes/Utility/ErrorUtility.php index 4d4e385d0..4a6e6aea3 100644 --- a/Classes/Utility/ErrorUtility.php +++ b/Classes/Utility/ErrorUtility.php @@ -22,6 +22,6 @@ public static function throwViewHelperException( ?int $code = null, ?\Throwable $previous = null ): void { - throw new Exception((string) $message, (integer) $code, $previous); + throw new Exception((string) $message, (int) $code, $previous); } } diff --git a/Classes/ViewHelpers/Condition/Iterator/ContainsViewHelper.php b/Classes/ViewHelpers/Condition/Iterator/ContainsViewHelper.php index 484201794..2e957d173 100644 --- a/Classes/ViewHelpers/Condition/Iterator/ContainsViewHelper.php +++ b/Classes/ViewHelpers/Condition/Iterator/ContainsViewHelper.php @@ -113,7 +113,7 @@ protected static function assertHaystackIsQueryResultAndHasNeedle($haystack, $ne * @var DomainObjectInterface $candidate */ foreach ($haystack as $index => $candidate) { - if ($candidate->getUid() === (integer) $needle) { + if ($candidate->getUid() === (int) $needle) { return $index; } } @@ -129,12 +129,12 @@ protected static function assertHaystackIsObjectStorageAndHasNeedle($haystack, $ { $index = 0; if ($needle instanceof DomainObjectInterface) { - $needle = (integer) $needle->getUid(); + $needle = (int) $needle->getUid(); } /** @var DomainObjectInterface $candidate */ foreach ($haystack as $candidate) { - if ($candidate->getUid() === (integer) $needle) { + if ($candidate->getUid() === (int) $needle) { return $index; } $index++; @@ -160,7 +160,7 @@ protected static function assertHaystackIsArrayAndHasNeedle($haystack, $needle, return $result; } else { foreach ($haystack as $index => $straw) { - if ((integer) $straw->getUid() === (integer) $needle->getUid()) { + if ((int) $straw->getUid() === (int) $needle->getUid()) { return $index; } } diff --git a/Classes/ViewHelpers/Condition/Page/HasSubpagesViewHelper.php b/Classes/ViewHelpers/Condition/Page/HasSubpagesViewHelper.php index 317553ad1..8877cc75a 100644 --- a/Classes/ViewHelpers/Condition/Page/HasSubpagesViewHelper.php +++ b/Classes/ViewHelpers/Condition/Page/HasSubpagesViewHelper.php @@ -47,10 +47,10 @@ public static function verdict(array $arguments, RenderingContextInterface $rend { /** @var int $pageUid */ $pageUid = $arguments['pageUid']; - $includeHiddenInMenu = (boolean) $arguments['includeHiddenInMenu']; - $includeAccessProtected = (boolean) $arguments['includeAccessProtected']; + $includeHiddenInMenu = (bool) $arguments['includeHiddenInMenu']; + $includeAccessProtected = (bool) $arguments['includeAccessProtected']; - if (empty($pageUid) || 0 === (integer) $pageUid) { + if (empty($pageUid) || 0 === (int) $pageUid) { $pageUid = $GLOBALS['TSFE']->id; } diff --git a/Classes/ViewHelpers/Condition/Page/IsChildPageViewHelper.php b/Classes/ViewHelpers/Condition/Page/IsChildPageViewHelper.php index 63f2d7478..2f9ef756c 100644 --- a/Classes/ViewHelpers/Condition/Page/IsChildPageViewHelper.php +++ b/Classes/ViewHelpers/Condition/Page/IsChildPageViewHelper.php @@ -37,7 +37,7 @@ public static function verdict(array $arguments, RenderingContextInterface $rend { /** @var int $pageUid */ $pageUid = $arguments['pageUid']; - $respectSiteRoot = (boolean) $arguments['respectSiteRoot']; + $respectSiteRoot = (bool) $arguments['respectSiteRoot']; if (empty($pageUid)) { /** @var int $pageUid */ diff --git a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php index 47fb43385..e248317c1 100644 --- a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php +++ b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php @@ -92,7 +92,7 @@ protected function getContentRecords(): array $pageUid = $this->getPageUid(); - if ((integer) $slide === 0) { + if ((int) $slide === 0) { $contentRecords = $this->getSlideRecordsFromPage($pageUid, $limit); } else { $contentRecords = $this->getSlideRecords($pageUid, $limit); @@ -129,7 +129,7 @@ protected function getSlideRecordsFromPage(int $pageUid, ?int $limit): array 'max' => $limit, // Note: pidInList must not use $pageUid which defaults to current PID. Use argument-passed pageUid! // A value of zero here removes the "pid" from the condition generated by ContentObjectRenderer. - 'pidInList' => (integer)$pageUid, + 'pidInList' => (int)$pageUid, 'includeRecordsWithoutDefaultTranslation' => !$this->arguments['hideUntranslated'] ] ); @@ -137,7 +137,7 @@ protected function getSlideRecordsFromPage(int $pageUid, ?int $limit): array $conditions = '1=1'; if (is_numeric($this->arguments['column'])) { - $conditions = sprintf('colPos = %d', (integer) $this->arguments['column']); + $conditions = sprintf('colPos = %d', (int) $this->arguments['column']); } if ($this->arguments['sectionIndexOnly']) { $conditions .= ' AND sectionIndex = 1'; @@ -174,12 +174,12 @@ protected function getPageUid(): int /** @var int $pageUid */ $pageUid = $this->arguments['pageUid']; - $pageUid = (integer) $pageUid; + $pageUid = (int) $pageUid; if (1 > $pageUid) { - $pageUid = (integer) ($GLOBALS['TSFE']->page['content_from_pid'] ?? 0); + $pageUid = (int) ($GLOBALS['TSFE']->page['content_from_pid'] ?? 0); } if (1 > $pageUid) { - $pageUid = (integer) ($GLOBALS['TSFE']->id ?? 0); + $pageUid = (int) ($GLOBALS['TSFE']->id ?? 0); } return $pageUid; } diff --git a/Classes/ViewHelpers/Count/BytesViewHelper.php b/Classes/ViewHelpers/Count/BytesViewHelper.php index cdc3b3aac..66f481b3c 100644 --- a/Classes/ViewHelpers/Count/BytesViewHelper.php +++ b/Classes/ViewHelpers/Count/BytesViewHelper.php @@ -70,6 +70,6 @@ public static function renderStatic( ) { /** @var string $encoding */ $encoding = $arguments['encoding']; - return (integer) mb_strlen($renderChildrenClosure(), $encoding); + return (int) mb_strlen($renderChildrenClosure(), $encoding); } } diff --git a/Classes/ViewHelpers/DebugViewHelper.php b/Classes/ViewHelpers/DebugViewHelper.php index c8265a7b2..fadd2cec1 100644 --- a/Classes/ViewHelpers/DebugViewHelper.php +++ b/Classes/ViewHelpers/DebugViewHelper.php @@ -59,7 +59,7 @@ * Path: {domainObject} * Value type: object * Accessible properties on {domainObject}: - * {form.uid} (integer) + * {form.uid} (int) * {form.title} (string) * ``` * diff --git a/Classes/ViewHelpers/Format/DateRangeViewHelper.php b/Classes/ViewHelpers/Format/DateRangeViewHelper.php index be363d78c..0583b3ea1 100644 --- a/Classes/ViewHelpers/Format/DateRangeViewHelper.php +++ b/Classes/ViewHelpers/Format/DateRangeViewHelper.php @@ -172,7 +172,7 @@ public static function renderStatic( $output = null; $return = $arguments['return']; if (null === $return) { - $spaceGlue = (boolean) $arguments['spaceGlue']; + $spaceGlue = (bool) $arguments['spaceGlue']; /** @var string $glue */ $glue = $arguments['glue']; /** @var string $startFormat */ @@ -241,7 +241,7 @@ protected static function enforceDateTime($date): \DateTime protected static function formatDate(\DateTime $date, string $format = 'Y-m-d'): string { if (false !== strpos($format, '%')) { - return (string) strftime($format, (integer) $date->format('U')); + return (string) strftime($format, (int) $date->format('U')); } return $date->format($format); } diff --git a/Classes/ViewHelpers/Format/EliminateViewHelper.php b/Classes/ViewHelpers/Format/EliminateViewHelper.php index f06ab3be1..a15467cd5 100644 --- a/Classes/ViewHelpers/Format/EliminateViewHelper.php +++ b/Classes/ViewHelpers/Format/EliminateViewHelper.php @@ -88,11 +88,11 @@ public static function renderStatic( $content = static::eliminateCharacters( $content, $arguments['characters'], - (boolean) $arguments['caseSensitive'] + (bool) $arguments['caseSensitive'] ); } if (isset($arguments['strings'])) { - $content = static::eliminateStrings($content, $arguments['strings'], (boolean) $arguments['caseSensitive']); + $content = static::eliminateStrings($content, $arguments['strings'], (bool) $arguments['caseSensitive']); } if ($arguments['whitespace']) { $content = static::eliminateWhitespace($content); @@ -113,10 +113,10 @@ public static function renderStatic( $content = static::eliminateDigits($content); } if ($arguments['letters']) { - $content = static::eliminateLetters($content, (boolean) $arguments['caseSensitive']); + $content = static::eliminateLetters($content, (bool) $arguments['caseSensitive']); } if ($arguments['nonAscii']) { - $content = static::eliminateNonAscii($content, (boolean) $arguments['caseSensitive']); + $content = static::eliminateNonAscii($content, (bool) $arguments['caseSensitive']); } return $content; } diff --git a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php index 35affaac6..df42ff2c2 100644 --- a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php +++ b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php @@ -87,8 +87,8 @@ public static function renderStatic( RenderingContextInterface $renderingContext ) { $value = $renderChildrenClosure(); - $useTraversableKeys = (boolean) $arguments['useTraversableKeys']; - $preventRecursion = (boolean) $arguments['preventRecursion']; + $useTraversableKeys = (bool) $arguments['useTraversableKeys']; + $preventRecursion = (bool) $arguments['preventRecursion']; /** @var string $recursionMarker */ $recursionMarker = $arguments['recursionMarker'] ?? '**recursion**'; /** @var string|null $dateTimeFormat */ diff --git a/Classes/ViewHelpers/Format/MarkdownViewHelper.php b/Classes/ViewHelpers/Format/MarkdownViewHelper.php index 710fbdb38..dd69a06a9 100644 --- a/Classes/ViewHelpers/Format/MarkdownViewHelper.php +++ b/Classes/ViewHelpers/Format/MarkdownViewHelper.php @@ -59,8 +59,8 @@ public static function renderStatic( \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext ) { - $trim = (boolean) $arguments['trim']; - $htmlentities = (boolean) $arguments['htmlentities']; + $trim = (bool) $arguments['trim']; + $htmlentities = (bool) $arguments['htmlentities']; $text = $renderChildrenClosure(); if (null === $text) { return null; diff --git a/Classes/ViewHelpers/Format/ReplaceViewHelper.php b/Classes/ViewHelpers/Format/ReplaceViewHelper.php index cc70ad0c1..9ce59a15c 100644 --- a/Classes/ViewHelpers/Format/ReplaceViewHelper.php +++ b/Classes/ViewHelpers/Format/ReplaceViewHelper.php @@ -65,7 +65,7 @@ public static function renderStatic( $replacement = is_scalar($replacement) ? (string) $replacement : (array) $replacement; $count = 0; - $caseSensitive = (boolean) $arguments['caseSensitive']; + $caseSensitive = (bool) $arguments['caseSensitive']; $function = $caseSensitive ? 'str_replace' : 'str_ireplace'; $replaced = $function($substring, $replacement, $content, $count); if ($arguments['returnCount'] ?? false) { diff --git a/Classes/ViewHelpers/Iterator/AbstractLoopViewHelper.php b/Classes/ViewHelpers/Iterator/AbstractLoopViewHelper.php index b4764bd8b..660367387 100644 --- a/Classes/ViewHelpers/Iterator/AbstractLoopViewHelper.php +++ b/Classes/ViewHelpers/Iterator/AbstractLoopViewHelper.php @@ -45,7 +45,7 @@ protected static function renderIteration( ) { if (!empty($iterationArgument)) { $variableProvider = $renderingContext->getVariableProvider(); - $cycle = (integer) (($i - $from) / $step) + 1; + $cycle = (int) (($i - $from) / $step) + 1; $iteration = [ 'index' => $i, 'cycle' => $cycle, diff --git a/Classes/ViewHelpers/Iterator/ChunkViewHelper.php b/Classes/ViewHelpers/Iterator/ChunkViewHelper.php index d5e9fdcff..2e9ac4758 100644 --- a/Classes/ViewHelpers/Iterator/ChunkViewHelper.php +++ b/Classes/ViewHelpers/Iterator/ChunkViewHelper.php @@ -66,8 +66,8 @@ public static function renderStatic( $as = $arguments['as']; /** @var int $count */ $count = $arguments['count']; - $fixed = (boolean) $arguments['fixed']; - $preserveKeys = (boolean) $arguments['preserveKeys']; + $fixed = (bool) $arguments['fixed']; + $preserveKeys = (bool) $arguments['preserveKeys']; $subject = static::arrayFromArrayOrTraversableOrCSVStatic( empty($as) ? ($arguments['subject'] ?? $renderChildrenClosure()) : $arguments['subject'], $preserveKeys @@ -80,7 +80,7 @@ public static function renderStatic( $subjectSize = count($subject); if (0 < $subjectSize) { /** @var int<1, max> $chunkSize */ - $chunkSize = (integer) ceil($subjectSize / $count); + $chunkSize = (int) ceil($subjectSize / $count); $output = array_chunk($subject, $chunkSize, $preserveKeys); } // Fill the resulting array with empty items to get the desired element count diff --git a/Classes/ViewHelpers/Iterator/ExtractViewHelper.php b/Classes/ViewHelpers/Iterator/ExtractViewHelper.php index 7a58cb94a..68e3504f0 100644 --- a/Classes/ViewHelpers/Iterator/ExtractViewHelper.php +++ b/Classes/ViewHelpers/Iterator/ExtractViewHelper.php @@ -148,8 +148,8 @@ public static function renderStatic( $content = $arguments['content'] ?? $renderChildrenClosure(); /** @var string $key */ $key = $arguments['key']; - $recursive = (boolean) $arguments['recursive']; - $single = (boolean) $arguments['single']; + $recursive = (bool) $arguments['recursive']; + $single = (bool) $arguments['single']; try { // extraction from Iterators could potentially use a getter method which throws // exceptions - although this would be bad practice. Catch the exception here diff --git a/Classes/ViewHelpers/Iterator/FilterViewHelper.php b/Classes/ViewHelpers/Iterator/FilterViewHelper.php index b4871176d..0cf696bd0 100644 --- a/Classes/ViewHelpers/Iterator/FilterViewHelper.php +++ b/Classes/ViewHelpers/Iterator/FilterViewHelper.php @@ -77,9 +77,9 @@ public static function renderStatic( $filter = $arguments['filter']; /** @var string $propertyName */ $propertyName = $arguments['propertyName']; - $preserveKeys = (boolean) $arguments['preserveKeys']; - $invert = (boolean) $arguments['invert']; - $nullFilter = (boolean) $arguments['nullFilter']; + $preserveKeys = (bool) $arguments['preserveKeys']; + $invert = (bool) $arguments['invert']; + $nullFilter = (bool) $arguments['nullFilter']; if (!is_array($subject) && !$subject instanceof \Traversable) { return []; diff --git a/Classes/ViewHelpers/Iterator/ForViewHelper.php b/Classes/ViewHelpers/Iterator/ForViewHelper.php index 2ee56f797..781bdb6a7 100644 --- a/Classes/ViewHelpers/Iterator/ForViewHelper.php +++ b/Classes/ViewHelpers/Iterator/ForViewHelper.php @@ -49,9 +49,9 @@ public static function renderStatic( $content = ''; $variableProvider = $renderingContext->getVariableProvider(); - $to = (integer) $to; - $from = (integer) $from; - $step = (integer) $step; + $to = (int) $to; + $from = (int) $from; + $step = (int) $step; if (0 === $step) { throw new \RuntimeException('"step" may not be 0.', 1383267698); diff --git a/Classes/ViewHelpers/Iterator/IndexOfViewHelper.php b/Classes/ViewHelpers/Iterator/IndexOfViewHelper.php index 21decf48c..b1ba00add 100644 --- a/Classes/ViewHelpers/Iterator/IndexOfViewHelper.php +++ b/Classes/ViewHelpers/Iterator/IndexOfViewHelper.php @@ -41,7 +41,7 @@ public static function renderStatic( $evaluation = static::assertHaystackHasNeedle($arguments['haystack'], $arguments['needle'], $arguments); if (false !== $evaluation) { - return (integer) $evaluation; + return (int) $evaluation; } return -1; } diff --git a/Classes/ViewHelpers/Iterator/SliceViewHelper.php b/Classes/ViewHelpers/Iterator/SliceViewHelper.php index fb8c4d879..0feebd6d6 100644 --- a/Classes/ViewHelpers/Iterator/SliceViewHelper.php +++ b/Classes/ViewHelpers/Iterator/SliceViewHelper.php @@ -59,7 +59,7 @@ public static function renderStatic( $haystack = static::arrayFromArrayOrTraversableOrCSVStatic( empty($as) ? ($arguments['haystack'] ?? $renderChildrenClosure()) : $arguments['haystack'] ); - $output = array_slice($haystack, $start, $length, (boolean) $arguments['preserveKeys']); + $output = array_slice($haystack, $start, $length, (bool) $arguments['preserveKeys']); return static::renderChildrenWithVariableOrReturnInputStatic( $output, $as, diff --git a/Classes/ViewHelpers/Iterator/SortViewHelper.php b/Classes/ViewHelpers/Iterator/SortViewHelper.php index e5c8c87a9..c145df2ca 100644 --- a/Classes/ViewHelpers/Iterator/SortViewHelper.php +++ b/Classes/ViewHelpers/Iterator/SortViewHelper.php @@ -199,7 +199,7 @@ protected static function getSortValue($object, $arguments) $field = $arguments['sortBy']; $value = ObjectAccess::getPropertyPath($object, $field); if ($value instanceof \DateTimeInterface) { - $value = (integer) $value->format('U'); + $value = (int) $value->format('U'); } elseif ($value instanceof ObjectStorage || $value instanceof LazyObjectStorage) { $value = $value->count(); } elseif (is_array($value)) { diff --git a/Classes/ViewHelpers/Iterator/SplitViewHelper.php b/Classes/ViewHelpers/Iterator/SplitViewHelper.php index 7e7052d36..add1da8e8 100644 --- a/Classes/ViewHelpers/Iterator/SplitViewHelper.php +++ b/Classes/ViewHelpers/Iterator/SplitViewHelper.php @@ -49,7 +49,7 @@ public static function renderStatic( ) { /** @var int<1, max> $length */ $length = $arguments['length']; - if ((integer) $length === 0) { + if ((int) $length === 0) { // Difference from PHP str_split: return an empty array if (potentially dynamically defined) length // argument is zero for some reason. PHP would throw a warning; Fluid would logically just return empty. return []; diff --git a/Classes/ViewHelpers/LViewHelper.php b/Classes/ViewHelpers/LViewHelper.php index c07ebb5e7..f8374c4ce 100644 --- a/Classes/ViewHelpers/LViewHelper.php +++ b/Classes/ViewHelpers/LViewHelper.php @@ -75,7 +75,7 @@ public static function renderStatic( /** @var RenderingContext $renderingContext */ /** @var string|null $default */ $default = $arguments['default']; - $htmlEscape = (boolean) $arguments['htmlEscape']; + $htmlEscape = (bool) $arguments['htmlEscape']; /** @var string|null $extensionName */ $extensionName = $arguments['extensionName']; /** @var array|null $translationArguments */ diff --git a/Classes/ViewHelpers/Math/CeilViewHelper.php b/Classes/ViewHelpers/Math/CeilViewHelper.php index 393ab2432..62a998fc2 100644 --- a/Classes/ViewHelpers/Math/CeilViewHelper.php +++ b/Classes/ViewHelpers/Math/CeilViewHelper.php @@ -31,6 +31,6 @@ protected static function calculateAction($a, array $arguments = []) return array_map('ceil', static::arrayFromArrayOrTraversableOrCSVStatic($a)); } /** @var integer|float $a */ - return (integer) ceil($a); + return (int) ceil($a); } } diff --git a/Classes/ViewHelpers/Math/FloorViewHelper.php b/Classes/ViewHelpers/Math/FloorViewHelper.php index abaf49fd4..fd797f332 100644 --- a/Classes/ViewHelpers/Math/FloorViewHelper.php +++ b/Classes/ViewHelpers/Math/FloorViewHelper.php @@ -31,6 +31,6 @@ protected static function calculateAction($a, array $arguments = []) return array_map('floor', static::arrayFromArrayOrTraversableOrCSVStatic($a)); } /** @var integer|float $a */ - return (integer) floor($a); + return (int) floor($a); } } diff --git a/Classes/ViewHelpers/Math/MedianViewHelper.php b/Classes/ViewHelpers/Math/MedianViewHelper.php index 701ca16c3..4c47190e4 100644 --- a/Classes/ViewHelpers/Math/MedianViewHelper.php +++ b/Classes/ViewHelpers/Math/MedianViewHelper.php @@ -42,9 +42,9 @@ protected static function calculateAction($a, array $arguments = []) * not everybody knows, let's make it explicit for everybody * wondering. */ - return $a[(integer) $midpoint]; + return $a[(int) $midpoint]; } - $candidates = array_slice($a, (integer) (floor($midpoint) - 1), 2); + $candidates = array_slice($a, (int) (floor($midpoint) - 1), 2); return array_sum($candidates) / 2; } return $a; diff --git a/Classes/ViewHelpers/Media/GravatarViewHelper.php b/Classes/ViewHelpers/Media/GravatarViewHelper.php index f8c050088..d278dbc7e 100644 --- a/Classes/ViewHelpers/Media/GravatarViewHelper.php +++ b/Classes/ViewHelpers/Media/GravatarViewHelper.php @@ -74,7 +74,7 @@ public function render() $size = $this->checkArgument('size'); $imageSet = $this->checkArgument('imageSet'); $maximumRating = $this->checkArgument('maximumRating'); - $secure = (boolean) $this->arguments['secure']; + $secure = (bool) $this->arguments['secure']; $url = $secure ? static::GRAVATAR_SECURE_BASEURL : static::GRAVATAR_BASEURL; $url .= md5(strtolower(trim($email))); diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php index cb3ebec59..6c15f05b7 100644 --- a/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php +++ b/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php @@ -69,8 +69,8 @@ public function getInfo(): array { /** @var string|int|CoreFileReference|ExtbaseFileReference|null $src */ $src = $this->arguments['src']; - $treatIdAsUid = (boolean) $this->arguments['treatIdAsUid']; - $treatIdAsReference = (boolean) $this->arguments['treatIdAsReference']; + $treatIdAsUid = (bool) $this->arguments['treatIdAsUid']; + $treatIdAsReference = (bool) $this->arguments['treatIdAsReference']; if (null === $src) { /** @var string|int|CoreFileReference|ExtbaseFileReference|null $src */ @@ -87,7 +87,7 @@ public function getInfo(): array } if ($treatIdAsUid || $treatIdAsReference) { - $id = (integer) $src; + $id = (int) $src; $info = []; if ($treatIdAsUid) { $info = $this->getInfoByUid($id); diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php index df3da4a74..7c0c9899f 100644 --- a/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php +++ b/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php @@ -120,7 +120,7 @@ public function preprocessImage(?string $imageSource = null): void $format = $this->arguments['format']; /** @var int $quality */ $quality = $this->arguments['quality']; - $treatIdAsReference = (boolean) $this->arguments['treatIdAsReference']; + $treatIdAsReference = (bool) $this->arguments['treatIdAsReference']; $crop = $this->arguments['crop']; if ($src instanceof FileReference) { @@ -151,7 +151,7 @@ public function preprocessImage(?string $imageSource = null): void if (!empty($format)) { $setup['ext'] = $format; } - if (0 < (integer) $quality) { + if (0 < (int) $quality) { /** @var int $quality */ $quality = MathUtility::forceIntegerInRange($quality, 10, 100, 75); $setup['params'] = '-quality ' . $quality; diff --git a/Classes/ViewHelpers/Media/PdfThumbnailViewHelper.php b/Classes/ViewHelpers/Media/PdfThumbnailViewHelper.php index 2aa869ee5..4eddd4771 100644 --- a/Classes/ViewHelpers/Media/PdfThumbnailViewHelper.php +++ b/Classes/ViewHelpers/Media/PdfThumbnailViewHelper.php @@ -81,7 +81,7 @@ public function render() $page = $this->arguments['page']; /** @var string|null $background */ $background = $this->arguments['background']; - $forceOverwrite = (boolean) $this->arguments['forceOverwrite']; + $forceOverwrite = (bool) $this->arguments['forceOverwrite']; $filename = basename($src); $pageArgument = $page > 0 ? $page - 1 : 0; if (isset($GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_colorspace'])) { @@ -104,10 +104,10 @@ public function render() ); if (!file_exists($path) || $forceOverwrite) { $arguments = '-colorspace ' . $colorspace; - if (0 < (integer) $density) { + if (0 < (int) $density) { $arguments .= ' -density ' . $density; } - if (0 !== (integer) $rotate) { + if (0 !== (int) $rotate) { $arguments .= ' -rotate ' . $rotate; } $arguments .= ' "' . $src . '"[' . $pageArgument . ']'; diff --git a/Classes/ViewHelpers/Media/PictureViewHelper.php b/Classes/ViewHelpers/Media/PictureViewHelper.php index 494af2515..db8d3ec12 100644 --- a/Classes/ViewHelpers/Media/PictureViewHelper.php +++ b/Classes/ViewHelpers/Media/PictureViewHelper.php @@ -80,7 +80,7 @@ public function initializeArguments(): void public function render() { $src = $this->arguments['src']; - $treatIdAsReference = (boolean) $this->arguments['treatIdAsReference']; + $treatIdAsReference = (bool) $this->arguments['treatIdAsReference']; if ($src instanceof FileReference) { $src = $src->getUid(); $treatIdAsReference = true; diff --git a/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php b/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php index 3b62ae98e..d76cae0b9 100644 --- a/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php +++ b/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php @@ -232,7 +232,7 @@ public function render() */ public function renderContent(array $menu): string { - $deferredRendering = (boolean) $this->arguments['deferred']; + $deferredRendering = (bool) $this->arguments['deferred']; if (0 === count($menu) && !$deferredRendering) { return ''; } @@ -279,9 +279,9 @@ protected function autoRender(array $menu, int $level = 1): string $html = []; /** @var int $levels */ $levels = $this->arguments['levels']; - $levels = (integer) $levels; - $showCurrent = (boolean) $this->arguments['showCurrent']; - $expandAll = (boolean) $this->arguments['expandAll']; + $levels = (int) $levels; + $showCurrent = (bool) $this->arguments['showCurrent']; + $expandAll = (bool) $this->arguments['expandAll']; $itemsRendered = 0; $numberOfItems = count($menu); foreach ($menu as $page) { @@ -338,11 +338,11 @@ protected function autoRender(array $menu, int $level = 1): string protected function renderItemLink(array $page): string { $isSpacer = $page['doktype'] === PageRepository::DOKTYPE_SPACER; - $isCurrent = (boolean) $page['current']; - $isActive = (boolean) $page['active']; - $linkCurrent = (boolean) $this->arguments['linkCurrent']; - $linkActive = (boolean) $this->arguments['linkActive']; - $includeAnchorTitle = (boolean) $this->arguments['includeAnchorTitle']; + $isCurrent = (bool) $page['current']; + $isActive = (bool) $page['active']; + $linkCurrent = (bool) $this->arguments['linkCurrent']; + $linkActive = (bool) $this->arguments['linkActive']; + $includeAnchorTitle = (bool) $this->arguments['includeAnchorTitle']; $target = (!empty($page['target'])) ? ' target="' . $page['target'] . '"' : ''; $class = (trim($page['class']) !== '') ? ' class="' . trim($page['class']) . '"' : ''; if ($isSpacer || ($isCurrent && !$linkCurrent) || ($isActive && !$linkActive)) { @@ -394,9 +394,9 @@ public function getMenu(?int $pageUid = null, ?int $entryLevel = 0): array if ($pageUid === null) { return []; } - $showHiddenInMenu = (boolean) $this->arguments['showHiddenInMenu']; - $showAccessProtected = (boolean) $this->arguments['showAccessProtected']; - $includeSpacers = (boolean) $this->arguments['includeSpacers']; + $showHiddenInMenu = (bool) $this->arguments['showHiddenInMenu']; + $showAccessProtected = (bool) $this->arguments['showAccessProtected']; + $includeSpacers = (bool) $this->arguments['includeSpacers']; $excludePages = $this->processPagesArgument($this->arguments['excludePages']); return $this->pageService->getMenu( @@ -420,7 +420,7 @@ public function parseMenu(array $pages): array $count++; $class = []; $originalPageUid = $page['uid']; - $showAccessProtected = (boolean) $this->arguments['showAccessProtected']; + $showAccessProtected = (bool) $this->arguments['showAccessProtected']; if ($showAccessProtected) { $pages[$index]['accessProtected'] = $this->pageService->isAccessProtected($page); if ($pages[$index]['accessProtected']) { @@ -464,7 +464,7 @@ public function parseMenu(array $pages): array } $pages[$index]['class'] = implode(' ', $class); $pages[$index]['linktext'] = $this->getItemTitle($pages[$index]); - $forceAbsoluteUrl = (boolean) $this->arguments['forceAbsoluteUrl']; + $forceAbsoluteUrl = (bool) $this->arguments['forceAbsoluteUrl']; $pages[$index]['link'] = $this->pageService->getItemLink($pages[$index], $forceAbsoluteUrl); $processedPages[$index] = $pages[$index]; } diff --git a/Classes/ViewHelpers/Menu/BrowseViewHelper.php b/Classes/ViewHelpers/Menu/BrowseViewHelper.php index e22dfff96..19e67d9b0 100644 --- a/Classes/ViewHelpers/Menu/BrowseViewHelper.php +++ b/Classes/ViewHelpers/Menu/BrowseViewHelper.php @@ -77,11 +77,11 @@ public function initializeArguments(): void public function render() { $defaultUid = $GLOBALS['TSFE']->id; - $showAccessProtected = (boolean) $this->arguments['showAccessProtected']; - $pageUid = (integer) (null !== $this->arguments['pageUid'] ? $this->arguments['pageUid'] : $defaultUid); - $currentUid = (integer) ($this->arguments['currentPageUid'] ?: $defaultUid); + $showAccessProtected = (bool) $this->arguments['showAccessProtected']; + $pageUid = (int) (null !== $this->arguments['pageUid'] ? $this->arguments['pageUid'] : $defaultUid); + $currentUid = (int) ($this->arguments['currentPageUid'] ?: $defaultUid); $currentPage = $this->pageService->getPage($currentUid, $showAccessProtected); - $parentUid = (integer) (null !== $this->arguments['pageUid'] ? $pageUid : ($currentPage['pid'] ?? 0)); + $parentUid = (int) (null !== $this->arguments['pageUid'] ? $pageUid : ($currentPage['pid'] ?? 0)); $parentPage = $this->pageService->getPage($parentUid, $showAccessProtected); $menuData = $this->getMenu($parentUid); if (empty($menuData)) { @@ -98,7 +98,7 @@ public function render() $nextUid = null; $prevUid = null; for ($i = 0; $i < $uidCount; $i++) { - if ((integer) $pageUids[$i] === $currentUid) { + if ((int) $pageUids[$i] === $currentUid) { if ($i > 0) { $prevUid = $pageUids[$i - 1]; } diff --git a/Classes/ViewHelpers/Menu/ListViewHelper.php b/Classes/ViewHelpers/Menu/ListViewHelper.php index 4d4889601..0bd039056 100644 --- a/Classes/ViewHelpers/Menu/ListViewHelper.php +++ b/Classes/ViewHelpers/Menu/ListViewHelper.php @@ -41,7 +41,7 @@ public function render() if (0 === count($pages)) { return null; } - $showAccessProtected = (boolean) $this->arguments['showAccessProtected']; + $showAccessProtected = (bool) $this->arguments['showAccessProtected']; $menuData = []; foreach ($pages as $pageUid) { $row = $this->pageService->getPage($pageUid, $showAccessProtected); diff --git a/Classes/ViewHelpers/Menu/SubViewHelper.php b/Classes/ViewHelpers/Menu/SubViewHelper.php index c8d07a8c9..2101ff072 100644 --- a/Classes/ViewHelpers/Menu/SubViewHelper.php +++ b/Classes/ViewHelpers/Menu/SubViewHelper.php @@ -50,7 +50,7 @@ public function render() // rendered - which is expected for example if using a page setting to render a different page in menus. // This means that the following check although it appears redundant, it is in fact not. $isCurrent = $this->pageService->isCurrent($pageUid); - $isExpanded = (boolean) $parentArguments['expandAll']; + $isExpanded = (bool) $parentArguments['expandAll']; $shouldRender = $isActive || $isCurrent || $isExpanded; if (!$shouldRender) { return null; diff --git a/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php b/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php index 7595844c6..a36da7ee2 100644 --- a/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php +++ b/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php @@ -57,10 +57,10 @@ public function render() $rawRootLineData = array_reverse($rawRootLineData); $rawRootLineData = array_slice($rawRootLineData, $entryLevel, $endLevel); $rootLineData = []; - $showHidden = (boolean) $this->arguments['showHiddenInMenu']; + $showHidden = (bool) $this->arguments['showHiddenInMenu']; $spacerDoktype = PageRepository::DOKTYPE_SPACER; foreach ($rawRootLineData as $record) { - $isHidden = (boolean) $record['nav_hide']; + $isHidden = (bool) $record['nav_hide']; if ($this->arguments['includeSpacers']) { $isAllowedDoktype = (int) $record['doktype'] <= $spacerDoktype; diff --git a/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php b/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php index c2a30394e..3fe6e2987 100644 --- a/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php +++ b/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php @@ -93,14 +93,14 @@ public function render() /** @var int $pageUid */ $pageUid = $this->arguments['pageUid']; - $pageUid = (integer) $pageUid; + $pageUid = (int) $pageUid; if (0 === $pageUid) { $pageUid = $GLOBALS['TSFE']->id; } /** @var bool $normalWhenNoLanguage */ $normalWhenNoLanguage = $this->arguments['normalWhenNoLanguage']; - $addQueryString = (boolean) $this->arguments['addQueryString']; + $addQueryString = (bool) $this->arguments['addQueryString']; /** @var UriBuilder $uriBuilder */ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class); @@ -117,7 +117,7 @@ public function render() /** @var PageRenderer $pageRenderer */ $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class); - $usePageRenderer = (1 !== (integer) ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode'] ?? 0)); + $usePageRenderer = (1 !== (int) ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode'] ?? 0)); $output = ''; foreach ($languages as $languageUid => $languageName) { diff --git a/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php b/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php index e5239fefa..bee7ff2aa 100644 --- a/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php +++ b/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php @@ -60,7 +60,7 @@ public function render() /** @var int $pageUid */ $pageUid = $this->arguments['pageUid']; - $pageUid = (integer) $pageUid; + $pageUid = (int) $pageUid; if (0 === $pageUid) { $pageUid = $GLOBALS['TSFE']->id; } @@ -103,7 +103,7 @@ public function render() $renderedTag = $this->tag->render(); - if (1 === (integer) $GLOBALS['TSFE']->config['config']['disableAllHeaderCode']) { + if (1 === (int) $GLOBALS['TSFE']->config['config']['disableAllHeaderCode']) { return $renderedTag; } diff --git a/Classes/ViewHelpers/Page/InfoViewHelper.php b/Classes/ViewHelpers/Page/InfoViewHelper.php index 90939a6a3..9d6c3e2a1 100644 --- a/Classes/ViewHelpers/Page/InfoViewHelper.php +++ b/Classes/ViewHelpers/Page/InfoViewHelper.php @@ -63,7 +63,7 @@ public static function renderStatic( if (0 === $pageUid) { $pageUid = $GLOBALS['TSFE']->id; } - $page = $pageRepository->getPage_noCheck((integer) $pageUid); + $page = $pageRepository->getPage_noCheck((int) $pageUid); /** @var string|null $field */ $field = $arguments['field']; $content = null; diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php index 97f09433d..edc5dac78 100644 --- a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php +++ b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php @@ -352,8 +352,8 @@ protected function parseLanguageMenu(): array } foreach ($languageMenu as $key => $value) { - $current = $languageUid === (integer) $key ? 1 : 0; - $inactive = in_array($key, $languageUids) || (integer) $key === $this->defaultLangUid ? 0 : 1; + $current = $languageUid === (int) $key ? 1 : 0; + $inactive = in_array($key, $languageUids) || (int) $key === $this->defaultLangUid ? 0 : 1; $url = $this->getLanguageUrl($key); if (empty($url)) { $url = GeneralUtility::getIndpEnv('REQUEST_URI'); @@ -488,12 +488,12 @@ protected function getPageUid(): int { /** @var int $pageUid */ $pageUid = $this->arguments['pageUid']; - $pageUid = (integer) $pageUid; + $pageUid = (int) $pageUid; if (0 === $pageUid) { $pageUid = $GLOBALS['TSFE']->id; } - return (integer) $pageUid; + return (int) $pageUid; } /** diff --git a/Classes/ViewHelpers/Page/LanguageViewHelper.php b/Classes/ViewHelpers/Page/LanguageViewHelper.php index 287d5d193..646a6f1a9 100644 --- a/Classes/ViewHelpers/Page/LanguageViewHelper.php +++ b/Classes/ViewHelpers/Page/LanguageViewHelper.php @@ -71,7 +71,7 @@ public static function renderStatic( /** @var int $pageUid */ $pageUid = $arguments['pageUid']; - $pageUid = (integer) $pageUid; + $pageUid = (int) $pageUid; /** @var bool $normalWhenNoLanguage */ $normalWhenNoLanguage = $arguments['normalWhenNoLanguage']; diff --git a/Classes/ViewHelpers/Page/LinkViewHelper.php b/Classes/ViewHelpers/Page/LinkViewHelper.php index 30ff1c83f..67bfe103c 100644 --- a/Classes/ViewHelpers/Page/LinkViewHelper.php +++ b/Classes/ViewHelpers/Page/LinkViewHelper.php @@ -154,12 +154,12 @@ public function render() } // Get page via pageUid argument or current id - $pageUid = (integer) $pageUid; + $pageUid = (int) $pageUid; if (0 === $pageUid) { $pageUid = $GLOBALS['TSFE']->id; } - $showAccessProtected = (boolean) $this->arguments['showAccessProtected']; + $showAccessProtected = (bool) $this->arguments['showAccessProtected']; $page = $this->pageService->getPage($pageUid, $showAccessProtected); if (empty($page)) { diff --git a/Classes/ViewHelpers/Page/Resources/FalViewHelper.php b/Classes/ViewHelpers/Page/Resources/FalViewHelper.php index 24408d2a0..2b80d7f7a 100644 --- a/Classes/ViewHelpers/Page/Resources/FalViewHelper.php +++ b/Classes/ViewHelpers/Page/Resources/FalViewHelper.php @@ -104,7 +104,7 @@ protected function getCurrentLanguageUid(): int $languageUid = $GLOBALS['TSFE']->sys_language_uid; } - return (integer) $languageUid; + return (int) $languageUid; } /** diff --git a/Classes/ViewHelpers/Random/NumberViewHelper.php b/Classes/ViewHelpers/Random/NumberViewHelper.php index c03c83999..0fd2f4968 100644 --- a/Classes/ViewHelpers/Random/NumberViewHelper.php +++ b/Classes/ViewHelpers/Random/NumberViewHelper.php @@ -77,7 +77,7 @@ public static function renderStatic( /** @var int $maximumDecimals */ $maximumDecimals = $arguments['maximumDecimals']; $natural = random_int($minimum, $maximum); - if (0 === (integer) $minimumDecimals && 0 === (integer) $maximumDecimals) { + if (0 === (int) $minimumDecimals && 0 === (int) $maximumDecimals) { return $natural; } /** @var array $decimals */ diff --git a/Classes/ViewHelpers/Random/StringViewHelper.php b/Classes/ViewHelpers/Random/StringViewHelper.php index 94a7c0b11..20a318991 100644 --- a/Classes/ViewHelpers/Random/StringViewHelper.php +++ b/Classes/ViewHelpers/Random/StringViewHelper.php @@ -49,10 +49,10 @@ public static function renderStatic( /** @var int $minimumLength */ $minimumLength = $arguments['minimumLength']; - $minimumLength = (integer) $minimumLength; + $minimumLength = (int) $minimumLength; /** @var int $maximumLength */ $maximumLength = $arguments['maximumLength']; - $maximumLength = (integer) $maximumLength; + $maximumLength = (int) $maximumLength; /** @var string $characters */ $characters = $arguments['characters']; if ($minimumLength != $maximumLength) { diff --git a/Classes/ViewHelpers/Render/AsciiViewHelper.php b/Classes/ViewHelpers/Render/AsciiViewHelper.php index 750bc9742..6b8e8ac44 100644 --- a/Classes/ViewHelpers/Render/AsciiViewHelper.php +++ b/Classes/ViewHelpers/Render/AsciiViewHelper.php @@ -70,7 +70,7 @@ public static function renderStatic( ) { $ascii = $renderChildrenClosure(); if (is_numeric($ascii)) { - return chr((integer) $ascii); + return chr((int) $ascii); } if (is_array($ascii) || $ascii instanceof \Traversable) { $string = ''; diff --git a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php index 8a4e46795..406371741 100644 --- a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php +++ b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php @@ -63,8 +63,8 @@ public function getFiles(bool $onlyProperties = false, ?string $identifier = nul { $identifier = $this->arrayForMixedArgument($identifier, 'identifier'); $categories = $this->arrayForMixedArgument($categories, 'categories'); - $treatIdAsUid = (boolean) $this->arguments['treatIdAsUid']; - $treatIdAsReference = (boolean) $this->arguments['treatIdAsReference']; + $treatIdAsUid = (bool) $this->arguments['treatIdAsUid']; + $treatIdAsReference = (bool) $this->arguments['treatIdAsReference']; if ($treatIdAsUid && $treatIdAsReference) { throw new \RuntimeException( diff --git a/Classes/ViewHelpers/Resource/Record/FalViewHelper.php b/Classes/ViewHelpers/Resource/Record/FalViewHelper.php index 42229472e..f90d9844b 100644 --- a/Classes/ViewHelpers/Resource/Record/FalViewHelper.php +++ b/Classes/ViewHelpers/Resource/Record/FalViewHelper.php @@ -116,7 +116,7 @@ protected function getFileReferences(string $table, string $field, $uidOrRecord) } } - if (isset($record['t3ver_oid']) && (integer) $record['t3ver_oid'] !== 0) { + if (isset($record['t3ver_oid']) && (int) $record['t3ver_oid'] !== 0) { $sqlRecordUid = $record['t3ver_oid']; } elseif (isset($record['_LOCALIZED_UID'])) { $sqlRecordUid = $record['_LOCALIZED_UID']; @@ -137,7 +137,7 @@ public function getResources(array $record): array if (!empty($GLOBALS['TSFE']->sys_page)) { $fileReferences = $this->getFileReferences($this->getTable(), $this->getField(), $record); } else { - if (isset($record['t3ver_oid']) && (integer) $record['t3ver_oid'] !== 0) { + if (isset($record['t3ver_oid']) && (int) $record['t3ver_oid'] !== 0) { $sqlRecordUid = $record['t3ver_oid']; } elseif (isset($record['_LOCALIZED_UID'])) { $sqlRecordUid = $record['_LOCALIZED_UID']; diff --git a/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php b/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php index 36c45639a..bedbb9974 100644 --- a/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php +++ b/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php @@ -281,7 +281,7 @@ public function assertBackendUserLoggedIn($backendUser = null): bool } $currentBackendUser = $this->getCurrentBackendUser(); if (null !== $backendUser) { - return ((integer) ($currentBackendUser['uid'] ?? 0) === $backendUser); + return ((int) ($currentBackendUser['uid'] ?? 0) === $backendUser); } return is_array($currentBackendUser); } @@ -328,7 +328,7 @@ public function assertAdminLoggedIn(): bool return false; } $currentBackendUser = $this->getCurrentBackendUser(); - return is_array($currentBackendUser) && (boolean) ($currentBackendUser['admin'] ?? false); + return is_array($currentBackendUser) && (bool) ($currentBackendUser['admin'] ?? false); } /** @var Context $context */ $context = GeneralUtility::makeInstance(Context::class); diff --git a/Classes/ViewHelpers/Uri/GravatarViewHelper.php b/Classes/ViewHelpers/Uri/GravatarViewHelper.php index edb6fc088..9ddf6e37a 100644 --- a/Classes/ViewHelpers/Uri/GravatarViewHelper.php +++ b/Classes/ViewHelpers/Uri/GravatarViewHelper.php @@ -75,7 +75,7 @@ public static function renderStatic( $size = $arguments['size']; $imageSet = $arguments['imageSet']; $maximumRating = $arguments['maximumRating']; - $secure = (boolean) $arguments['secure']; + $secure = (bool) $arguments['secure']; $url = $secure ? static::GRAVATAR_SECURE_BASEURL : static::GRAVATAR_BASEURL; $url .= md5(strtolower(trim($email)));