[TASK] Minor Cleanups

TYPO3GmbH · May 17, 2023 · f625b56 · f625b56
1 parent 46e6e38
commit f625b56
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/Classes/AvatarProvider/GravatarProvider.php b/Classes/AvatarProvider/GravatarProvider.php
@@ -68,7 +68,7 @@ public function getAvatarUrl(Author $author, int $size): string
         $default = trim($default = (string)($settings['authors']['avatar']['provider']['default'] ?? '')) === '' ? null : $default;
 
         $gravatarUri = $this->gravatarUriBuilder->getUri(
-            $author->getEmail(),
+            $author->getEmail() ?? '',
             $size,
             $rating,
             $default
@@ -91,7 +91,7 @@ public function getAvatarUrl(Author $author, int $size): string
         $absoluteWebPath = PathUtility::getAbsoluteWebPath($filePath);
 
         if (file_exists($filePath)) {
-            if (hash_equals(md5_file($filePath), md5($gravatar->getContent()))) {
+            if (hash_equals((string) md5_file($filePath), md5($gravatar->getContent()))) {
                 return $absoluteWebPath;
             }
 

diff --git a/Classes/AvatarProvider/ImageProvider.php b/Classes/AvatarProvider/ImageProvider.php
@@ -25,7 +25,8 @@ public function getAvatarUrl(Author $author, int $size): string
             $imageService = GeneralUtility::makeInstance(ImageService::class);
             $image = $imageService->getImage('', $image, false);
 
-            if ($image->hasProperty('crop') && $image->getProperty('crop')) {
+            $cropString = '';
+            if ($image->hasProperty('crop') && $image->getProperty('crop') !== '') {
                 $cropString = $image->getProperty('crop');
             }
             $cropVariantCollection = CropVariantCollection::create((string)$cropString);

diff --git a/Classes/Backend/View/BlogPostHeaderContentRenderer.php b/Classes/Backend/View/BlogPostHeaderContentRenderer.php
@@ -38,7 +38,7 @@ public function __construct(
     public function render(ServerRequestInterface $request): string
     {
         $blogConfiguration = $this->extensionConfiguration->get('blog');
-        if ((bool)($blogConfiguration['disablePageLayoutHeader']) ?? true) {
+        if ((bool)($blogConfiguration['disablePageLayoutHeader'] ?? true)) {
             return '';
         }
 

diff --git a/Classes/Controller/WidgetController.php b/Classes/Controller/WidgetController.php
@@ -110,9 +110,9 @@ public function tagsAction(): ResponseInterface
         if (!(bool)($requestParameters['tag'] ?? null)) {
             $currentTag = (int)$requestParameters['tag'];
         }
-        $limit = (int)$this->settings['widgets']['tags']['limit'] ?? 20;
-        $minSize = (int)$this->settings['widgets']['tags']['minSize'] ?? 100;
-        $maxSize = (int)$this->settings['widgets']['tags']['maxSize'] ?? 100;
+        $limit = (int)($this->settings['widgets']['tags']['limit'] ?? 20);
+        $minSize = (int)($this->settings['widgets']['tags']['minSize'] ?? 100);
+        $maxSize = (int)($this->settings['widgets']['tags']['maxSize'] ?? 100);
         $tags = $this->tagRepository->findTopByUsage($limit);
         $minimumCount = null;
         $maximumCount = 0;
@@ -150,7 +150,7 @@ public function tagsAction(): ResponseInterface
      */
     public function recentPostsAction(): ResponseInterface
     {
-        $limit = (int)$this->settings['widgets']['recentposts']['limit'] ?? 0;
+        $limit = (int)($this->settings['widgets']['recentposts']['limit'] ?? 0);
 
         $posts = $limit > 0
             ? $this->postRepository->findAllWithLimit($limit)
@@ -169,8 +169,8 @@ public function recentPostsAction(): ResponseInterface
      */
     public function commentsAction(): ResponseInterface
     {
-        $limit = (int)$this->settings['widgets']['comments']['limit'] ?? 5;
-        $blogSetup = (int)$this->settings['widgets']['comments']['blogSetup'] ?? null;
+        $limit = (int)($this->settings['widgets']['comments']['limit'] ?? 5);
+        $blogSetup = isset($this->settings['widgets']['comments']['blogSetup']) ? (int) $this->settings['widgets']['comments']['blogSetup'] : null;
         $comments = $this->commentRepository->findActiveComments($limit, $blogSetup);
         $this->view->assign('comments', $comments);
         foreach ($comments as $comment) {

diff --git a/Classes/Notification/CommentAddedNotification.php b/Classes/Notification/CommentAddedNotification.php
@@ -25,7 +25,7 @@ public function getTitle(): string
     {
         /** @var Post $post */
         $post = $this->data['post'];
-        return sprintf(LocalizationUtility::translate('emails.CommentAddedNotification.subject', 'blog'), $post->getTitle());
+        return sprintf((string)LocalizationUtility::translate('emails.CommentAddedNotification.subject', 'blog'), $post->getTitle());
     }
 
     /**

diff --git a/Classes/Service/CommentService.php b/Classes/Service/CommentService.php
@@ -113,7 +113,7 @@ public function addComment(Post $post, Comment $comment): string
                     break;
                 default:
             }
-            $comment->setPid($post->getUid());
+            $comment->setPid((int)$post->getUid());
             $comment->setPostLanguageId(GeneralUtility::makeInstance(Context::class)->getAspect('language')->getId());
             $post->addComment($comment);
             $this->postRepository->update($post);