Merge pull request #26 from ivanhrytsaim/14293-Fix-errors-in-the-blog

magefan · web-flow · commit 1118b70f7cc6 · 2025-11-14T16:57:52.000+02:00
14293-Fix-errors-in-the-blog
diff --git a/Model/BlogArchiveTypeResolver.php b/Model/BlogArchiveTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogArchiveTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_ARCHIVE = 'MF_BLOG_ARCHIVE';
-    const TYPE_RESOLVER = 'blogPostsOutput';
+    private const MF_BLOG_ARCHIVE = 'MF_BLOG_ARCHIVE';
+    private const TYPE_RESOLVER = 'blogPostsOutput';
 
     /**
      * @inheritdoc
diff --git a/Model/BlogAuthorTypeResolver.php b/Model/BlogAuthorTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogAuthorTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_AUTHOR = 'MF_BLOG_AUTHOR';
-    const TYPE_RESOLVER = 'BlogAuthor';
+    private const MF_BLOG_AUTHOR = 'MF_BLOG_AUTHOR';
+    private const TYPE_RESOLVER = 'BlogAuthor';
 
     /**
      * @inheritdoc
diff --git a/Model/BlogCategoryTypeResolver.php b/Model/BlogCategoryTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogCategoryTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_CATEGORY = 'MF_BLOG_CATEGORY';
-    const TYPE_RESOLVER = 'BlogCategory';
+    private const MF_BLOG_CATEGORY = 'MF_BLOG_CATEGORY';
+    private const TYPE_RESOLVER = 'BlogCategory';
 
     /**
      * @inheritdoc
diff --git a/Model/BlogIndexTypeResolver.php b/Model/BlogIndexTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogIndexTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_INDEX = 'MF_BLOG_INDEX';
-    const TYPE_RESOLVER = 'blogPostsOutput';
+    private const MF_BLOG_INDEX = 'MF_BLOG_INDEX';
+    private const TYPE_RESOLVER = 'blogPostsOutput';
 
     /**
      * @inheritdoc
diff --git a/Model/BlogPostTypeResolver.php b/Model/BlogPostTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogPostTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_POST = 'MF_BLOG_POST';
-    const TYPE_RESOLVER = 'BlogPost';
+    private const MF_BLOG_POST = 'MF_BLOG_POST';
+    private const TYPE_RESOLVER = 'BlogPost';
 
     /**
      * @inheritdoc
diff --git a/Model/BlogSearchTypeResolver.php b/Model/BlogSearchTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogSearchTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_SEARCH = 'MF_BLOG_SEARCH';
-    const TYPE_RESOLVER = 'blogPostsOutput';
+    private const MF_BLOG_SEARCH = 'MF_BLOG_SEARCH';
+    private const TYPE_RESOLVER = 'blogPostsOutput';
 
     /**
      * @inheritdoc
diff --git a/Model/BlogTagTypeResolver.php b/Model/BlogTagTypeResolver.php
@@ -15,8 +15,8 @@
  */
 class BlogTagTypeResolver implements TypeResolverInterface
 {
-    const MF_BLOG_TAG = 'MF_BLOG_TAG';
-    const TYPE_RESOLVER = 'BlogTag';
+    private const MF_BLOG_TAG = 'MF_BLOG_TAG';
+    private const TYPE_RESOLVER = 'BlogTag';
 
     /**
      * @inheritdoc
diff --git a/Model/Categories/FilterArgument.php b/Model/Categories/FilterArgument.php
@@ -10,10 +10,6 @@
 use Magento\Framework\GraphQl\Query\Resolver\Argument\FieldEntityAttributesInterface;
 use Magento\Framework\GraphQl\ConfigInterface;
 
-/**
- * Class FilterArgument
- * @package Magefan\BlogGraphQl\Model\Categories
- */
 class FilterArgument implements FieldEntityAttributesInterface
 {
     /** @var ConfigInterface */
diff --git a/Model/Comments/FilterArgument.php b/Model/Comments/FilterArgument.php
@@ -10,10 +10,6 @@
 use Magento\Framework\GraphQl\Query\Resolver\Argument\FieldEntityAttributesInterface;
 use Magento\Framework\GraphQl\ConfigInterface;
 
-/**
- * Class FilterArgument
- * @package Magefan\BlogGraphQl\Model\Comments
- */
 class FilterArgument implements FieldEntityAttributesInterface
 {
     /** @var ConfigInterface */
diff --git a/Model/Posts/FilterArgument.php b/Model/Posts/FilterArgument.php
@@ -10,10 +10,6 @@
 use Magento\Framework\GraphQl\Query\Resolver\Argument\FieldEntityAttributesInterface;
 use Magento\Framework\GraphQl\ConfigInterface;
 
-/**
- * Class FilterArgument
- * @package Magefan\BlogGraphQl\Model\Posts
- */
 class FilterArgument implements FieldEntityAttributesInterface
 {
     /** @var ConfigInterface */
diff --git a/Model/Resolver/AddCommentToPost.php b/Model/Resolver/AddCommentToPost.php
@@ -22,9 +22,6 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-/**
- * Class AddCommentToPost
- */
 class AddCommentToPost implements ResolverInterface
 {
     /**
@@ -150,7 +147,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
                 }
 
                 if (!$parentComment->isActive()) {
-                    throw new GraphQlNoSuchEntityException(__('You cannot reply to this comment. Comment is not longer exist.'));
+                    throw new GraphQlNoSuchEntityException(
+                        __('You cannot reply to this comment. Comment is not longer exist.')
+                    );
                 }
                 if (!$parentComment->getPost()
                     || $parentComment->getPost()->getId() != $post->getId()
diff --git a/Model/Resolver/Author.php b/Model/Resolver/Author.php
@@ -14,10 +14,6 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
-/**
- * Class Author
- * @package Magefan\BlogGraphQl\Model\Resolver
- */
 class Author implements ResolverInterface
 {
     /**
@@ -50,6 +46,8 @@ public function resolve(
     }
 
     /**
+     * Get author id
+     *
      * @param array $args
      * @return string
      * @throws GraphQlInputException
@@ -64,6 +62,8 @@ private function getAuthorId(array $args): string
     }
 
     /**
+     * Get author data
+     *
      * @param string $authorId
      * @return array
      * @throws GraphQlNoSuchEntityException
diff --git a/Model/Resolver/Categories.php b/Model/Resolver/Categories.php
@@ -16,10 +16,6 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magefan\Blog\Api\CategoryRepositoryInterface;
 
-/**
- * Class Categories
- * @package Magefan\BlogGraphQl\Model\Resolver
- */
 class Categories implements ResolverInterface
 {
     /**
diff --git a/Model/Resolver/Category.php b/Model/Resolver/Category.php
@@ -14,10 +14,6 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
-/**
- * Class Category
- * @package Magefan\BlogGraphQl\Model\Resolver
- */
 class Category implements ResolverInterface
 {
     /**
@@ -58,6 +54,8 @@ public function resolve(
     }
 
     /**
+     * Get category id
+     *
      * @param array $args
      * @return string
      * @throws GraphQlInputException
diff --git a/Model/Resolver/Comments.php b/Model/Resolver/Comments.php
@@ -17,10 +17,6 @@
 use Magefan\Blog\Api\CommentRepositoryInterface;
 use Magento\Framework\Api\SortOrderBuilder;
 
-/**
- * Class Comments
- * @package Magefan\BlogGraphQl\Model\Resolver
- */
 class Comments implements ResolverInterface
 {
     /**
diff --git a/Model/Resolver/DataProvider/Author.php b/Model/Resolver/DataProvider/Author.php
@@ -17,10 +17,6 @@
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 use Magento\Store\Model\ScopeInterface;
 
-/**
- * Class Author
- * @package Magefan\BlogGraphQl\Model\Resolver\DataProvider
- */
 class Author
 {
     /**
@@ -79,6 +75,8 @@ public function __construct(
     }
 
     /**
+     * Get author data
+     *
      * @param string $authorId
      * @return array
      * @throws NoSuchEntityException
@@ -114,8 +112,9 @@ function () use ($author, &$data) {
 
     /**
      * Prepare all additional data
-     * @param $author
-     * @param null $fields
+     *
+     * @param mixed $author
+     * @param mixed $fields
      * @return mixed
      */
     public function getDynamicData($author, $fields = null)
@@ -138,10 +137,10 @@ public function getDynamicData($author, $fields = null)
 
         foreach ($keys as $key) {
             $method = 'get' . str_replace(
-                    '_',
-                    '',
-                    ucwords($key, '_')
-                );
+                '_',
+                '',
+                ucwords($key, '_')
+            );
             $data[$key] = $author->$method();
             if ($key === 'author_url') {
                 $data[$key] = str_replace(
diff --git a/Model/Resolver/DataProvider/Category.php b/Model/Resolver/DataProvider/Category.php
@@ -17,10 +17,6 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 
-/**
- * Class Category
- * @package Magefan\BlogGraphQl\Model\Resolver\DataProvider
- */
 class Category
 {
     /**
@@ -79,8 +75,10 @@ public function __construct(
     }
 
     /**
+     * Get category data
+     *
      * @param string $categoryId
-     * @param null $fields
+     * @param null|array $fields
      * @return array
      * @throws NoSuchEntityException
      */
@@ -115,8 +113,9 @@ function () use ($category, $fields, &$data) {
 
     /**
      * Prepare all additional data
-     * @param $category
-     * @param null $fields
+     *
+     * @param mixed $category
+     * @param null|array $fields
      * @return mixed
      */
     public function getDynamicData($category, $fields = null)
@@ -131,10 +130,10 @@ public function getDynamicData($category, $fields = null)
 
         foreach ($keys as $key) {
             $method = 'get' . str_replace(
-                    '_',
-                    '',
-                    ucwords($key, '_')
-                );
+                '_',
+                '',
+                ucwords($key, '_')
+            );
             $data[$key] = $category->$method();
             if ($key === 'category_url') {
                 $data[$key] = str_replace(
diff --git a/Model/Resolver/DataProvider/Comment.php b/Model/Resolver/DataProvider/Comment.php
@@ -17,9 +17,6 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Widget\Model\Template\FilterEmulate;
 
-/**
- * Class Comment
- */
 class Comment
 {
     /**
@@ -68,8 +65,7 @@ public function __construct(
         DesignInterface $design,
         ThemeProviderInterface $themeProvider,
         ScopeConfigInterface $scopeConfig
-    )
-    {
+    ) {
         $this->commentRepository = $commentRepository;
         $this->widgetFilter = $widgetFilter;
         $this->state = $state;
@@ -79,8 +75,10 @@ public function __construct(
     }
 
     /**
+     * Get comment data
+     *
      * @param string $commentId
-     * @param null $fields
+     * @param null|array $fields
      * @return array
      * @throws NoSuchEntityException
      */
@@ -115,8 +113,9 @@ function () use ($comment, $fields, &$data) {
 
     /**
      * Prepare all additional data
-     * @param $comment
-     * @param null $fields
+     *
+     * @param mixed $comment
+     * @param null|array $fields
      * @return mixed
      */
     public function getDynamicData($comment, $fields = null)
diff --git a/Model/Resolver/DataProvider/Post.php b/Model/Resolver/DataProvider/Post.php
diff --git a/Model/Resolver/DataProvider/Tag.php b/Model/Resolver/DataProvider/Tag.php
diff --git a/Model/Resolver/Post.php b/Model/Resolver/Post.php
diff --git a/Model/Resolver/Posts.php b/Model/Resolver/Posts.php
diff --git a/Model/Resolver/Tag.php b/Model/Resolver/Tag.php
diff --git a/Model/Resolver/Tags.php b/Model/Resolver/Tags.php
diff --git a/Model/Tags/FilterArgument.php b/Model/Tags/FilterArgument.php
diff --git a/Plugin/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php b/Plugin/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
diff --git a/registration.php b/registration.php
