From cea023442b85770a2dab98325b8c8a4ca18bba8f Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Fri, 13 Jun 2025 11:55:19 +0300
Subject: [PATCH 1/5] test

---
 Block/Adminhtml/Grid/Column/Author.php        |  2 +-
 Block/Adminhtml/Grid/Column/Categories.php    |  2 +-
 Block/Adminhtml/Grid/Column/Statuses.php      |  4 +-
 Block/Adminhtml/Post/Helper/Form/Gallery.php  |  4 +-
 .../Post/Helper/Form/Gallery/Content.php      |  4 +-
 .../System/Config/Form/CheckEnableInfo.php    |  4 +-
 Block/Adminhtml/System/Config/Form/Info.php   |  4 +-
 .../Config/Form/PermalinkSettingsMessage.php  |  2 +-
 .../System/Config/Form/SitemapInfo.php        |  2 +-
 .../System/Config/Form/UpdateInfo.php         |  2 +-
 Block/Archive/Archive.php                     |  4 +-
 Block/Archive/PostList.php                    |  2 +-
 Block/Catalog/Product/RelatedPosts.php        |  2 +-
 Block/Category/PostLinks.php                  |  4 +-
 Block/Category/PostList.php                   |  2 +-
 Block/Category/SubCategoryLinks.php           |  2 +-
 Block/Index.php                               |  2 +-
 Block/Infortis/UltraMegamenu/Topmenu.php      |  2 +-
 Block/Post/Info.php                           | 10 ++---
 Block/Post/PostList.php                       |  2 +-
 Block/Post/PostList/Toolbar.php               |  8 ++--
 Block/Post/PostList/Toolbar/Pager.php         |  8 ++--
 Block/Post/View.php                           |  2 +-
 Block/Post/View/Comments.php                  |  2 +-
 Block/Post/View/Comments/Facebook.php         |  2 +-
 Block/Post/View/Comments/Magefan.php          |  2 +-
 Block/Post/View/NextPrev.php                  |  2 +-
 Block/Post/View/RelatedPosts.php              |  2 +-
 Block/Post/View/RelatedProducts.php           |  6 +--
 Block/Post/View/Richsnippets.php              |  2 +-
 Block/Rss/Feed.php                            |  2 +-
 Block/Search/PostList.php                     |  4 +-
 Block/Sidebar/Archive.php                     |  4 +-
 Block/Sidebar/Categories.php                  |  2 +-
 Block/Sidebar/Featured.php                    |  4 +-
 Block/Sidebar/Popular.php                     |  4 +-
 Block/Sidebar/PostRelatedProducts.php         |  2 +-
 Block/Sidebar/Recent.php                      |  2 +-
 Block/Sidebar/Search.php                      |  2 +-
 Block/Sidebar/TagClaud.php                    |  2 +-
 Block/Sidebar/Widget.php                      |  2 +-
 Block/Smartwave/Megamenu/Topmenu.php          |  2 +-
 Block/Social/AddThis.php                      |  2 +-
 Block/Widget/Featured.php                     |  2 +-
 Block/Widget/PostList.php                     |  6 +--
 Controller/Adminhtml/Import/Form.php          |  2 +-
 Controller/Adminhtml/Import/Index.php         |  2 +-
 Controller/Adminhtml/Import/Run.php           |  2 +-
 Controller/Adminhtml/Post/Preview.php         |  2 +-
 Controller/Adminhtml/Post/Save.php            |  2 +-
 Controller/Post/Viewscount.php                |  2 +-
 Controller/Router.php                         |  4 +-
 Cron/ReSaveExistingPosts.php                  |  2 +-
 Helper/Data.php                               |  4 +-
 Helper/Image.php                              |  8 ++--
 Model/AbstractManagement.php                  |  2 +-
 Model/Author.php                              |  8 ++--
 Model/AuthorRepository.php                    |  2 +-
 Model/Category.php                            | 18 ++++----
 Model/CategoryRepository.php                  |  2 +-
 Model/Comment.php                             | 12 +++---
 Model/Comment/Notification.php                |  2 +-
 Model/CommentRepository.php                   |  2 +-
 Model/Config.php                              | 16 +++----
 Model/Config/Source/ArchiveGroupBy.php        |  2 +-
 Model/Config/Source/Author.php                |  2 +-
 Model/Config/Source/AuthorType.php            |  2 +-
 Model/Config/Source/BlogPages.php             |  2 +-
 Model/Config/Source/Category.php              |  4 +-
 Model/Config/Source/CategoryDisplayMode.php   |  2 +-
 Model/Config/Source/CategoryPath.php          |  5 ++-
 Model/Config/Source/CategoryTree.php          |  5 ++-
 Model/Config/Source/CommentStatus.php         |  2 +-
 Model/Config/Source/CommetType.php            |  2 +-
 Model/Config/Source/DisplayMode.php           |  2 +-
 Model/Config/Source/ImageSizeOptions.php      |  2 +-
 Model/Config/Source/LazyLoad.php              |  2 +-
 Model/Config/Source/PageLayout.php            |  2 +-
 Model/Config/Source/PagePaginationType.php    |  2 +-
 Model/Config/Source/PermalinkType.php         |  2 +-
 Model/Config/Source/PostsSortBy.php           |  2 +-
 .../Source/ReadingProgressBarPosition.php     |  2 +-
 Model/Config/Source/SocialNetworks.php        |  2 +-
 Model/Config/Source/Tag.php                   |  2 +-
 Model/Image.php                               |  2 +-
 Model/Import/Aw.php                           |  2 +-
 Model/Import/Aw2.php                          |  2 +-
 Model/Import/Mageplaza.php                    |  2 +-
 Model/Import/Mageplaza1.php                   |  6 +--
 Model/Import/Mirasvit.php                     |  4 +-
 Model/Import/Wordpress.php                    |  4 +-
 Model/NoSlashUrlRedirect.php                  |  2 +-
 Model/Post.php                                | 42 +++++++++----------
 Model/PostRepository.php                      |  2 +-
 Model/PreviewUrl.php                          |  2 +-
 Model/ResourceModel/Category.php              |  8 ++--
 Model/ResourceModel/Category/Collection.php   |  6 +--
 Model/ResourceModel/Comment.php               |  2 +-
 Model/ResourceModel/Comment/Collection.php    |  4 +-
 .../ResourceModel/Comment/Collection/Grid.php |  2 +-
 .../ResourceModel/PageIdentifierGenerator.php |  4 +-
 Model/ResourceModel/Post.php                  | 12 +++---
 Model/ResourceModel/Post/Collection.php       | 16 +++----
 Model/ResourceModel/Tag.php                   | 10 ++---
 Model/ResourceModel/Tag/Collection.php        |  2 +-
 Model/ShortContentExtractor.php               |  2 +-
 Model/SlashUrlRedirect.php                    |  2 +-
 Model/Tag.php                                 | 12 +++---
 Model/Tag/AutocompleteData.php                |  2 +-
 Model/TagRepository.php                       |  2 +-
 Model/Url.php                                 | 12 +++---
 Model/UrlResolver.php                         |  6 +--
 Observer/InvalidateCache.php                  |  2 +-
 Observer/LayoutGenerateBlocksAfter.php        |  2 +-
 Observer/LayoutLoadBeforeObserver.php         |  2 +-
 ...eBlockHtmlTopmenuBethtmlBeforeObserver.php |  2 +-
 ...thFrontendBlogActionControllerObserver.php |  2 +-
 Setup/Patch/Data/CreateSamplePost.php         |  2 +-
 Setup/Patch/Data/TagInStore.php               |  2 +-
 Setup/Patch/Data/UpdatePostCommentsCount.php  |  2 +-
 .../Category/Form/CategoryDataProvider.php    |  2 +-
 .../Comment/Form/CommentDataProvider.php      |  2 +-
 .../Post/Form/PostDataProvider.php            |  2 +-
 .../Post/Related/ProductDataProvider.php      |  6 +--
 Ui/DataProvider/Tag/Form/TagDataProvider.php  |  2 +-
 ViewModel/Style.php                           |  2 +-
 126 files changed, 247 insertions(+), 241 deletions(-)

diff --git a/Block/Adminhtml/Grid/Column/Author.php b/Block/Adminhtml/Grid/Column/Author.php
index 5389a37b..229b6e0a 100755
--- a/Block/Adminhtml/Grid/Column/Author.php
+++ b/Block/Adminhtml/Grid/Column/Author.php
@@ -16,7 +16,7 @@ class Author extends \Magento\Backend\Block\Widget\Grid\Column
     /**
      * @return void
      */
-    public function _construct()
+    public function _construct(): void
     {
         parent::_construct();
         $this->_rendererTypes['author'] = \Magefan\Blog\Block\Adminhtml\Grid\Column\Render\Author::class;
diff --git a/Block/Adminhtml/Grid/Column/Categories.php b/Block/Adminhtml/Grid/Column/Categories.php
index d61aa0fd..8b3ad9f3 100755
--- a/Block/Adminhtml/Grid/Column/Categories.php
+++ b/Block/Adminhtml/Grid/Column/Categories.php
@@ -16,7 +16,7 @@ class Categories extends \Magento\Backend\Block\Widget\Grid\Column
     /**
      * @return void
      */
-    public function _construct()
+    public function _construct(): void
     {
         parent::_construct();
         $this->_rendererTypes['category'] = \Magefan\Blog\Block\Adminhtml\Grid\Column\Render\Category::class;
diff --git a/Block/Adminhtml/Grid/Column/Statuses.php b/Block/Adminhtml/Grid/Column/Statuses.php
index 6a891d92..dafc7988 100755
--- a/Block/Adminhtml/Grid/Column/Statuses.php
+++ b/Block/Adminhtml/Grid/Column/Statuses.php
@@ -18,7 +18,7 @@ class Statuses extends \Magento\Backend\Block\Widget\Grid\Column
      *
      * @return array
      */
-    public function getFrameCallback()
+    public function getFrameCallback(): array
     {
         return [$this, 'decorateStatus'];
     }
@@ -32,7 +32,7 @@ public function getFrameCallback()
      * @param bool $isExport
      * @return string
      */
-    public function decorateStatus($value, $row, $column, $isExport)
+    public function decorateStatus(string $value, $row, $column, $isExport): string
     {
         if ($row->getIsActive() || $row->getStatus()) {
             if ($row->getStatus() == 2) {
diff --git a/Block/Adminhtml/Post/Helper/Form/Gallery.php b/Block/Adminhtml/Post/Helper/Form/Gallery.php
index f221de35..b0e5b722 100644
--- a/Block/Adminhtml/Post/Helper/Form/Gallery.php
+++ b/Block/Adminhtml/Post/Helper/Form/Gallery.php
@@ -68,7 +68,7 @@ public function __construct(
         \Magento\Framework\View\Element\Context $context,
         Registry $registry,
         \Magento\Framework\Data\Form $form,
-        $data = []
+        array $data = []
     ) {
         $this->registry = $registry;
         $this->form = $form;
@@ -88,7 +88,7 @@ public function getElementHtml()
      *
      * @return array|null
      */
-    public function getImages()
+    public function getImages(): array
     {
         $result = [];
         $gallery = $this->registry->registry('current_model')->getGalleryImages();
diff --git a/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php b/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php
index 94c770b4..aabdfd8a 100644
--- a/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php
+++ b/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php
@@ -115,7 +115,7 @@ public function getUploaderHtml()
     /**
      * @return string
      */
-    public function getJsObjectName()
+    public function getJsObjectName(): string
     {
         return $this->getHtmlId() . 'JsObject';
     }
@@ -160,7 +160,7 @@ public function getImagesJson()
     private function sortImagesByPosition($images)
     {
         if (is_array($images)) {
-            usort($images, function ($imageA, $imageB) {
+            usort($images, function (array $imageA, array $imageB): int {
                 return ($imageA['position'] < $imageB['position']) ? -1 : 1;
             });
         }
diff --git a/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php b/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php
index 9882c0d4..cd79f2fb 100644
--- a/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php
+++ b/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * @return bool
      */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
         foreach ($this->_storeManager->getWebsites() as $website) {
             foreach ($website->getGroups() as $group) {
@@ -90,7 +90,7 @@ public function isEnabled()
     /**
      * @return bool
      */
-    public function isKeyMissing()
+    public function isKeyMissing(): bool
     {
         $section = ObjectManager::getInstance()->create(Section::class, ['name' => 'mfblog']);
         return !$this->config->getConfig(self::XML_PATH_KEY)
diff --git a/Block/Adminhtml/System/Config/Form/Info.php b/Block/Adminhtml/System/Config/Form/Info.php
index 834defc8..5021d5c7 100755
--- a/Block/Adminhtml/System/Config/Form/Info.php
+++ b/Block/Adminhtml/System/Config/Form/Info.php
@@ -19,7 +19,7 @@ class Info extends \Magefan\Community\Block\Adminhtml\System\Config\Form\Info
      * Return extension url
      * @return string
      */
-    protected function getModuleUrl()
+    protected function getModuleUrl(): string
     {
         return 'https://mage' . 'fan.com/magento2-blog-extension';
     }
@@ -28,7 +28,7 @@ protected function getModuleUrl()
      * Return extension title
      * @return string
      */
-    protected function getModuleTitle()
+    protected function getModuleTitle(): string
     {
         return 'Blog Extension';
     }
diff --git a/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php b/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php
index 2b413358..28371cae 100644
--- a/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php
+++ b/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php
@@ -13,7 +13,7 @@ class PermalinkSettingsMessage extends \Magefan\Community\Block\Adminhtml\System
      * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element): string
     {
 
         $html = '<div id="advencedNotification" style="display:none;padding:10px;background-color:#fffbbb;border:1px solid #ddd;margin-bottom:7px;">
diff --git a/Block/Adminhtml/System/Config/Form/SitemapInfo.php b/Block/Adminhtml/System/Config/Form/SitemapInfo.php
index b672045f..28019fad 100644
--- a/Block/Adminhtml/System/Config/Form/SitemapInfo.php
+++ b/Block/Adminhtml/System/Config/Form/SitemapInfo.php
@@ -12,7 +12,7 @@ class SitemapInfo extends \Magefan\Community\Block\Adminhtml\System\Config\Form\
      * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element): string
     {
         $m = $this->moduleList->getOne($this->getModuleName());
         $html = '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">
diff --git a/Block/Adminhtml/System/Config/Form/UpdateInfo.php b/Block/Adminhtml/System/Config/Form/UpdateInfo.php
index 336ec8f9..6d669198 100644
--- a/Block/Adminhtml/System/Config/Form/UpdateInfo.php
+++ b/Block/Adminhtml/System/Config/Form/UpdateInfo.php
@@ -121,7 +121,7 @@ public function getLatestVersion()
     /**
      * @return bool
      */
-    public function needToUpdate()
+    public function needToUpdate(): bool
     {
         return (version_compare($this->getCurrentVersion(), $this->getLatestVersion()) < 0);
     }
diff --git a/Block/Archive/Archive.php b/Block/Archive/Archive.php
index 811ba6ba..0b051b42 100644
--- a/Block/Archive/Archive.php
+++ b/Block/Archive/Archive.php
@@ -14,7 +14,7 @@ trait Archive
      * Get archive month
      * @return int
      */
-    public function getMonth()
+    public function getMonth(): int
     {
         return (int)$this->_coreRegistry->registry('current_blog_archive_month');
     }
@@ -23,7 +23,7 @@ public function getMonth()
      * Get archive year
      * @return int
      */
-    public function getYear()
+    public function getYear(): int
     {
         return (int)$this->_coreRegistry->registry('current_blog_archive_year');
     }
diff --git a/Block/Archive/PostList.php b/Block/Archive/PostList.php
index 50b42f32..97d4d2e3 100755
--- a/Block/Archive/PostList.php
+++ b/Block/Archive/PostList.php
@@ -84,7 +84,7 @@ protected function _prepareLayout()
      * @param $param
      * @return mixed
      */
-    protected function _getConfigValue($param)
+    protected function _getConfigValue(string $param)
     {
         return $this->_scopeConfig->getValue(
             'mfblog/archive/'.$param,
diff --git a/Block/Catalog/Product/RelatedPosts.php b/Block/Catalog/Product/RelatedPosts.php
index fe7474c1..307a0c0b 100755
--- a/Block/Catalog/Product/RelatedPosts.php
+++ b/Block/Catalog/Product/RelatedPosts.php
@@ -50,7 +50,7 @@ protected function _preparePostCollection()
      * Retrieve true if Display Related Posts enabled
      * @return boolean
      */
-    public function displayPosts()
+    public function displayPosts(): bool
     {
         return (bool) $this->_scopeConfig->getValue(
             'mfblog/product_page/related_posts_enabled',
diff --git a/Block/Category/PostLinks.php b/Block/Category/PostLinks.php
index b6547a51..00b20b92 100644
--- a/Block/Category/PostLinks.php
+++ b/Block/Category/PostLinks.php
@@ -30,7 +30,7 @@ protected function _beforeToHtml()
      *
      * @return bool
      */
-    protected function canDisplay()
+    protected function canDisplay(): bool
     {
         $displayMode = $this->getCategory()->getData('display_mode');
         return ($displayMode == CategoryDisplayMode::POSTS_AND_SUBCATEGORIES_LINKS ||
@@ -45,7 +45,7 @@ protected function canDisplay()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      */
-    protected function _addBreadcrumbs($title = null, $key = null)
+    protected function _addBreadcrumbs($title = null, $key = null): null
     {
         return null;
     }
diff --git a/Block/Category/PostList.php b/Block/Category/PostList.php
index 85407ccf..103ddb1c 100644
--- a/Block/Category/PostList.php
+++ b/Block/Category/PostList.php
@@ -80,7 +80,7 @@ public function getCategory()
      *
      * @return bool
      */
-    protected function canDisplay()
+    protected function canDisplay(): bool
     {
         $displayMode = $this->getCategory()->getData('display_mode');
         return ($displayMode == CategoryDisplayMode::POSTS);
diff --git a/Block/Category/SubCategoryLinks.php b/Block/Category/SubCategoryLinks.php
index cc34ff7a..1fbf9082 100644
--- a/Block/Category/SubCategoryLinks.php
+++ b/Block/Category/SubCategoryLinks.php
@@ -63,7 +63,7 @@ public function getSubCategories()
      *
      * @return bool
      */
-    protected function canDisplay()
+    protected function canDisplay(): bool
     {
         $displayMode = $this->getCategory()->getData('display_mode');
         return ($displayMode == CategoryDisplayMode::SUBCATEGORIES_LINKS
diff --git a/Block/Index.php b/Block/Index.php
index 21e4a60c..239a1c9f 100644
--- a/Block/Index.php
+++ b/Block/Index.php
@@ -146,7 +146,7 @@ public function getCollectionOrderDirection()
      * Retrieve blog title
      * @return string
      */
-    protected function _getConfigValue($param)
+    protected function _getConfigValue(string $param)
     {
         return $this->_scopeConfig->getValue(
             'mfblog/index_page/'.$param,
diff --git a/Block/Infortis/UltraMegamenu/Topmenu.php b/Block/Infortis/UltraMegamenu/Topmenu.php
index 9cf13ec7..d8079a8b 100644
--- a/Block/Infortis/UltraMegamenu/Topmenu.php
+++ b/Block/Infortis/UltraMegamenu/Topmenu.php
@@ -79,7 +79,7 @@ protected function _toHtml()
         return $html;
     }
 
-    public function getSubmenuItemsHtml($children, $level = 1, $max_level = 0)
+    public function getSubmenuItemsHtml($children, $level = 1, $max_level = 0): string
     {
         $html = '';
 
diff --git a/Block/Post/Info.php b/Block/Post/Info.php
index 677749a6..ecfcacdf 100755
--- a/Block/Post/Info.php
+++ b/Block/Post/Info.php
@@ -36,7 +36,7 @@ public function getPostedOn($format = 'Y-m-d H:i:s')
      * Retrieve 1 if display author information is enabled
      * @return int
      */
-    public function authorEnabled()
+    public function authorEnabled(): int
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/author/enabled',
@@ -48,7 +48,7 @@ public function authorEnabled()
      * Retrieve 1 if author page is enabled
      * @return int
      */
-    public function authorPageEnabled()
+    public function authorPageEnabled(): int
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/author/page_enabled',
@@ -60,7 +60,7 @@ public function authorPageEnabled()
      * Retrieve true if magefan comments are enabled
      * @return bool
      */
-    public function magefanCommentsEnabled()
+    public function magefanCommentsEnabled(): bool
     {
         return $this->_scopeConfig->getValue(
             'mfblog/post_view/comments/type',
@@ -71,7 +71,7 @@ public function magefanCommentsEnabled()
     /**
      * @return bool
      */
-    public function viewsCountEnabled()
+    public function viewsCountEnabled(): bool
     {
         return (bool)$this->_scopeConfig->getValue(
             'mfblog/post_view/views_count/enabled',
@@ -83,7 +83,7 @@ public function viewsCountEnabled()
      * Retrieve 1 if display reading time is enabled
      * @return int
      */
-    public function readingTimeEnabled()
+    public function readingTimeEnabled(): int
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/post_view/reading_time/enabled',
diff --git a/Block/Post/PostList.php b/Block/Post/PostList.php
index 1fbdbb8e..ee025534 100755
--- a/Block/Post/PostList.php
+++ b/Block/Post/PostList.php
@@ -90,7 +90,7 @@ public function getTemplate()
      *
      * @return string
      */
-    protected function getPostTemplateType()
+    protected function getPostTemplateType(): string
     {
         return (string)$this->_scopeConfig->getValue(
             'mfblog/post_list/template',
diff --git a/Block/Post/PostList/Toolbar.php b/Block/Post/PostList/Toolbar.php
index 92310213..cf683066 100755
--- a/Block/Post/PostList/Toolbar.php
+++ b/Block/Post/PostList/Toolbar.php
@@ -60,7 +60,7 @@ public function __construct(
      * @param \Magento\Framework\Data\Collection $collection
      * @return $this
      */
-    public function setCollection($collection)
+    public function setCollection($collection): static
     {
         $this->_collection = $collection;
 
@@ -105,7 +105,7 @@ public function getLimit()
      *
      * @return int
      */
-    public function getCurrentPage()
+    public function getCurrentPage(): int
     {
         $page = (int) $this->_request->getParam($this->getPageParamName());
         return $page ? $page : 1;
@@ -114,7 +114,7 @@ public function getCurrentPage()
     /**
      * @return bool|\Magento\Framework\DataObject|\Magento\Framework\View\Element\AbstractBlock|\Magento\Theme\Block\Html\Pager
      */
-    public function getPagerBlock()
+    public function getPagerBlock(): \Magento\Framework\DataObject|false
     {
         $pagerBlock = $this->getChildBlock('post_list_toolbar_pager');
         if ($pagerBlock instanceof \Magento\Framework\DataObject) {
@@ -169,7 +169,7 @@ public function getPagerHtml()
     /**
      * @return string
      */
-    public function getPageParamName()
+    public function getPageParamName(): string
     {
         return $this->config->getPagePaginationType() !== 'p' ? 'page' : 'p';
     }
diff --git a/Block/Post/PostList/Toolbar/Pager.php b/Block/Post/PostList/Toolbar/Pager.php
index 5e2ab30a..dda682fa 100755
--- a/Block/Post/PostList/Toolbar/Pager.php
+++ b/Block/Post/PostList/Toolbar/Pager.php
@@ -23,7 +23,7 @@ class Pager extends \Magento\Theme\Block\Html\Pager
      *
      * @return string
      */
-    public function getPagesUrls()
+    public function getPagesUrls(): array
     {
         $urls = [];
         for ($page = $this->getCurrentPage() + 1; $page <= $this->getLastPageNum(); $page++) {
@@ -38,7 +38,7 @@ public function getPagesUrls()
      *
      * @return bool
      */
-    public function useLazyload()
+    public function useLazyload(): bool
     {
         $lastPage = $this->getLastPageNum();
         $currentPage = $this->getCurrentPage();
@@ -74,7 +74,7 @@ public function getLazyloadConfig(array $config = [])
      *
      * @return int
      */
-    public function getLazyloadMode()
+    public function getLazyloadMode(): int
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/post_list/lazyload_enabled',
@@ -87,7 +87,7 @@ public function getLazyloadMode()
      *
      * @return int
      */
-    public function getLazyloadPadding()
+    public function getLazyloadPadding(): int
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/post_list/lazyload_padding',
diff --git a/Block/Post/View.php b/Block/Post/View.php
index bd28134e..c12334bc 100755
--- a/Block/Post/View.php
+++ b/Block/Post/View.php
@@ -156,7 +156,7 @@ public function getTemplate()
      * Retrieve 1 if display reading time is enabled
      * @return int
      */
-    public function readingTimeEnabled()
+    public function readingTimeEnabled(): int
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/post_view/reading_time/enabled',
diff --git a/Block/Post/View/Comments.php b/Block/Post/View/Comments.php
index a54742cc..25c51d1e 100755
--- a/Block/Post/View/Comments.php
+++ b/Block/Post/View/Comments.php
@@ -81,7 +81,7 @@ public function displayPrivacyPolicyCheckbox()
      * Retrieve number of comments to display
      * @return int
      */
-    public function getNumberOfComments()
+    public function getNumberOfComments(): int
     {
         return (int)$this->_scopeConfig->getValue(
             'mfblog/post_view/comments/number_of_comments',
diff --git a/Block/Post/View/Comments/Facebook.php b/Block/Post/View/Comments/Facebook.php
index 0ca6a49d..9e21114c 100755
--- a/Block/Post/View/Comments/Facebook.php
+++ b/Block/Post/View/Comments/Facebook.php
@@ -23,7 +23,7 @@ class Facebook extends \Magefan\Blog\Block\Post\View\Comments
     /**
      * @return string
      */
-    public function getFbSdkJsUrl()
+    public function getFbSdkJsUrl(): string
     {
         return '//connect.facebook.net/'.
             $this->getLocaleCode() . '/sdk.js#xfbml=1&version=v3.3&appId=' .
diff --git a/Block/Post/View/Comments/Magefan.php b/Block/Post/View/Comments/Magefan.php
index 2dc2c372..de15c62c 100755
--- a/Block/Post/View/Comments/Magefan.php
+++ b/Block/Post/View/Comments/Magefan.php
@@ -151,7 +151,7 @@ public function getCustomerUrl()
      *
      * @return string
      */
-    public function canPost()
+    public function canPost(): bool
     {
         return $this->_scopeConfig->getValue(
             \Magefan\Blog\Model\Config::GUEST_COMMENT,
diff --git a/Block/Post/View/NextPrev.php b/Block/Post/View/NextPrev.php
index 7e76e6a1..1b95805a 100755
--- a/Block/Post/View/NextPrev.php
+++ b/Block/Post/View/NextPrev.php
@@ -75,7 +75,7 @@ public function __construct(
      *
      * @return boolean
      */
-    public function displayLinks()
+    public function displayLinks(): bool
     {
         return (bool)$this->_scopeConfig->getValue(
             'mfblog/post_view/nextprev/enabled',
diff --git a/Block/Post/View/RelatedPosts.php b/Block/Post/View/RelatedPosts.php
index 68e49ecf..8902242a 100755
--- a/Block/Post/View/RelatedPosts.php
+++ b/Block/Post/View/RelatedPosts.php
@@ -39,7 +39,7 @@ protected function _preparePostCollection()
      * Retrieve true if Display Related Posts enabled
      * @return boolean
      */
-    public function displayPosts()
+    public function displayPosts(): bool
     {
         return (bool) $this->_scopeConfig->getValue(
             \Magefan\Blog\Model\Config::XML_RELATED_POSTS_ENABLED,
diff --git a/Block/Post/View/RelatedProducts.php b/Block/Post/View/RelatedProducts.php
index afd5a54f..3df074b0 100755
--- a/Block/Post/View/RelatedProducts.php
+++ b/Block/Post/View/RelatedProducts.php
@@ -58,7 +58,7 @@ public function __construct(
      * Premare block data
      * @return $this
      */
-    protected function _prepareCollection()
+    protected function _prepareCollection(): static
     {
         $post = $this->getPost();
 
@@ -98,7 +98,7 @@ protected function _prepareCollection()
      * Retrieve true if Display Related Products enabled
      * @return boolean
      */
-    public function displayProducts()
+    public function displayProducts(): bool
     {
         return (bool) $this->_scopeConfig->getValue(
             \Magefan\Blog\Model\Config::XML_RELATED_PRODUCTS_ENABLED,
@@ -183,7 +183,7 @@ public function getItemCollection()
     /**
      * @return int
      */
-    public function hasItems()
+    public function hasItems(): int
     {
         return count($this->getItems());
     }
diff --git a/Block/Post/View/Richsnippets.php b/Block/Post/View/Richsnippets.php
index da90d2e9..c182ea30 100755
--- a/Block/Post/View/Richsnippets.php
+++ b/Block/Post/View/Richsnippets.php
@@ -53,7 +53,7 @@ public function getOptions(): array
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getOptionsByType($type)
+    public function getOptionsByType($type): array
     {
         $post = $this->getPost();
 
diff --git a/Block/Rss/Feed.php b/Block/Rss/Feed.php
index 5cb2d2d2..644d0b11 100755
--- a/Block/Rss/Feed.php
+++ b/Block/Rss/Feed.php
@@ -61,7 +61,7 @@ public function getPageSize()
      * @param  \Magefan\Blog\Model\Post $post
      * @return string
      */
-    public function getPostContent($post)
+    public function getPostContent($post): string|array|null
     {
         $content = $post->getFilteredContent();
         /* Remove iframes */
diff --git a/Block/Search/PostList.php b/Block/Search/PostList.php
index fe1e5843..3bdcf4cb 100755
--- a/Block/Search/PostList.php
+++ b/Block/Search/PostList.php
@@ -19,7 +19,7 @@ class PostList extends \Magefan\Blog\Block\Post\PostList
      * Retrieve query
      * @return string
      */
-    public function getQuery()
+    public function getQuery(): string
     {
         return urldecode((string)$this->getRequest()->getParam('q'));
     }
@@ -46,7 +46,7 @@ protected function _preparePostCollection()
      *
      * @return string
      */
-    public function getCollectionOrderField()
+    public function getCollectionOrderField(): string
     {
         return 'search_rate';
     }
diff --git a/Block/Sidebar/Archive.php b/Block/Sidebar/Archive.php
index 0331754b..56c70314 100755
--- a/Block/Sidebar/Archive.php
+++ b/Block/Sidebar/Archive.php
@@ -68,7 +68,7 @@ public function getMonths()
      * @param  int $time
      * @return string
      */
-    public function getYear($time)
+    public function getYear($time): string
     {
         return date('Y', $time);
     }
@@ -109,7 +109,7 @@ public function getTimeUrl($time)
      *
      * @return array
      */
-    public function getIdentities()
+    public function getIdentities(): array
     {
         return [];
     }
diff --git a/Block/Sidebar/Categories.php b/Block/Sidebar/Categories.php
index 054284cf..a0bd7da9 100755
--- a/Block/Sidebar/Categories.php
+++ b/Block/Sidebar/Categories.php
@@ -91,7 +91,7 @@ public function showPostsCount()
      * Retrieve categories maximum depth
      * @return int
      */
-    public function maxDepth()
+    public function maxDepth(): int
     {
         $maxDepth = $this->_scopeConfig->getValue(
             'mfblog/sidebar/'.$this->_widgetKey.'/max_depth',
diff --git a/Block/Sidebar/Featured.php b/Block/Sidebar/Featured.php
index 1e378d9f..eeb8759c 100644
--- a/Block/Sidebar/Featured.php
+++ b/Block/Sidebar/Featured.php
@@ -54,7 +54,7 @@ protected function _preparePostCollection()
      * Retrieve post ids string
      * @return string
      */
-    protected function getPostIdsConfigValue()
+    protected function getPostIdsConfigValue(): string
     {
         return (string)$this->_scopeConfig->getValue(
             'mfblog/sidebar/'.$this->_widgetKey.'/posts_ids',
@@ -66,7 +66,7 @@ protected function getPostIdsConfigValue()
      * Retrieve true if display the post image is enabled in the config
      * @return bool
      */
-    public function getDisplayImage()
+    public function getDisplayImage(): bool
     {
         return (bool)$this->_scopeConfig->getValue(
             'mfblog/sidebar/'.$this->_widgetKey.'/display_image',
diff --git a/Block/Sidebar/Popular.php b/Block/Sidebar/Popular.php
index 6c3bc5ca..4368043c 100644
--- a/Block/Sidebar/Popular.php
+++ b/Block/Sidebar/Popular.php
@@ -39,7 +39,7 @@ public function _construct()
      *
      * @return string
      */
-    public function getCollectionOrderField()
+    public function getCollectionOrderField(): string
     {
         return 'views_count';
     }
@@ -48,7 +48,7 @@ public function getCollectionOrderField()
      * Retrieve true if display the post image is enabled in the config
      * @return bool
      */
-    public function getDisplayImage()
+    public function getDisplayImage(): bool
     {
         return (bool)$this->_scopeConfig->getValue(
             'mfblog/sidebar/'.$this->_widgetKey.'/display_image',
diff --git a/Block/Sidebar/PostRelatedProducts.php b/Block/Sidebar/PostRelatedProducts.php
index 8387bcf5..732531ac 100644
--- a/Block/Sidebar/PostRelatedProducts.php
+++ b/Block/Sidebar/PostRelatedProducts.php
@@ -60,7 +60,7 @@ public function __construct(
      * Premare block data
      * @return $this
      */
-    protected function _prepareCollection()
+    protected function _prepareCollection(): static
     {
         $post = $this->getPost();
 
diff --git a/Block/Sidebar/Recent.php b/Block/Sidebar/Recent.php
index d5fa5656..5f1ce212 100755
--- a/Block/Sidebar/Recent.php
+++ b/Block/Sidebar/Recent.php
@@ -49,7 +49,7 @@ protected function _preparePostCollection()
      * Retrieve true if display the post image is enabled in the config
      * @return bool
      */
-    public function getDisplayImage()
+    public function getDisplayImage(): bool
     {
         return (bool)$this->_scopeConfig->getValue(
             'mfblog/sidebar/'.$this->_widgetKey.'/display_image',
diff --git a/Block/Sidebar/Search.php b/Block/Sidebar/Search.php
index 551f09a7..5db2f015 100755
--- a/Block/Sidebar/Search.php
+++ b/Block/Sidebar/Search.php
@@ -45,7 +45,7 @@ public function __construct(
      * Retrieve query
      * @return string
      */
-    public function getQuery()
+    public function getQuery(): string
     {
         return urldecode($this->getRequest()->getParam('q', ''));
     }
diff --git a/Block/Sidebar/TagClaud.php b/Block/Sidebar/TagClaud.php
index 44059f09..4c40a968 100755
--- a/Block/Sidebar/TagClaud.php
+++ b/Block/Sidebar/TagClaud.php
@@ -123,7 +123,7 @@ public function getMaxCount()
      * Retrieve tag class
      * @return array
      */
-    public function getTagClass($tag)
+    public function getTagClass($tag): string
     {
         $maxCount = $this->getMaxCount();
         $percent = floor(($tag->getCount() / $maxCount) * 100);
diff --git a/Block/Sidebar/Widget.php b/Block/Sidebar/Widget.php
index 23e12c01..fea592d6 100755
--- a/Block/Sidebar/Widget.php
+++ b/Block/Sidebar/Widget.php
@@ -17,7 +17,7 @@ trait Widget
      * Retrieve block sort order
      * @return int
      */
-    public function getSortOrder()
+    public function getSortOrder(): int
     {
         if (!$this->hasData('sort_order')) {
             $this->setData('sort_order', $this->_scopeConfig->getValue(
diff --git a/Block/Smartwave/Megamenu/Topmenu.php b/Block/Smartwave/Megamenu/Topmenu.php
index f2c47989..efb5db4f 100644
--- a/Block/Smartwave/Megamenu/Topmenu.php
+++ b/Block/Smartwave/Megamenu/Topmenu.php
@@ -103,7 +103,7 @@ public function getSubmenuItemsHtml(
         $column_width = 12,
         $menu_type = 'fullwidth',
         $columns = null
-    ) {
+    ): string {
         $html = '';
 
         if (!$max_level ||
diff --git a/Block/Social/AddThis.php b/Block/Social/AddThis.php
index 78a4dca2..cbc98635 100644
--- a/Block/Social/AddThis.php
+++ b/Block/Social/AddThis.php
@@ -11,7 +11,7 @@ class AddThis extends \Magento\Framework\View\Element\Template
      *
      * @return boolean
      */
-    public function getAddThisEnabled()
+    public function getAddThisEnabled(): bool
     {
         return (bool)$this->_scopeConfig->getValue(
             'mfblog/social/add_this_enabled',
diff --git a/Block/Widget/Featured.php b/Block/Widget/Featured.php
index b6fd5cf8..733983e3 100644
--- a/Block/Widget/Featured.php
+++ b/Block/Widget/Featured.php
@@ -44,7 +44,7 @@ public function getTitle()
      *
      * @return string
      */
-    protected function getPostIdsConfigValue()
+    protected function getPostIdsConfigValue(): string
     {
         return (string)$this->getData('posts_ids');
     }
diff --git a/Block/Widget/PostList.php b/Block/Widget/PostList.php
index 306e4f95..ceb49bb5 100644
--- a/Block/Widget/PostList.php
+++ b/Block/Widget/PostList.php
@@ -57,12 +57,12 @@ public function getPostCollection()
         return $this->_postCollection;
     }
 
-    public function getPostedOn($post, $format = 'Y-m-d H:i:s')
+    public function getPostedOn($post, $format = 'Y-m-d H:i:s'): string
     {
         return date($format, strtotime((string)$post->getData('publish_time')));
     }
     
-    public function getOriginalPostImage($post)
+    public function getOriginalPostImage($post): string
     {
         $imgageFile = $post->getPostImage();
         return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA).$imgageFile;
@@ -192,7 +192,7 @@ public function getElementShow()
         return $this->_show;
     }
     
-    public function isShow($item)
+    public function isShow($item): bool
     {
         return in_array($item, $this->getElementShow());
     }
diff --git a/Controller/Adminhtml/Import/Form.php b/Controller/Adminhtml/Import/Form.php
index 5ea763d0..5d9e3a9b 100755
--- a/Controller/Adminhtml/Import/Form.php
+++ b/Controller/Adminhtml/Import/Form.php
@@ -24,7 +24,7 @@ class Form extends \Magento\Backend\App\Action
      * Prepare wordpress import
      * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute()
+    public function execute(): void
     {
         try {
             if (!$this->getConfig()->isEnabled()) {
diff --git a/Controller/Adminhtml/Import/Index.php b/Controller/Adminhtml/Import/Index.php
index 915dc688..aff94f96 100755
--- a/Controller/Adminhtml/Import/Index.php
+++ b/Controller/Adminhtml/Import/Index.php
@@ -17,7 +17,7 @@ class Index extends \Magento\Backend\App\Action
      * Start available import execute
      * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute()
+    public function execute(): void
     {
         $this->_view->loadLayout();
         $this->_setActiveMenu('Magefan_Blog::import');
diff --git a/Controller/Adminhtml/Import/Run.php b/Controller/Adminhtml/Import/Run.php
index 4f3a3fb7..5632e776 100755
--- a/Controller/Adminhtml/Import/Run.php
+++ b/Controller/Adminhtml/Import/Run.php
@@ -17,7 +17,7 @@ class Run extends \Magento\Backend\App\Action
      * Run import
      * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute()
+    public function execute(): void
     {
         //set_time_limit(0);
 
diff --git a/Controller/Adminhtml/Post/Preview.php b/Controller/Adminhtml/Post/Preview.php
index ec0526ba..4f778080 100755
--- a/Controller/Adminhtml/Post/Preview.php
+++ b/Controller/Adminhtml/Post/Preview.php
@@ -13,7 +13,7 @@
  */
 class Preview extends \Magefan\Blog\Controller\Adminhtml\Post
 {
-    public function execute()
+    public function execute(): void
     {
         try {
             $post = $this->_getModel();
diff --git a/Controller/Adminhtml/Post/Save.php b/Controller/Adminhtml/Post/Save.php
index ccf75ad7..d461b729 100755
--- a/Controller/Adminhtml/Post/Save.php
+++ b/Controller/Adminhtml/Post/Save.php
@@ -69,7 +69,7 @@ protected function _beforeSave($model, $request)
 
         if (!empty($data['media_gallery']['images'])) {
             $images = $data['media_gallery']['images'];
-            usort($images, function ($imageA, $imageB) {
+            usort($images, function ($imageA, $imageB): int {
                 if (!isset($imageA['position'])) {
                     $imageA['position'] = 0;
                 }
diff --git a/Controller/Post/Viewscount.php b/Controller/Post/Viewscount.php
index 304c4b31..06ea9526 100644
--- a/Controller/Post/Viewscount.php
+++ b/Controller/Post/Viewscount.php
@@ -18,7 +18,7 @@ class Viewscount extends View
      * @return $this|\Magento\Framework\Controller\ResultInterface
      * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
-    public function execute()
+    public function execute(): void
     {
         $post = parent::_initPost();
         if ($post && $post->getId()) {
diff --git a/Controller/Router.php b/Controller/Router.php
index 44870edc..623a5455 100755
--- a/Controller/Router.php
+++ b/Controller/Router.php
@@ -457,7 +457,7 @@ protected function _getTagId($identifier, $checkSufix = true)
      * @return mixed
      * @deprecated Use URL resolver interface instead
      */
-    protected function getObjectId($factory, $controllerName, $identifier, $checkSufix)
+    protected function getObjectId($factory, string $controllerName, string $identifier, $checkSufix)
     {
         $key =  $controllerName . '-' .$identifier . ($checkSufix ? '-checksufix' : '');
         if (!isset($this->ids[$key])) {
@@ -485,7 +485,7 @@ protected function getObjectId($factory, $controllerName, $identifier, $checkSuf
      * @return boolean
      * @deprecated Use URL resolver interface instead
      */
-    protected function _isArchiveIdentifier($identifier)
+    protected function _isArchiveIdentifier($identifier): bool
     {
         $info = explode('-', $identifier);
         return count($info) == 2
diff --git a/Cron/ReSaveExistingPosts.php b/Cron/ReSaveExistingPosts.php
index cc0a92c5..6c57b60c 100644
--- a/Cron/ReSaveExistingPosts.php
+++ b/Cron/ReSaveExistingPosts.php
@@ -57,7 +57,7 @@ public function __construct(
     /**
      * @return void
      */
-    public function execute()
+    public function execute(): void
     {
         if (!$this->config->isEnabled()) {
             return;
diff --git a/Helper/Data.php b/Helper/Data.php
index 6948fedb..5ac746e8 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -25,7 +25,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param  string $dateOrTime
      * @return string
      */
-    public static function getTranslatedDate($format, $dateOrTime)
+    public static function getTranslatedDate($format, $dateOrTime): string|array
     {
         $time = is_numeric($dateOrTime) ? $dateOrTime : strtotime((string)$dateOrTime);
         $month = ['F' => '%1', 'M' => '%2'];
@@ -61,7 +61,7 @@ public function getConfig($path, $storeId = null)
     /**
      * @return mixed
      */
-    public function isOriginMfLazyLoadEnable()
+    public function isOriginMfLazyLoadEnable(): bool
     {
         return $this->getConfig(self::XML_PATH_MFLAZYLOAD_ENABLED) && ($this->getConfig(self::XML_PATH_MFLAZYLOAD_METHOD) == 0) && $this->_moduleManager->isEnabled('Magefan_LazyLoad');
     }
diff --git a/Helper/Image.php b/Helper/Image.php
index 6e16b2b6..d714649d 100644
--- a/Helper/Image.php
+++ b/Helper/Image.php
@@ -88,7 +88,7 @@ public function __construct(
      * @param $baseFile
      * @return $this
      */
-    public function init($baseFile)
+    public function init($baseFile): static
     {
         $this->_newFile = '';
         $this->_baseFile = $baseFile;
@@ -100,7 +100,7 @@ public function init($baseFile)
      * @param null $height
      * @return $this
      */
-    public function resize($width, $height = null, $keepFrame = null)
+    public function resize(string $width, $height = null, $keepFrame = null): static
     {
         if ($this->_baseFile) {
             $pathinfo = pathinfo(($this->_baseFile));
@@ -155,7 +155,7 @@ public function getWidthAndHeigth(): array
      * @param $height
      * @return $this
      */
-    protected function resizeBaseFile($width, $height, $keepFrame)
+    protected function resizeBaseFile($width, $height, $keepFrame): static
     {
         if (!$this->fileExists($this->_baseFile)) {
             $this->_baseFile = null;
@@ -197,7 +197,7 @@ protected function fileExists($filename)
      * @return string
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function __toString()
+    public function __toString(): string
     {
         $url = "";
         if ($this->_baseFile) {
diff --git a/Model/AbstractManagement.php b/Model/AbstractManagement.php
index 1fc7a134..1425f122 100644
--- a/Model/AbstractManagement.php
+++ b/Model/AbstractManagement.php
@@ -62,7 +62,7 @@ public function saveFile($fileName, $fileContent)
      * @param $fileDriver
      * @return string
      */
-    protected function getUniqueFileName($directory, $fileName, $fileDriver)
+    protected function getUniqueFileName(string $directory, $fileName, $fileDriver)
     {
         $name = pathinfo($fileName, PATHINFO_FILENAME);
         $extension = pathinfo($fileName, PATHINFO_EXTENSION);
diff --git a/Model/Author.php b/Model/Author.php
index a070e189..1827679f 100755
--- a/Model/Author.php
+++ b/Model/Author.php
@@ -93,7 +93,7 @@ public function getTitle()
      * Retrieve meta title
      * @return string
      */
-    public function getMetaTitle()
+    public function getMetaTitle(): string
     {
         $title = $this->getData('meta_title');
         if (!$title) {
@@ -107,7 +107,7 @@ public function getMetaTitle()
      * Retrieve meta description
      * @return string
      */
-    public function getMetaDescription()
+    public function getMetaDescription(): string
     {
         $desc = $this->getData('meta_description');
         if (!$desc) {
@@ -134,7 +134,7 @@ public function getMetaDescription()
      * Retrieve author identifier
      * @return string | null
      */
-    public function getIdentifier()
+    public function getIdentifier(): ?string
     {
         return preg_replace(
             "/[^A-Za-z0-9\-]/",
@@ -186,7 +186,7 @@ public function getAuthorUrl()
      * @param string $separator
      * @return string
      */
-    public function getName($separator = ' ')
+    public function getName(string $separator = ' '): string
     {
         return $this->getFirstname() . $separator . $this->getLastname();
     }
diff --git a/Model/AuthorRepository.php b/Model/AuthorRepository.php
index c6790243..b11026a7 100644
--- a/Model/AuthorRepository.php
+++ b/Model/AuthorRepository.php
@@ -148,7 +148,7 @@ public function getById($authorId, $editMode = false, $storeId = null, $forceRel
      * @throws CouldNotDeleteException
      * @throws StateException
      */
-    public function delete(AuthorInterface $author)
+    public function delete(AuthorInterface $author): bool
     {
         try {
             $this->authorResourceModel->delete($author);
diff --git a/Model/Category.php b/Model/Category.php
index 7e0a0001..57737cdf 100755
--- a/Model/Category.php
+++ b/Model/Category.php
@@ -187,7 +187,7 @@ public function getControllerName()
      * @param  boolean $plural
      * @return string
      */
-    public function getOwnTitle($plural = false)
+    public function getOwnTitle($plural = false): string
     {
         return $plural ? 'Categories' : 'Category';
     }
@@ -197,7 +197,7 @@ public function getOwnTitle($plural = false)
      * Retrieve true if category is active
      * @return boolean [description]
      */
-    public function isActive()
+    public function isActive(): bool
     {
         return ($this->getIsActive() == self::STATUS_ENABLED);
     }
@@ -206,7 +206,7 @@ public function isActive()
      * Retrieve available category statuses
      * @return array
      */
-    public function getAvailableStatuses()
+    public function getAvailableStatuses(): array
     {
         return [self::STATUS_DISABLED => __('Disabled'), self::STATUS_ENABLED => __('Enabled')];
     }
@@ -282,7 +282,7 @@ public function getParentCategory()
      * @param  self  $category
      * @return boolean
      */
-    public function isParent($category)
+    public function isParent($category): bool
     {
         if (is_object($category)) {
             $category = $category->getId();
@@ -336,7 +336,7 @@ public function isChild($category)
      * Retrieve category depth level
      * @return int
      */
-    public function getLevel()
+    public function getLevel(): int
     {
         return count($this->getParentIds());
     }
@@ -377,7 +377,7 @@ public function getCanonicalUrl()
      * Retrieve meta title
      * @return string
      */
-    public function getMetaTitle()
+    public function getMetaTitle(): string
     {
         $title = $this->getData('meta_title');
         if (!$title) {
@@ -391,7 +391,7 @@ public function getMetaTitle()
      * Retrieve meta description
      * @return string
      */
-    public function getMetaDescription()
+    public function getMetaDescription(): string
     {
         $desc = $this->getData('meta_description');
         if (!$desc) {
@@ -418,7 +418,7 @@ public function getMetaDescription()
      * Retrieve if is visible on store
      * @return bool
      */
-    public function isVisibleOnStore($storeId)
+    public function isVisibleOnStore($storeId): bool
     {
         return $this->getIsActive()
             && (null === $storeId || array_intersect([0, $storeId], $this->getStoreIds()));
@@ -450,7 +450,7 @@ public function getPostsCount()
      * @return self
      * @deprecated replaced with getDynamicData
      */
-    public function initDinamicData()
+    public function initDinamicData(): static
     {
         $keys = [
             'meta_description',
diff --git a/Model/CategoryRepository.php b/Model/CategoryRepository.php
index 37d6d603..ec8a360a 100644
--- a/Model/CategoryRepository.php
+++ b/Model/CategoryRepository.php
@@ -147,7 +147,7 @@ public function getById($categoryId, $editMode = false, $storeId = null, $forceR
      * @throws CouldNotDeleteException
      * @throws StateException
      */
-    public function delete(Category $category)
+    public function delete(Category $category): bool
     {
         try {
             $this->categoryResourceModel->delete($category);
diff --git a/Model/Comment.php b/Model/Comment.php
index f680692a..774afd60 100755
--- a/Model/Comment.php
+++ b/Model/Comment.php
@@ -134,7 +134,7 @@ protected function _construct()
      * @param  boolean $plural
      * @return string
      */
-    public function getOwnTitle($plural = false)
+    public function getOwnTitle($plural = false): string
     {
         return $plural ? 'Comments' : 'Comment';
     }
@@ -143,7 +143,7 @@ public function getOwnTitle($plural = false)
      * Retrieve true if post is active
      * @return boolean [description]
      */
-    public function isActive()
+    public function isActive(): bool
     {
         return ($this->getStatus() == \Magefan\Blog\Model\Config\Source\CommentStatus::APPROVED);
     }
@@ -152,7 +152,7 @@ public function isActive()
      * Retrieve if is visible on store
      * @return bool
      */
-    public function isVisibleOnStore($storeId)
+    public function isVisibleOnStore($storeId): bool
     {
         return $this->isActive()
             && (null === $storeId || array_intersect([0, $storeId], [$this->getStoreId()]));
@@ -269,7 +269,7 @@ public function getChildComments()
      * Retrieve true if comment is reply to other comment
      * @return boolean
      */
-    public function isReply()
+    public function isReply(): bool
     {
         return (bool)$this->getParentId();
     }
@@ -278,7 +278,7 @@ public function isReply()
      * Validate comment
      * @return void
      */
-    public function validate()
+    public function validate(): void
     {
         if (mb_strlen($this->getText()) < 3) {
             throw new \Exception(__('Comment text is too short.'), 1);
@@ -301,7 +301,7 @@ public function getPublishDate($format = 'Y-m-d H:i:s')
     /**
      * @return array|ResourceModel\Comment\Collection
      */
-    public function getRepliesCollection()
+    public function getRepliesCollection(): \Magefan\Blog\Model\ResourceModel\Comment\Collection|array
     {
         $repliesCollection = [];
         if (!$this->isReply()) {
diff --git a/Model/Comment/Notification.php b/Model/Comment/Notification.php
index 004377ce..70a77366 100644
--- a/Model/Comment/Notification.php
+++ b/Model/Comment/Notification.php
@@ -69,7 +69,7 @@ public function __construct(
      * Check if any pending blog comment exists
      * @return void
      */
-    public function checkComments()
+    public function checkComments(): void
     {
         if (!$this->backendSession->isLoggedIn()) {
             return; // Isn't logged in
diff --git a/Model/CommentRepository.php b/Model/CommentRepository.php
index 10c89aa2..86c0e5cb 100644
--- a/Model/CommentRepository.php
+++ b/Model/CommentRepository.php
@@ -133,7 +133,7 @@ public function getById($commentId, $editMode = false, $storeId = null, $forceRe
      * @throws CouldNotDeleteException
      * @throws StateException
      */
-    public function delete(Comment $comment)
+    public function delete(Comment $comment): bool
     {
         try {
             $this->commentResourceModel->delete($comment);
diff --git a/Model/Config.php b/Model/Config.php
index 1823be3a..b36cb551 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -175,7 +175,7 @@ public function getSearchRobots($storeId = null)
      *
      * @return bool
      */
-    public function isEnabled($storeId = null)
+    public function isEnabled($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_PATH_EXTENSION_ENABLED,
@@ -188,7 +188,7 @@ public function isEnabled($storeId = null)
      *
      * @return bool
      */
-    public function isRelatedPostsEnabled($storeId = null)
+    public function isRelatedPostsEnabled($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_RELATED_POSTS_ENABLED,
@@ -201,7 +201,7 @@ public function isRelatedPostsEnabled($storeId = null)
      *
      * @return bool
      */
-    public function isRelatedProductsEnabled($storeId = null)
+    public function isRelatedProductsEnabled($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_RELATED_PRODUCTS_ENABLED,
@@ -228,7 +228,7 @@ public function getConfig($path, $storeId = null)
      * @param $pageType
      * @return bool
      */
-    public function getDisplayCanonicalTag($pageType)
+    public function getDisplayCanonicalTag($pageType): bool
     {
 
         if ($this->getConfig(self::XML_PATH_DISPLAY_CANONICAL_TAG_FOR)) {
@@ -244,7 +244,7 @@ public function getDisplayCanonicalTag($pageType)
      * @param null $storeId
      * @return bool
      */
-    public function isBlogCssIncludeOnAll($storeId = null)
+    public function isBlogCssIncludeOnAll($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_INCLUDE_BLOG_CSS_ALL_PAGES,
@@ -256,7 +256,7 @@ public function isBlogCssIncludeOnAll($storeId = null)
      * @param null $storeId
      * @return bool
      */
-    public function isBlogCssIncludeOnHome($storeId = null)
+    public function isBlogCssIncludeOnHome($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_INCLUDE_BLOG_CSS_HOME_PAGE,
@@ -268,7 +268,7 @@ public function isBlogCssIncludeOnHome($storeId = null)
      * @param null $storeId
      * @return bool
      */
-    public function isBlogCssIncludeOnProduct($storeId = null)
+    public function isBlogCssIncludeOnProduct($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_INCLUDE_BLOG_CSS_PRODUCT_PAGES,
@@ -305,7 +305,7 @@ public function getCustomCss($storeId = null): string
      * @param $storeId
      * @return bool
      */
-    public function getIncludeBootstrapCustomMini($storeId = null)
+    public function getIncludeBootstrapCustomMini($storeId = null): bool
     {
         return (bool)$this->getConfig(
             self::XML_BLOG_INCLUDE_BOOTSTRAP_CUSTOM_MINI,
diff --git a/Model/Config/Source/ArchiveGroupBy.php b/Model/Config/Source/ArchiveGroupBy.php
index 81b755c5..35bfc3ef 100755
--- a/Model/Config/Source/ArchiveGroupBy.php
+++ b/Model/Config/Source/ArchiveGroupBy.php
@@ -40,7 +40,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/Author.php b/Model/Config/Source/Author.php
index f97af370..cb826427 100755
--- a/Model/Config/Source/Author.php
+++ b/Model/Config/Source/Author.php
@@ -63,7 +63,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/AuthorType.php b/Model/Config/Source/AuthorType.php
index ef1428fb..832b887a 100755
--- a/Model/Config/Source/AuthorType.php
+++ b/Model/Config/Source/AuthorType.php
@@ -48,7 +48,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/BlogPages.php b/Model/Config/Source/BlogPages.php
index aa099e9f..f7e0dff6 100644
--- a/Model/Config/Source/BlogPages.php
+++ b/Model/Config/Source/BlogPages.php
@@ -33,7 +33,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/Category.php b/Model/Config/Source/Category.php
index 39a6c80e..140209d4 100755
--- a/Model/Config/Source/Category.php
+++ b/Model/Config/Source/Category.php
@@ -66,7 +66,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
@@ -80,7 +80,7 @@ public function toArray()
      * @param  int $n
      * @return string
      */
-    protected function _getSpaces($n)
+    protected function _getSpaces($n): string
     {
         $s = '';
         for ($i = 0; $i < $n; $i++) {
diff --git a/Model/Config/Source/CategoryDisplayMode.php b/Model/Config/Source/CategoryDisplayMode.php
index 34daaf74..d51b86ac 100644
--- a/Model/Config/Source/CategoryDisplayMode.php
+++ b/Model/Config/Source/CategoryDisplayMode.php
@@ -53,7 +53,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/CategoryPath.php b/Model/Config/Source/CategoryPath.php
index 6514bce9..91a9854f 100755
--- a/Model/Config/Source/CategoryPath.php
+++ b/Model/Config/Source/CategoryPath.php
@@ -14,7 +14,10 @@
  */
 class CategoryPath extends CategoryTree
 {
-    protected function _getOptions($itemId = 0)
+    /**
+     * @return array<'label'|'value', ''|int>[]|array<'label'|'optgroup'|'value', mixed>[]
+     */
+    protected function _getOptions($itemId = 0): array
     {
         $childs =  $this->_getChilds();
         $options = [];
diff --git a/Model/Config/Source/CategoryTree.php b/Model/Config/Source/CategoryTree.php
index 6deb96f9..b0da1164 100755
--- a/Model/Config/Source/CategoryTree.php
+++ b/Model/Config/Source/CategoryTree.php
@@ -54,7 +54,10 @@ public function toOptionArray()
         return $this->_options;
     }
 
-    protected function _getOptions($itemId = 0)
+    /**
+     * @return array<mixed, array<'label'|'optgroup'|'value', mixed>>
+     */
+    protected function _getOptions($itemId = 0): array
     {
         $childs =  $this->_getChilds();
         $options = [];
diff --git a/Model/Config/Source/CommentStatus.php b/Model/Config/Source/CommentStatus.php
index 20e50a8b..bfa53c85 100644
--- a/Model/Config/Source/CommentStatus.php
+++ b/Model/Config/Source/CommentStatus.php
@@ -47,7 +47,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/CommetType.php b/Model/Config/Source/CommetType.php
index 151fcdca..900395ab 100755
--- a/Model/Config/Source/CommetType.php
+++ b/Model/Config/Source/CommetType.php
@@ -59,7 +59,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/DisplayMode.php b/Model/Config/Source/DisplayMode.php
index 508f1958..6c28a4a1 100644
--- a/Model/Config/Source/DisplayMode.php
+++ b/Model/Config/Source/DisplayMode.php
@@ -48,7 +48,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/ImageSizeOptions.php b/Model/Config/Source/ImageSizeOptions.php
index 7e6acd77..99a81720 100644
--- a/Model/Config/Source/ImageSizeOptions.php
+++ b/Model/Config/Source/ImageSizeOptions.php
@@ -32,7 +32,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/LazyLoad.php b/Model/Config/Source/LazyLoad.php
index c480a9ea..4aec2538 100755
--- a/Model/Config/Source/LazyLoad.php
+++ b/Model/Config/Source/LazyLoad.php
@@ -36,7 +36,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/PageLayout.php b/Model/Config/Source/PageLayout.php
index 9ad8629e..ee170122 100755
--- a/Model/Config/Source/PageLayout.php
+++ b/Model/Config/Source/PageLayout.php
@@ -45,7 +45,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/PagePaginationType.php b/Model/Config/Source/PagePaginationType.php
index 6ee05811..3eb9c9ee 100644
--- a/Model/Config/Source/PagePaginationType.php
+++ b/Model/Config/Source/PagePaginationType.php
@@ -28,7 +28,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/PermalinkType.php b/Model/Config/Source/PermalinkType.php
index 29822242..171d2336 100755
--- a/Model/Config/Source/PermalinkType.php
+++ b/Model/Config/Source/PermalinkType.php
@@ -39,7 +39,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/PostsSortBy.php b/Model/Config/Source/PostsSortBy.php
index 8efb1bd6..24ebd9dd 100644
--- a/Model/Config/Source/PostsSortBy.php
+++ b/Model/Config/Source/PostsSortBy.php
@@ -47,7 +47,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/ReadingProgressBarPosition.php b/Model/Config/Source/ReadingProgressBarPosition.php
index 472a7934..3605cb9b 100644
--- a/Model/Config/Source/ReadingProgressBarPosition.php
+++ b/Model/Config/Source/ReadingProgressBarPosition.php
@@ -54,7 +54,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/SocialNetworks.php b/Model/Config/Source/SocialNetworks.php
index 90209373..82e79a01 100644
--- a/Model/Config/Source/SocialNetworks.php
+++ b/Model/Config/Source/SocialNetworks.php
@@ -30,7 +30,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Config/Source/Tag.php b/Model/Config/Source/Tag.php
index 7fd80c21..742c876a 100755
--- a/Model/Config/Source/Tag.php
+++ b/Model/Config/Source/Tag.php
@@ -64,7 +64,7 @@ public function toOptionArray()
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         foreach ($this->toOptionArray() as $item) {
diff --git a/Model/Image.php b/Model/Image.php
index 78f7052b..1bc75306 100755
--- a/Model/Image.php
+++ b/Model/Image.php
@@ -79,7 +79,7 @@ public function resize($width, $height = null)
      * Retrieve image url
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getUrl();
     }
diff --git a/Model/Import/Aw.php b/Model/Import/Aw.php
index ae9aafe3..08cec5a6 100644
--- a/Model/Import/Aw.php
+++ b/Model/Import/Aw.php
@@ -17,7 +17,7 @@ class Aw extends AbstractImport
 {
     protected $_requiredFields = ['dbname', 'uname', 'dbhost'];
 
-    public function execute()
+    public function execute(): void
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
diff --git a/Model/Import/Aw2.php b/Model/Import/Aw2.php
index 0b34e6fa..81fe443a 100644
--- a/Model/Import/Aw2.php
+++ b/Model/Import/Aw2.php
@@ -18,7 +18,7 @@ class Aw2 extends AbstractImport
 {
     protected $_requiredFields = ['dbname', 'uname', 'dbhost'];
 
-    public function execute()
+    public function execute(): void
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
diff --git a/Model/Import/Mageplaza.php b/Model/Import/Mageplaza.php
index 973dec7f..e621c94f 100644
--- a/Model/Import/Mageplaza.php
+++ b/Model/Import/Mageplaza.php
@@ -16,7 +16,7 @@
 class Mageplaza extends AbstractImport
 {
 
-    public function execute()
+    public function execute(): void
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
diff --git a/Model/Import/Mageplaza1.php b/Model/Import/Mageplaza1.php
index cf5b1b63..e8062e3a 100644
--- a/Model/Import/Mageplaza1.php
+++ b/Model/Import/Mageplaza1.php
@@ -28,7 +28,7 @@ class Mageplaza1 extends AbstractImport
     /**
      * @throws \Zend_Db_Exception
      */
-    public function execute()
+    public function execute(): void
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
@@ -292,7 +292,7 @@ public function execute()
      * @return |null
      * @throws \Zend_Db_Exception
      */
-    private function getPostAttrValue($postId, $attributeCode)
+    private function getPostAttrValue($postId, string $attributeCode)
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
@@ -338,7 +338,7 @@ private function getBlogEntityId()
      * @return int
      * @throws \Zend_Db_Exception
      */
-    private function getBlogAttributeId($attributeCode)
+    private function getBlogAttributeId(string $attributeCode)
     {
         if (!isset($this->blogAttributes[$attributeCode])) {
             $this->blogAttributes[$attributeCode] = [];
diff --git a/Model/Import/Mirasvit.php b/Model/Import/Mirasvit.php
index 48f27653..98814921 100644
--- a/Model/Import/Mirasvit.php
+++ b/Model/Import/Mirasvit.php
@@ -19,7 +19,7 @@ class Mirasvit extends AbstractImport
     protected $entityTypeId = [];
     protected $entityTypeAttributes = [];
 
-    public function execute()
+    public function execute(): void
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
@@ -273,7 +273,7 @@ public function execute()
         $adapter->getDriver()->getConnection()->disconnect();
     }
 
-    protected function getAttributValue($entitytTypeCode, $entitytId, $attributeCode)
+    protected function getAttributValue(string $entitytTypeCode, string $entitytId, $attributeCode)
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
diff --git a/Model/Import/Wordpress.php b/Model/Import/Wordpress.php
index d1722c14..3d6fc9e0 100644
--- a/Model/Import/Wordpress.php
+++ b/Model/Import/Wordpress.php
@@ -15,7 +15,7 @@ class Wordpress extends AbstractImport
 {
     protected $_requiredFields = ['dbname', 'uname', 'dbhost'];
 
-    public function execute()
+    public function execute(): void
     {
         $adapter = $this->getDbAdapter();
         $_pref = $this->getPrefix();
@@ -387,7 +387,7 @@ public function execute()
         $adapter->getDriver()->getConnection()->disconnect();
     }
 
-    protected function wordpressOutoutWrap($pee, $br = true)
+    protected function wordpressOutoutWrap($pee, $br = true): string|array|null
     {
         $pre_tags = [];
 
diff --git a/Model/NoSlashUrlRedirect.php b/Model/NoSlashUrlRedirect.php
index a5d76cb7..0cea8588 100644
--- a/Model/NoSlashUrlRedirect.php
+++ b/Model/NoSlashUrlRedirect.php
@@ -52,7 +52,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         $moduleEnabled = $this->scopeConfig->getValue(Config::XML_PATH_EXTENSION_ENABLED, ScopeInterface::SCOPE_STORE);
 
diff --git a/Model/Post.php b/Model/Post.php
index d89c368c..0d984984 100755
--- a/Model/Post.php
+++ b/Model/Post.php
@@ -298,7 +298,7 @@ public function getIdentities()
      *
      * @return string
      */
-    public function getIdentifier()
+    public function getIdentifier(): string
     {
         return (string)$this->getData('identifier');
     }
@@ -317,7 +317,7 @@ public function getControllerName()
      * @param  boolean $plural
      * @return string
      */
-    public function getOwnTitle($plural = false)
+    public function getOwnTitle($plural = false): string
     {
         return $plural ? 'Posts' : 'Post';
     }
@@ -327,7 +327,7 @@ public function getOwnTitle($plural = false)
      * Retrieve true if post is active
      * @return boolean [description]
      */
-    public function isActive()
+    public function isActive(): bool
     {
         return ($this->getIsActive() == self::STATUS_ENABLED);
     }
@@ -336,7 +336,7 @@ public function isActive()
      * Retrieve available post statuses
      * @return array
      */
-    public function getAvailableStatuses()
+    public function getAvailableStatuses(): array
     {
         return [self::STATUS_DISABLED => __('Disabled'), self::STATUS_ENABLED => __('Enabled')];
     }
@@ -428,7 +428,7 @@ public function getFeaturedListImage()
      * @param array $images
      * @return $this
      */
-    public function setGalleryImages(array $images)
+    public function setGalleryImages(array $images): static
     {
         $this->setData(
             'media_gallery',
@@ -551,7 +551,7 @@ public function getShortFilteredContent($len = null, $endCharacters = null)
      * @param  mixed $endCharacters
      * @return string
      */
-    public function getShortFilteredContentWithoutImages($len = null, $endCharacters = null)
+    public function getShortFilteredContentWithoutImages($len = null, $endCharacters = null): ?string
     {
         return preg_replace('<img([\w\W]+?)/>', '', $this->getShortFilteredContent($len, $endCharacters));
     }
@@ -560,7 +560,7 @@ public function getShortFilteredContentWithoutImages($len = null, $endCharacters
      * Retrieve meta title
      * @return string
      */
-    public function getMetaTitle()
+    public function getMetaTitle(): string
     {
         $title = $this->getData('meta_title');
         if (!$title) {
@@ -608,7 +608,7 @@ public function getMetaDescription()
      * Retrieve og title
      * @return string
      */
-    public function getOgTitle()
+    public function getOgTitle(): string
     {
         $title = $this->getData('og_title');
         if (!$title) {
@@ -622,7 +622,7 @@ public function getOgTitle()
      * Retrieve og description
      * @return string
      */
-    public function getOgDescription()
+    public function getOgDescription(): string
     {
         $desc = $this->getData('og_description');
         if (!$desc) {
@@ -641,7 +641,7 @@ public function getOgDescription()
      * Retrieve og type
      * @return string
      */
-    public function getOgType()
+    public function getOgType(): string
     {
         $type = $this->getData('og_type');
         if (!$type) {
@@ -701,7 +701,7 @@ public function getParentCategories()
      * @param $b
      * @return int
      */
-    public function sortByPositionDesc($a, $b)
+    public function sortByPositionDesc($a, $b): int
     {
         return strcmp($b->getPosition(), $a->getPosition());
     }
@@ -730,7 +730,7 @@ public function getParentCategory()
      * Retrieve post parent categories count
      * @return int
      */
-    public function getCategoriesCount()
+    public function getCategoriesCount(): int
     {
         return count($this->getParentCategories());
     }
@@ -756,7 +756,7 @@ public function getRelatedTags()
      * Retrieve post tags
      * @return \Magefan\Blog\Model\ResourceModel\Tag\Collection
      */
-    public function getRelatedCoauthors()
+    public function getRelatedCoauthors(): array
     {
         return [];
     }
@@ -765,7 +765,7 @@ public function getRelatedCoauthors()
      * Retrieve post tags count
      * @return int
      */
-    public function getTagsCount()
+    public function getTagsCount(): int
     {
         return count($this->getRelatedTags());
     }
@@ -887,7 +887,7 @@ public function getAuthor()
      * Retrieve if is visible on store
      * @return bool
      */
-    public function isVisibleOnStore($storeId)
+    public function isVisibleOnStore($storeId): bool
     {
         return $this->getIsActive()
             && $this->getData('publish_time') <= $this->getResource()->getDate()->gmtDate()
@@ -898,7 +898,7 @@ public function isVisibleOnStore($storeId)
      * Retrieve if is preview secret is valid
      * @return bool
      */
-    public function isValidSecret($secret)
+    public function isValidSecret($secret): bool
     {
         return ($secret && $this->getSecret() === $secret);
     }
@@ -908,7 +908,7 @@ public function isValidSecret($secret)
      * @param  string $format
      * @return string
      */
-    public function getPublishDate($format = '')
+    public function getPublishDate($format = ''): string|array
     {
         if (!$format) {
             $format = $this->scopeConfig->getValue(
@@ -934,7 +934,7 @@ public function getPublishDate($format = '')
      * Retrieve true if post publish date display is enabled
      * @return bool
      */
-    public function isPublishDateEnabled()
+    public function isPublishDateEnabled(): bool
     {
         return (bool)$this->scopeConfig->getValue(
             'mfblog/design/publication_date',
@@ -947,7 +947,7 @@ public function isPublishDateEnabled()
      * @param  string $format
      * @return string
      */
-    public function getUpdateDate($format = 'Y-m-d H:i:s')
+    public function getUpdateDate($format = 'Y-m-d H:i:s'): string|array
     {
         return \Magefan\Blog\Helper\Data::getTranslatedDate(
             $format,
@@ -975,7 +975,7 @@ public function getPostImage()
      * @return self
      * @deprecated replaced with getDynamicData
      */
-    public function initDinamicData()
+    public function initDinamicData(): static
     {
         $keys = [
             'og_image',
@@ -1164,7 +1164,7 @@ public function getShortContentExtractor()
      * Retrieve reading time
      * @return int
      */
-    public function getReadingTime()
+    public function getReadingTime(): int
     {
         if (!$this->getData('reading_time')) {
             $wpm = 250;
diff --git a/Model/PostRepository.php b/Model/PostRepository.php
index 22c8727f..7494157f 100644
--- a/Model/PostRepository.php
+++ b/Model/PostRepository.php
@@ -139,7 +139,7 @@ public function getById($postId, $editMode = false, $storeId = null, $forceReloa
      * @throws CouldNotDeleteException
      * @throws StateException
      */
-    public function delete(Post $post)
+    public function delete(Post $post): bool
     {
         try {
             $this->postResourceModel->delete($post);
diff --git a/Model/PreviewUrl.php b/Model/PreviewUrl.php
index a29f96db..2402d749 100644
--- a/Model/PreviewUrl.php
+++ b/Model/PreviewUrl.php
@@ -36,7 +36,7 @@ public function __construct(
      * @param  string $controllerName
      * @return string
      */
-    public function getUrl($object, $controllerName)
+    public function getUrl($object, $controllerName): string
     {
         $storeIds = $object->getStoreIds();
         if (count($storeIds)) {
diff --git a/Model/ResourceModel/Category.php b/Model/ResourceModel/Category.php
index 68f184fc..86ea44a8 100755
--- a/Model/ResourceModel/Category.php
+++ b/Model/ResourceModel/Category.php
@@ -209,7 +209,7 @@ protected function _getLoadByIdentifierSelect($identifier, $storeIds)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
-    protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractModel $object)
+    protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractModel $object): int|false
     {
         return preg_match('/^[0-9]+$/', (string)$object->getData('identifier'));
     }
@@ -220,7 +220,7 @@ protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractMode
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
-    protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel $object)
+    protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel $object): int|false
     {
         return preg_match('/^([^?#<>@!&*()$%^\\+=,{}"\']+)?$/', (string)$object->getData('identifier'));
     }
@@ -233,7 +233,7 @@ protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel
      * @param int|array $storeId
      * @return false|string
      */
-    public function checkIdentifier($identifier, $storeIds)
+    public function checkIdentifier($identifier, $storeIds): string|false
     {
         if (!is_array($storeIds)) {
             $storeIds = [$storeIds];
@@ -288,7 +288,7 @@ public function lookupStoreIds($categoryId, $useCache = true)
     /**
      * @return string
      */
-    public function getEntityType()
+    public function getEntityType(): string
     {
         return 'category';
     }
diff --git a/Model/ResourceModel/Category/Collection.php b/Model/ResourceModel/Category/Collection.php
index 2aa36383..e59c3ae9 100755
--- a/Model/ResourceModel/Category/Collection.php
+++ b/Model/ResourceModel/Category/Collection.php
@@ -58,7 +58,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        $connection = null,
+        ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
@@ -120,7 +120,7 @@ public function addSearchFilter(string $term)
      * @param boolean $withAdmin
      * @return $this
      */
-    public function addStoreFilter($store, $withAdmin = true)
+    public function addStoreFilter($store, $withAdmin = true): static
     {
         if ($store === null) {
             return $this;
@@ -235,7 +235,7 @@ protected function _renderFiltersBefore()
      * Retrieve gruped category childs
      * @return array
      */
-    public function getGroupedChilds()
+    public function getGroupedChilds(): array
     {
         $childs = [];
         if (count($this)) {
diff --git a/Model/ResourceModel/Comment.php b/Model/ResourceModel/Comment.php
index d92d097b..2a6d5206 100755
--- a/Model/ResourceModel/Comment.php
+++ b/Model/ResourceModel/Comment.php
@@ -102,7 +102,7 @@ public function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
         return $result;
     }
 
-    public function updatePostCommentsCount($postId)
+    public function updatePostCommentsCount($postId): void
     {
         $connection = $this->getConnection();
 
diff --git a/Model/ResourceModel/Comment/Collection.php b/Model/ResourceModel/Comment/Collection.php
index 9a1a34c9..9983b732 100755
--- a/Model/ResourceModel/Comment/Collection.php
+++ b/Model/ResourceModel/Comment/Collection.php
@@ -80,7 +80,7 @@ public function addFieldToFilter($field, $condition = null)
      * @param boolean $withAdmin
      * @return $this
      */
-    public function addStoreFilter($store, $withAdmin = true)
+    public function addStoreFilter($store, $withAdmin = true): static
     {
         if ($store === null) {
             return $this;
@@ -116,7 +116,7 @@ public function addStoreFilter($store, $withAdmin = true)
      * @param array|int|string|\Magefan\Blog\Model\Post  $post
      * @return $this
      */
-    public function addPostFilter($post)
+    public function addPostFilter($post): static
     {
         if (!$this->getFlag('post_filter_added')) {
             if ($post instanceof \Magefan\Blog\Model\Post) {
diff --git a/Model/ResourceModel/Comment/Collection/Grid.php b/Model/ResourceModel/Comment/Collection/Grid.php
index bd65f6c1..f3357ffa 100755
--- a/Model/ResourceModel/Comment/Collection/Grid.php
+++ b/Model/ResourceModel/Comment/Collection/Grid.php
@@ -42,7 +42,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        $connection = null,
+        ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
diff --git a/Model/ResourceModel/PageIdentifierGenerator.php b/Model/ResourceModel/PageIdentifierGenerator.php
index 70ec32d1..e02fdb9c 100644
--- a/Model/ResourceModel/PageIdentifierGenerator.php
+++ b/Model/ResourceModel/PageIdentifierGenerator.php
@@ -37,7 +37,7 @@ public function __construct(
     /**
      * @param $identifier
      */
-    public function formatIdentifier($identifier)
+    public function formatIdentifier($identifier): string
     {
         $identifier = (string)$identifier;
         $from = [
@@ -70,7 +70,7 @@ public function formatIdentifier($identifier)
         return $identifier;
     }
 
-    public function generate(\Magento\Framework\DataObject $object)
+    public function generate(\Magento\Framework\DataObject $object): void
     {
         if ($object->getData('identifier')) {
             return;
diff --git a/Model/ResourceModel/Post.php b/Model/ResourceModel/Post.php
index cab04d1d..6e1055a7 100755
--- a/Model/ResourceModel/Post.php
+++ b/Model/ResourceModel/Post.php
@@ -208,7 +208,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
      * @throws \Magento\Framework\Exception\LocalizedException
      * @param \Magento\Framework\Model\AbstractModel $object
      */
-    public function incrementViewsCount(\Magento\Framework\Model\AbstractModel $object)
+    public function incrementViewsCount(\Magento\Framework\Model\AbstractModel $object): void
     {
         $this->getConnection()->update(
             $this->getMainTable(),
@@ -253,7 +253,7 @@ protected function _updateLinks(
         array $newRelatedIds,
         array $oldRelatedIds,
         $tableName,
-        $field,
+        string $field,
         $rowData = []
     ) {
         $table = $this->getTable($tableName);
@@ -377,7 +377,7 @@ protected function _getLoadByIdentifierSelect($identifier, $storeIds)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
-    protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractModel $object)
+    protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractModel $object): int|false
     {
         return preg_match('/^[0-9]+$/', (string)$object->getData('identifier'));
     }
@@ -388,7 +388,7 @@ protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractMode
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
-    protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel $object)
+    protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel $object): int|false
     {
         return preg_match('/^([^?#<>@!&*()$%^\\+=,{}"\']+)?$/', (string)$object->getData('identifier'));
     }
@@ -401,7 +401,7 @@ protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel
      * @param int|array $storeId
      * @return false|string
      */
-    public function checkIdentifier($identifier, $storeIds)
+    public function checkIdentifier($identifier, $storeIds): string|false
     {
         if (!is_array($storeIds)) {
             $storeIds = [$storeIds];
@@ -531,7 +531,7 @@ protected function _lookupAll($postId, $tableName, $field)
     /**
      * @return string
      */
-    public function getEntityType()
+    public function getEntityType(): string
     {
         return 'post';
     }
diff --git a/Model/ResourceModel/Post/Collection.php b/Model/ResourceModel/Post/Collection.php
index 20a8d646..b99172f0 100755
--- a/Model/ResourceModel/Post/Collection.php
+++ b/Model/ResourceModel/Post/Collection.php
@@ -81,7 +81,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface                    $eventManager,
         \Magento\Framework\Stdlib\DateTime\DateTime                  $date,
         \Magento\Store\Model\StoreManagerInterface                   $storeManager,
-                                                                     $connection = null,
+                                                                     ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb        $resource = null,
         ?\Magefan\Blog\Api\CategoryRepositoryInterface               $categoryRepository = null
     )
@@ -170,7 +170,7 @@ public function addFieldToFilter($field, $condition = null)
      * @param boolean $withAdmin
      * @return $this
      */
-    public function addStoreFilter($store, $withAdmin = true)
+    public function addStoreFilter($store, $withAdmin = true): static
     {
         if ($store === null) {
             return $this;
@@ -231,7 +231,7 @@ public function addRecentFilter()
      * @param array|int|string $category
      * @return $this
      */
-    public function addPostsFilter($postIds)
+    public function addPostsFilter($postIds): void
     {
         if (!is_array($postIds)) {
             $postIds = explode(',', (string)$postIds);
@@ -351,7 +351,7 @@ public function addCategoryFilter($category)
      * @param int $month
      * @return $this
      */
-    public function addArchiveFilter($year, $month)
+    public function addArchiveFilter($year, $month): static
     {
         $this->getSelect()
             ->where('YEAR(main_table.publish_time) = ?', $year);
@@ -367,7 +367,7 @@ public function addArchiveFilter($year, $month)
      * @param string $term
      * @return $this
      */
-    public function addSearchFilter($term)
+    public function addSearchFilter($term): static
     {
         if (!$term) {
             $term = '__EMPTY_SEARCH_VALUE__';
@@ -452,7 +452,7 @@ public function getSearchRateExpression($term, array $columns): string
      * @param array|int|string|\Magefan\Blog\Model\Tag $tag
      * @return $this
      */
-    public function addTagFilter($tag)
+    public function addTagFilter($tag): static
     {
         if (!$this->getFlag('tag_filter_added')) {
             if ($tag instanceof \Magefan\Blog\Model\Tag) {
@@ -530,7 +530,7 @@ public function addTagFilter($tag)
      * @param array|int|\Magefan\Blog\Model\Author $author
      * @return $this
      */
-    public function addAuthorFilter($author)
+    public function addAuthorFilter($author): static
     {
         if (!$this->getFlag('author_filter_added')) {
             if ($author instanceof \Magefan\Blog\Model\Author) {
@@ -575,7 +575,7 @@ public function addAuthorFilter($author)
      * @param $product
      * @return $this
      */
-    public function addRelatedProductFilter($product)
+    public function addRelatedProductFilter($product): static
     {
         if (!$this->getFlag('author_filter_added')) {
             if ($product instanceof \Magento\Catalog\Api\Data\ProductInterface) {
diff --git a/Model/ResourceModel/Tag.php b/Model/ResourceModel/Tag.php
index 42df0172..6bab9e60 100755
--- a/Model/ResourceModel/Tag.php
+++ b/Model/ResourceModel/Tag.php
@@ -149,7 +149,7 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
-    protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractModel $object)
+    protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractModel $object): int|false
     {
         return preg_match('/^[0-9]+$/', (string)$object->getData('identifier'));
     }
@@ -160,7 +160,7 @@ protected function isNumericPageIdentifier(\Magento\Framework\Model\AbstractMode
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
-    protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel $object)
+    protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel $object): int|false
     {
         return preg_match('/^([^?#<>@!&*()$%^\\+=,{}"\']+)?$/', (string)$object->getData('identifier'));
     }
@@ -173,7 +173,7 @@ protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel
      * @param int|array $storeId
      * @return false|string
      */
-    public function checkIdentifier($identifier, $storeIds)
+    public function checkIdentifier($identifier, $storeIds): string|false
     {
         if (!is_array($storeIds)) {
             $storeIds = [$storeIds];
@@ -267,7 +267,7 @@ protected function _updateLinks(
         array $newRelatedIds,
         array $oldRelatedIds,
         $tableName,
-        $field,
+        string $field,
         $rowData = []
     ) {
         $table = $this->getTable($tableName);
@@ -344,7 +344,7 @@ protected function _lookupAll($tagId, $tableName, $field)
     /**
      * @return string
      */
-    public function getEntityType()
+    public function getEntityType(): string
     {
         return 'tag';
     }
diff --git a/Model/ResourceModel/Tag/Collection.php b/Model/ResourceModel/Tag/Collection.php
index 41973f45..0f441eae 100755
--- a/Model/ResourceModel/Tag/Collection.php
+++ b/Model/ResourceModel/Tag/Collection.php
@@ -88,7 +88,7 @@ public function addSearchFilter(string $term)
      * @param boolean $withAdmin
      * @return $this
      */
-    public function addStoreFilter($store, $withAdmin = true)
+    public function addStoreFilter($store, $withAdmin = true): static
     {
         if ($store === null) {
             return $this;
diff --git a/Model/ShortContentExtractor.php b/Model/ShortContentExtractor.php
index c6a68770..d5afc2fd 100644
--- a/Model/ShortContentExtractor.php
+++ b/Model/ShortContentExtractor.php
@@ -162,7 +162,7 @@ private function setPageBreakOnLen(string $content, $len): string
 
         $textLength = 0;
 
-        $processNode = function ($node) use (&$textLength, $len, $dom, $pageBreaker, &$pageBreakInserted, &$processNode) {
+        $processNode = function ($node) use (&$textLength, $len, $dom, $pageBreaker, &$pageBreakInserted, &$processNode): void {
 
             if ($pageBreakInserted) {
                 return;
diff --git a/Model/SlashUrlRedirect.php b/Model/SlashUrlRedirect.php
index ce1d6e7f..3c3a26b8 100644
--- a/Model/SlashUrlRedirect.php
+++ b/Model/SlashUrlRedirect.php
@@ -52,7 +52,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         $moduleEnabled = $this->scopeConfig->getValue(Config::XML_PATH_EXTENSION_ENABLED, ScopeInterface::SCOPE_STORE);
 
diff --git a/Model/Tag.php b/Model/Tag.php
index a4bf9cc6..35885624 100755
--- a/Model/Tag.php
+++ b/Model/Tag.php
@@ -100,7 +100,7 @@ protected function _construct()
      * Retrieve true if tag is active
      * @return boolean
      */
-    public function isActive()
+    public function isActive(): bool
     {
         return ($this->getIsActive() == self::STATUS_ENABLED);
     }
@@ -109,7 +109,7 @@ public function isActive()
      * Retrieve if is visible on store
      * @return bool
      */
-    public function isVisibleOnStore($storeId)
+    public function isVisibleOnStore($storeId): bool
     {
         return $this->getIsActive()
             && (null === $storeId || array_intersect([0, $storeId], $this->getStoreIds()));
@@ -120,7 +120,7 @@ public function isVisibleOnStore($storeId)
      * @param  boolean $plural
      * @return string
      */
-    public function getOwnTitle($plural = false)
+    public function getOwnTitle($plural = false): string
     {
         return $plural ? 'Tags' : 'Tag';
     }
@@ -166,7 +166,7 @@ public function getTagUrl()
      * Retrieve meta title
      * @return string
      */
-    public function getMetaTitle()
+    public function getMetaTitle(): string
     {
         $title = $this->getData('meta_title');
         if (!$title) {
@@ -180,7 +180,7 @@ public function getMetaTitle()
      * Retrieve meta description
      * @return string
      */
-    public function getMetaDescription()
+    public function getMetaDescription(): string
     {
         $desc = $this->getData('meta_description');
         if (!$desc) {
@@ -218,7 +218,7 @@ public function getIdentities()
      *
      * @return string
      */
-    public function getIdentifier()
+    public function getIdentifier(): string
     {
         return (string)$this->getData('identifier');
     }
diff --git a/Model/Tag/AutocompleteData.php b/Model/Tag/AutocompleteData.php
index 4b9951bb..e48aa13e 100644
--- a/Model/Tag/AutocompleteData.php
+++ b/Model/Tag/AutocompleteData.php
@@ -34,7 +34,7 @@ public function __construct(
      * @param $search
      * @return array
      */
-    public function getItems($search)
+    public function getItems(string $search): array
     {
         $collection = $this->collectionFactory->create();
         $collection
diff --git a/Model/TagRepository.php b/Model/TagRepository.php
index d298dea9..9062a247 100644
--- a/Model/TagRepository.php
+++ b/Model/TagRepository.php
@@ -138,7 +138,7 @@ public function getById($tagId, $editMode = false, $storeId = null, $forceReload
      * @throws CouldNotDeleteException
      * @throws StateException
      */
-    public function delete(Tag $tag)
+    public function delete(Tag $tag): bool
     {
         try {
             $this->tagResourceModel->delete($tag);
diff --git a/Model/Url.php b/Model/Url.php
index cbd31c40..a16d369c 100644
--- a/Model/Url.php
+++ b/Model/Url.php
@@ -373,7 +373,7 @@ public function trimSufix($identifier, $sufix)
      * Retrieve post url sufix
      * @return string
      */
-    public function getUrlSufix($controllerName)
+    public function getUrlSufix(string $controllerName): string
     {
         return trim((string)$this->_getConfig($controllerName . '_sufix'));
     }
@@ -383,7 +383,7 @@ public function getUrlSufix($controllerName)
      * @param string $file
      * @return string
      */
-    public function getMediaUrl($file)
+    public function getMediaUrl(string $file): string
     {
         return $this->_storeManager->getStore()
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $file;
@@ -401,7 +401,7 @@ public function getStoreId()
      * @param $storeId
      * @return $this
      */
-    public function setStoreId($storeId)
+    public function setStoreId($storeId): static
     {
         $this->storeId = $storeId;
         return $this;
@@ -412,7 +412,7 @@ public function setStoreId($storeId)
      * @param $store
      * @throws \Exception
      */
-    public function startStoreEmulation($store)
+    public function startStoreEmulation($store): void
     {
         if (null !== $this->originalStore) {
             throw new \Exception('Cannot start Blog URL store emulation, emulation already started.');
@@ -426,7 +426,7 @@ public function startStoreEmulation($store)
     /**
      * Stop blog URL store emulation
      */
-    public function stopStoreEmulation()
+    public function stopStoreEmulation(): void
     {
         if ($this->originalStore) {
             $this->setStoreId($this->originalStore->getId());
@@ -443,7 +443,7 @@ public function stopStoreEmulation()
      * @param  string $key
      * @return string || null || int
      */
-    protected function _getConfig($key)
+    protected function _getConfig(string $key)
     {
         return $this->_scopeConfig->getValue(
             'mfblog/permalink/'.$key,
diff --git a/Model/UrlResolver.php b/Model/UrlResolver.php
index 5bdd59a0..a1ccf942 100644
--- a/Model/UrlResolver.php
+++ b/Model/UrlResolver.php
@@ -217,7 +217,7 @@ public function resolve($path)
     /**
      * @param $storeId
      */
-    public function setStoreId($storeId)
+    public function setStoreId($storeId): void
     {
         $this->storeId = $storeId;
     }
@@ -291,7 +291,7 @@ protected function _getTagId($identifier, $checkSufix = true)
      * @param bool $checkSufix
      * @return mixed
      */
-    protected function getObjectId($factory, $controllerName, $identifier, $checkSufix)
+    protected function getObjectId($factory, string $controllerName, string $identifier, $checkSufix)
     {
         $storeId = $this->storeId ?: $this->storeManager->getStore()->getId();
         $key =  $storeId . '-' . $controllerName . '-' .$identifier . ($checkSufix ? '-checksufix' : '');
@@ -319,7 +319,7 @@ protected function getObjectId($factory, $controllerName, $identifier, $checkSuf
      * @param  string  $identifier
      * @return boolean
      */
-    protected function _isArchiveIdentifier($identifier)
+    protected function _isArchiveIdentifier($identifier): bool
     {
         $info = explode('-', $identifier);
         if (!empty($info[1])) {
diff --git a/Observer/InvalidateCache.php b/Observer/InvalidateCache.php
index 6c3f74db..c7aa20ad 100755
--- a/Observer/InvalidateCache.php
+++ b/Observer/InvalidateCache.php
@@ -48,7 +48,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         if ($this->_config->isEnabled()) {
             $this->_typeList->invalidate(
diff --git a/Observer/LayoutGenerateBlocksAfter.php b/Observer/LayoutGenerateBlocksAfter.php
index c8368e71..1fb6f721 100644
--- a/Observer/LayoutGenerateBlocksAfter.php
+++ b/Observer/LayoutGenerateBlocksAfter.php
@@ -40,7 +40,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this|void
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         $availableActions = [
             'blog_archive_view',
diff --git a/Observer/LayoutLoadBeforeObserver.php b/Observer/LayoutLoadBeforeObserver.php
index a6606750..55abfa82 100644
--- a/Observer/LayoutLoadBeforeObserver.php
+++ b/Observer/LayoutLoadBeforeObserver.php
@@ -59,7 +59,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         if ($this->config->isEnabled()) {
             $post = $this->registry->registry('current_blog_post');
diff --git a/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php b/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php
index 624e853b..ce3aa371 100644
--- a/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php
+++ b/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php
@@ -36,7 +36,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         /** @var \Magento\Framework\Data\Tree\Node $menu */
         $menu = $observer->getMenu();
diff --git a/Observer/PredispathFrontendBlogActionControllerObserver.php b/Observer/PredispathFrontendBlogActionControllerObserver.php
index 7cd3157e..0cbeb163 100644
--- a/Observer/PredispathFrontendBlogActionControllerObserver.php
+++ b/Observer/PredispathFrontendBlogActionControllerObserver.php
@@ -52,7 +52,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         $advancedPermalinkEnabled =  $this->scopeConfig->getValue(
             Config::XML_PATH_ADVANCED_PERMALINK_ENABLED,
diff --git a/Setup/Patch/Data/CreateSamplePost.php b/Setup/Patch/Data/CreateSamplePost.php
index a39cb8e7..7ed7f3d6 100644
--- a/Setup/Patch/Data/CreateSamplePost.php
+++ b/Setup/Patch/Data/CreateSamplePost.php
@@ -49,7 +49,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function apply()
+    public function apply(): void
     {
         try {
             $this->state->setAreaCode('adminhtml');
diff --git a/Setup/Patch/Data/TagInStore.php b/Setup/Patch/Data/TagInStore.php
index 00b4e50e..f25844df 100644
--- a/Setup/Patch/Data/TagInStore.php
+++ b/Setup/Patch/Data/TagInStore.php
@@ -55,7 +55,7 @@ public static function getVersion()
     /**
      * {@inheritdoc}
      */
-    public function apply()
+    public function apply(): void
     {
         $connection = $this->resourceConnection->getConnection();
 
diff --git a/Setup/Patch/Data/UpdatePostCommentsCount.php b/Setup/Patch/Data/UpdatePostCommentsCount.php
index feedfac3..9491527e 100644
--- a/Setup/Patch/Data/UpdatePostCommentsCount.php
+++ b/Setup/Patch/Data/UpdatePostCommentsCount.php
@@ -40,7 +40,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function apply()
+    public function apply(): void
     {
         $connection = $this->commentResource->getConnection();
         $postSelect = $connection->select()->from(
diff --git a/Ui/DataProvider/Category/Form/CategoryDataProvider.php b/Ui/DataProvider/Category/Form/CategoryDataProvider.php
index 276b5978..4e54fc90 100644
--- a/Ui/DataProvider/Category/Form/CategoryDataProvider.php
+++ b/Ui/DataProvider/Category/Form/CategoryDataProvider.php
@@ -60,7 +60,7 @@ public function __construct(
      * @param array $meta
      * @return array
      */
-    public function prepareMeta(array $meta)
+    public function prepareMeta(array $meta): array
     {
         return $meta;
     }
diff --git a/Ui/DataProvider/Comment/Form/CommentDataProvider.php b/Ui/DataProvider/Comment/Form/CommentDataProvider.php
index 5a707543..120d12bd 100755
--- a/Ui/DataProvider/Comment/Form/CommentDataProvider.php
+++ b/Ui/DataProvider/Comment/Form/CommentDataProvider.php
@@ -80,7 +80,7 @@ public function __construct(
      * @param array $meta
      * @return array
      */
-    public function prepareMeta(array $meta)
+    public function prepareMeta(array $meta): array
     {
         return $meta;
     }
diff --git a/Ui/DataProvider/Post/Form/PostDataProvider.php b/Ui/DataProvider/Post/Form/PostDataProvider.php
index c46f43db..954baf6e 100644
--- a/Ui/DataProvider/Post/Form/PostDataProvider.php
+++ b/Ui/DataProvider/Post/Form/PostDataProvider.php
@@ -60,7 +60,7 @@ public function __construct(
      * @param array $meta
      * @return array
      */
-    public function prepareMeta(array $meta)
+    public function prepareMeta(array $meta): array
     {
         return $meta;
     }
diff --git a/Ui/DataProvider/Post/Related/ProductDataProvider.php b/Ui/DataProvider/Post/Related/ProductDataProvider.php
index 0610f6b8..a9375c81 100644
--- a/Ui/DataProvider/Post/Related/ProductDataProvider.php
+++ b/Ui/DataProvider/Post/Related/ProductDataProvider.php
@@ -66,8 +66,8 @@ public function __construct(
         RequestInterface $request,
         ProductRepositoryInterface $productRepository,
         ProductLinkRepositoryInterface $productLinkRepository,
-        $addFieldStrategies,
-        $addFilterStrategies,
+        array $addFieldStrategies,
+        array $addFilterStrategies,
         array $meta = [],
         array $data = []
     ) {
@@ -105,7 +105,7 @@ public function getCollection()
      * @param Collection $collection
      * @return Collection
      */
-    protected function addCollectionFilters(Collection $collection)
+    protected function addCollectionFilters(Collection $collection): Collection
     {
         return $collection;
     }
diff --git a/Ui/DataProvider/Tag/Form/TagDataProvider.php b/Ui/DataProvider/Tag/Form/TagDataProvider.php
index 0b652ce9..433fafa5 100644
--- a/Ui/DataProvider/Tag/Form/TagDataProvider.php
+++ b/Ui/DataProvider/Tag/Form/TagDataProvider.php
@@ -60,7 +60,7 @@ public function __construct(
      * @param array $meta
      * @return array
      */
-    public function prepareMeta(array $meta)
+    public function prepareMeta(array $meta): array
     {
         return $meta;
     }
diff --git a/ViewModel/Style.php b/ViewModel/Style.php
index d26cdc90..8c3f108e 100755
--- a/ViewModel/Style.php
+++ b/ViewModel/Style.php
@@ -55,7 +55,7 @@ public function __construct(
     /**
      * @return null|string
      */
-    public function getStyle($file)
+    public function getStyle($file): string
     {
         if (strpos($file, 'bootstrap-4.4.1-custom-min.css') !== false && !$this->config->getIncludeBootstrapCustomMini()) {
             return '';

From e9ca5bcee9c38da2bbb2744a6078df1ad8a52b2e Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Fri, 13 Jun 2025 12:04:56 +0300
Subject: [PATCH 2/5] test2

---
 Block/Author/PostList.php                    | 2 +-
 Block/Category/PostList.php                  | 2 +-
 Block/Index.php                              | 2 +-
 Block/Post/View/Comments/Magefan.php         | 2 +-
 Block/Post/View/Comments/Magefan/Comment.php | 2 +-
 Block/Search/PostList.php                    | 2 +-
 Block/Sidebar/Archive.php                    | 2 +-
 Block/Tag/PostList.php                       | 2 +-
 Controller/Router.php                        | 8 ++++----
 Model/Author.php                             | 2 +-
 Model/AuthorRepository.php                   | 2 +-
 Model/Category.php                           | 4 ++--
 Model/CategoryRepository.php                 | 2 +-
 Model/Comment.php                            | 2 +-
 Model/CommentRepository.php                  | 2 +-
 Model/Post.php                               | 2 +-
 Model/PostRepository.php                     | 2 +-
 Model/ResourceModel/Post.php                 | 2 +-
 Model/Tag.php                                | 2 +-
 Model/TagRepository.php                      | 2 +-
 Model/UrlResolver.php                        | 8 ++++----
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Block/Author/PostList.php b/Block/Author/PostList.php
index 8dbd563e..7fdd5eca 100755
--- a/Block/Author/PostList.php
+++ b/Block/Author/PostList.php
@@ -105,7 +105,7 @@ protected function _prepareLayout()
      *
      * @return string
      */
-    public function getPostTemplateType()
+    public function getPostTemplateType(): string
     {
         $template = (string)$this->_scopeConfig->getValue(
             'mfblog/author/template',
diff --git a/Block/Category/PostList.php b/Block/Category/PostList.php
index 103ddb1c..02a11be4 100644
--- a/Block/Category/PostList.php
+++ b/Block/Category/PostList.php
@@ -208,7 +208,7 @@ public function getIdentities()
      *
      * @return string
      */
-    public function getPostTemplateType()
+    public function getPostTemplateType(): string
     {
         $template = (string)$this->getCategory()->getData('posts_list_template');
         if ($template) {
diff --git a/Block/Index.php b/Block/Index.php
index 239a1c9f..e0d9f7bd 100644
--- a/Block/Index.php
+++ b/Block/Index.php
@@ -194,7 +194,7 @@ protected function _addBreadcrumbs($title = null, $key = null)
      *
      * @return string
      */
-    public function getPostTemplateType()
+    public function getPostTemplateType(): string
     {
         $template = (string)$this->_scopeConfig->getValue(
             'mfblog/index_page/template',
diff --git a/Block/Post/View/Comments/Magefan.php b/Block/Post/View/Comments/Magefan.php
index de15c62c..81940ad7 100755
--- a/Block/Post/View/Comments/Magefan.php
+++ b/Block/Post/View/Comments/Magefan.php
@@ -164,7 +164,7 @@ public function canPost(): bool
      *
      * @return string
      */
-    public function getNumberOfComments()
+    public function getNumberOfComments(): int
     {
         return $this->_scopeConfig->getValue(
             \Magefan\Blog\Model\Config::NUMBER_OF_COMMENTS,
diff --git a/Block/Post/View/Comments/Magefan/Comment.php b/Block/Post/View/Comments/Magefan/Comment.php
index c77041b4..27269066 100755
--- a/Block/Post/View/Comments/Magefan/Comment.php
+++ b/Block/Post/View/Comments/Magefan/Comment.php
@@ -103,7 +103,7 @@ public function getNumberOfReplies()
     /**
      * @return mixed
      */
-    public function getPublishDate()
+    public function getPublishDate(): string|array
     {
         $dateFormat = $this->_scopeConfig->getValue(
             'mfblog/post_view/comments/format_date',
diff --git a/Block/Search/PostList.php b/Block/Search/PostList.php
index 3bdcf4cb..b8afc910 100755
--- a/Block/Search/PostList.php
+++ b/Block/Search/PostList.php
@@ -98,7 +98,7 @@ protected function _getTitle()
      *
      * @return string
      */
-    public function getPostTemplateType()
+    public function getPostTemplateType(): string
     {
         $template = (string)$this->_scopeConfig->getValue(
             'mfblog/search/template',
diff --git a/Block/Sidebar/Archive.php b/Block/Sidebar/Archive.php
index 56c70314..55b45bb5 100755
--- a/Block/Sidebar/Archive.php
+++ b/Block/Sidebar/Archive.php
@@ -118,7 +118,7 @@ public function getIdentities(): array
      * @param $time
      * @return string
      */
-    public function getTranslatedDate($time)
+    public function getTranslatedDate($time): string|array
     {
         if ($this->getGroupBy() == 'year') {
             $time = is_numeric($time) ? $time : strtotime((string)$time);
diff --git a/Block/Tag/PostList.php b/Block/Tag/PostList.php
index 622ca065..78e973f9 100755
--- a/Block/Tag/PostList.php
+++ b/Block/Tag/PostList.php
@@ -105,7 +105,7 @@ protected function _prepareLayout()
      *
      * @return string
      */
-    public function getPostTemplateType()
+    public function getPostTemplateType(): string
     {
         $template = (string)$this->getTag()->getData('posts_list_template');
         if ($template) {
diff --git a/Controller/Router.php b/Controller/Router.php
index 623a5455..b5428928 100755
--- a/Controller/Router.php
+++ b/Controller/Router.php
@@ -389,7 +389,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
      * @return int
      * @deprecated Use URL resolver interface instead
      */
-    protected function _getPostId($identifier, $checkSufix = true)
+    protected function _getPostId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->_postFactory,
@@ -405,7 +405,7 @@ protected function _getPostId($identifier, $checkSufix = true)
      * @return int
      * @deprecated Use URL resolver interface instead
      */
-    protected function _getCategoryId($identifier, $checkSufix = true)
+    protected function _getCategoryId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->_categoryFactory,
@@ -422,7 +422,7 @@ protected function _getCategoryId($identifier, $checkSufix = true)
      * @return int
      * @deprecated Use URL resolver interface instead
      */
-    protected function _getAuthorId($identifier, $checkSufix = true)
+    protected function _getAuthorId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->_authorFactory,
@@ -439,7 +439,7 @@ protected function _getAuthorId($identifier, $checkSufix = true)
      * @return int
      * @deprecated Use URL resolver interface instead
      */
-    protected function _getTagId($identifier, $checkSufix = true)
+    protected function _getTagId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->_tagFactory,
diff --git a/Model/Author.php b/Model/Author.php
index 1827679f..e40da78a 100755
--- a/Model/Author.php
+++ b/Model/Author.php
@@ -84,7 +84,7 @@ public function isVisibleOnStore(int $storeId): bool
      * Retrieve author name (used in identifier generation)
      * @return string | null
      */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->getName();
     }
diff --git a/Model/AuthorRepository.php b/Model/AuthorRepository.php
index b11026a7..29441738 100644
--- a/Model/AuthorRepository.php
+++ b/Model/AuthorRepository.php
@@ -169,7 +169,7 @@ public function delete(AuthorInterface $author): bool
      * @throws NoSuchEntityException
      * @throws StateException
      */
-    public function deleteById($authorId)
+    public function deleteById($authorId): bool
     {
         return $this->delete($this->getById($authorId));
     }
diff --git a/Model/Category.php b/Model/Category.php
index 57737cdf..46228786 100755
--- a/Model/Category.php
+++ b/Model/Category.php
@@ -219,7 +219,7 @@ public function getAvailableStatuses(): array
      * @param int $storeId
      * @return int
      */
-    public function checkIdentifier($identifier, $storeId)
+    public function checkIdentifier($identifier, $storeId): string|false
     {
         return $this->_getResource()->checkIdentifier($identifier, $storeId);
     }
@@ -327,7 +327,7 @@ public function getChildrenIds($grandchildren = true)
      * @param  self  $category
      * @return boolean
      */
-    public function isChild($category)
+    public function isChild($category): bool
     {
         return $category->isParent($this);
     }
diff --git a/Model/CategoryRepository.php b/Model/CategoryRepository.php
index ec8a360a..9e834f63 100644
--- a/Model/CategoryRepository.php
+++ b/Model/CategoryRepository.php
@@ -168,7 +168,7 @@ public function delete(Category $category): bool
      * @throws NoSuchEntityException
      * @throws StateException
      */
-    public function deleteById($categoryId)
+    public function deleteById($categoryId): bool
     {
         return $this->delete($this->getById($categoryId));
     }
diff --git a/Model/Comment.php b/Model/Comment.php
index 774afd60..79c273f3 100755
--- a/Model/Comment.php
+++ b/Model/Comment.php
@@ -290,7 +290,7 @@ public function validate(): void
      * @param  string $format
      * @return string
      */
-    public function getPublishDate($format = 'Y-m-d H:i:s')
+    public function getPublishDate($format = 'Y-m-d H:i:s'): string|array
     {
         return \Magefan\Blog\Helper\Data::getTranslatedDate(
             $format,
diff --git a/Model/CommentRepository.php b/Model/CommentRepository.php
index 86c0e5cb..bc4c91e7 100644
--- a/Model/CommentRepository.php
+++ b/Model/CommentRepository.php
@@ -154,7 +154,7 @@ public function delete(Comment $comment): bool
      * @throws NoSuchEntityException
      * @throws StateException
      */
-    public function deleteById($commentId)
+    public function deleteById($commentId): bool
     {
         return $this->delete($this->getById($commentId));
     }
diff --git a/Model/Post.php b/Model/Post.php
index 0d984984..e3098430 100755
--- a/Model/Post.php
+++ b/Model/Post.php
@@ -349,7 +349,7 @@ public function getAvailableStatuses(): array
      * @param int $storeId
      * @return int
      */
-    public function checkIdentifier($identifier, $storeId)
+    public function checkIdentifier($identifier, $storeId): string|false
     {
         return $this->_getResource()->checkIdentifier($identifier, $storeId);
     }
diff --git a/Model/PostRepository.php b/Model/PostRepository.php
index 7494157f..7a2e5091 100644
--- a/Model/PostRepository.php
+++ b/Model/PostRepository.php
@@ -160,7 +160,7 @@ public function delete(Post $post): bool
      * @throws NoSuchEntityException
      * @throws StateException
      */
-    public function deleteById($postId)
+    public function deleteById($postId): bool
     {
         return $this->delete($this->getById($postId));
     }
diff --git a/Model/ResourceModel/Post.php b/Model/ResourceModel/Post.php
index 6e1055a7..c600a7c8 100755
--- a/Model/ResourceModel/Post.php
+++ b/Model/ResourceModel/Post.php
@@ -232,7 +232,7 @@ public function updateLinks(
         array $newRelatedIds,
         array $oldRelatedIds,
         $tableName,
-        $field,
+        string $field,
         $rowData = []
     ) {
         return $this->_updateLinks($object, $newRelatedIds, $oldRelatedIds, $tableName, $field, $rowData);
diff --git a/Model/Tag.php b/Model/Tag.php
index 35885624..52d117d2 100755
--- a/Model/Tag.php
+++ b/Model/Tag.php
@@ -133,7 +133,7 @@ public function getOwnTitle($plural = false): string
      * @param int $storeId
      * @return int
      */
-    public function checkIdentifier($identifier, $storeId)
+    public function checkIdentifier($identifier, $storeId): string|false
     {
         return $this->_getResource()->checkIdentifier($identifier, $storeId);
     }
diff --git a/Model/TagRepository.php b/Model/TagRepository.php
index 9062a247..41407de2 100644
--- a/Model/TagRepository.php
+++ b/Model/TagRepository.php
@@ -159,7 +159,7 @@ public function delete(Tag $tag): bool
      * @throws NoSuchEntityException
      * @throws StateException
      */
-    public function deleteById($tagId)
+    public function deleteById($tagId): bool
     {
         return $this->delete($this->getById($tagId));
     }
diff --git a/Model/UrlResolver.php b/Model/UrlResolver.php
index a1ccf942..52c28618 100644
--- a/Model/UrlResolver.php
+++ b/Model/UrlResolver.php
@@ -227,7 +227,7 @@ public function setStoreId($storeId): void
      * @param  string $identifier
      * @return int
      */
-    protected function _getPostId($identifier, $checkSufix = true)
+    protected function _getPostId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->postFactory,
@@ -242,7 +242,7 @@ protected function _getPostId($identifier, $checkSufix = true)
      * @param  string $identifier
      * @return int
      */
-    protected function _getCategoryId($identifier, $checkSufix = true)
+    protected function _getCategoryId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->categoryFactory,
@@ -258,7 +258,7 @@ protected function _getCategoryId($identifier, $checkSufix = true)
      * @param bool $checkSufix
      * @return int
      */
-    protected function _getAuthorId($identifier, $checkSufix = true)
+    protected function _getAuthorId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->authorFactory,
@@ -274,7 +274,7 @@ protected function _getAuthorId($identifier, $checkSufix = true)
      * @param bool $checkSufix
      * @return int
      */
-    protected function _getTagId($identifier, $checkSufix = true)
+    protected function _getTagId(string $identifier, $checkSufix = true)
     {
         return $this->getObjectId(
             $this->tagFactory,

From 09cf6ccfcf6c8bdaf7c92db103c97b136d4e99d9 Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Tue, 17 Jun 2025 15:25:55 +0300
Subject: [PATCH 3/5] auto add declare strict_types

---
 Api/AuthorCollectionInterface.php                             | 4 +++-
 Api/AuthorRepositoryInterface.php                             | 4 +++-
 Api/AuthorResourceModelInterface.php                          | 4 +++-
 Api/CategoryManagementInterface.php                           | 4 +++-
 Api/CategoryRepositoryInterface.php                           | 4 +++-
 Api/CommentRepositoryInterface.php                            | 4 +++-
 Api/ManagementInterface.php                                   | 4 +++-
 Api/PostManagementInterface.php                               | 4 +++-
 Api/PostRepositoryInterface.php                               | 4 +++-
 Api/ShortContentExtractorInterface.php                        | 4 +++-
 Api/TagRepositoryInterface.php                                | 4 +++-
 Api/UrlResolverInterface.php                                  | 3 +++
 App/Action/Action.php                                         | 4 +++-
 Block/Adminhtml/Category.php                                  | 4 +++-
 Block/Adminhtml/Category/CreateButton.php                     | 4 +++-
 Block/Adminhtml/Category/DeleteButton.php                     | 4 +++-
 Block/Adminhtml/Category/DuplicateButton.php                  | 4 +++-
 Block/Adminhtml/Category/SaveAndContinueButton.php            | 4 +++-
 Block/Adminhtml/Category/SaveButton.php                       | 4 +++-
 Block/Adminhtml/Comment.php                                   | 4 +++-
 Block/Adminhtml/Comment/DeleteButton.php                      | 4 +++-
 Block/Adminhtml/Comment/ReplyButton.php                       | 4 +++-
 Block/Adminhtml/Comment/SaveAndContinueButton.php             | 4 +++-
 Block/Adminhtml/Comment/SaveButton.php                        | 4 +++-
 Block/Adminhtml/Grid/Column/Author.php                        | 4 +++-
 Block/Adminhtml/Grid/Column/Categories.php                    | 4 +++-
 Block/Adminhtml/Grid/Column/Filter/Author.php                 | 4 +++-
 Block/Adminhtml/Grid/Column/Filter/Category.php               | 4 +++-
 Block/Adminhtml/Grid/Column/Render/Author.php                 | 4 +++-
 Block/Adminhtml/Grid/Column/Render/Category.php               | 4 +++-
 Block/Adminhtml/Grid/Column/Render/Image.php                  | 2 ++
 Block/Adminhtml/Grid/Column/Statuses.php                      | 4 +++-
 Block/Adminhtml/Import/Form.php                               | 4 +++-
 Block/Adminhtml/Import/Form/Form.php                          | 4 +++-
 Block/Adminhtml/Post.php                                      | 4 +++-
 Block/Adminhtml/Post/DeleteButton.php                         | 4 +++-
 Block/Adminhtml/Post/DuplicateButton.php                      | 4 +++-
 Block/Adminhtml/Post/Helper/Form/Gallery.php                  | 4 +++-
 Block/Adminhtml/Post/Helper/Form/Gallery/Content.php          | 4 +++-
 Block/Adminhtml/Post/SaveAndContinueButton.php                | 4 +++-
 Block/Adminhtml/Post/SaveButton.php                           | 4 +++-
 Block/Adminhtml/Post/Tag/Autocomplete.php                     | 4 +++-
 Block/Adminhtml/System/Config/Form/CheckEnableInfo.php        | 4 +++-
 Block/Adminhtml/System/Config/Form/ColorPicker.php            | 4 +++-
 Block/Adminhtml/System/Config/Form/Info.php                   | 4 +++-
 .../Adminhtml/System/Config/Form/PermalinkSettingsMessage.php | 4 +++-
 Block/Adminhtml/System/Config/Form/SitemapInfo.php            | 3 +++
 Block/Adminhtml/System/Config/Form/UpdateInfo.php             | 4 +++-
 Block/Adminhtml/Tag.php                                       | 4 +++-
 Block/Adminhtml/Tag/CreateButton.php                          | 4 +++-
 Block/Adminhtml/Tag/DeleteButton.php                          | 4 +++-
 Block/Adminhtml/Tag/SaveAndContinueButton.php                 | 4 +++-
 Block/Adminhtml/Tag/SaveButton.php                            | 4 +++-
 Block/Archive/Archive.php                                     | 4 +++-
 Block/Archive/PostList.php                                    | 4 +++-
 Block/Author/PostList.php                                     | 4 +++-
 Block/Catalog/Product/RelatedPosts.php                        | 4 +++-
 Block/Category/AbstractCategory.php                           | 4 +++-
 Block/Category/Info.php                                       | 4 +++-
 Block/Category/PostLinks.php                                  | 4 +++-
 Block/Category/PostList.php                                   | 4 +++-
 Block/Category/SubCategoryLinks.php                           | 4 +++-
 Block/Category/View.php                                       | 4 +++-
 Block/Index.php                                               | 4 +++-
 Block/Infortis/UltraMegamenu/Topmenu.php                      | 4 +++-
 Block/Link.php                                                | 4 +++-
 Block/Post/AbstractPost.php                                   | 4 +++-
 Block/Post/Info.php                                           | 4 +++-
 Block/Post/PostList.php                                       | 4 +++-
 Block/Post/PostList/AbstractList.php                          | 4 +++-
 Block/Post/PostList/Item.php                                  | 4 +++-
 Block/Post/PostList/Toolbar.php                               | 4 +++-
 Block/Post/PostList/Toolbar/Pager.php                         | 4 +++-
 Block/Post/View.php                                           | 3 +++
 Block/Post/View/Comments.php                                  | 4 +++-
 Block/Post/View/Comments/Disqus.php                           | 4 +++-
 Block/Post/View/Comments/Facebook.php                         | 4 +++-
 Block/Post/View/Comments/Google.php                           | 4 +++-
 Block/Post/View/Comments/HeadFbApi.php                        | 3 +++
 Block/Post/View/Comments/Magefan.php                          | 4 +++-
 Block/Post/View/Comments/Magefan/Comment.php                  | 4 +++-
 Block/Post/View/Gallery.php                                   | 3 +++
 Block/Post/View/NextPrev.php                                  | 4 +++-
 Block/Post/View/Opengraph.php                                 | 3 +++
 Block/Post/View/RelatedPosts.php                              | 4 +++-
 Block/Post/View/RelatedProducts.php                           | 4 +++-
 Block/Post/View/Richsnippets.php                              | 3 +++
 Block/Post/View/ViewsCount.php                                | 4 +++-
 Block/Rss/Feed.php                                            | 4 +++-
 Block/Search/PostList.php                                     | 4 +++-
 Block/Sidebar.php                                             | 4 +++-
 Block/Sidebar/Archive.php                                     | 4 +++-
 Block/Sidebar/Categories.php                                  | 4 +++-
 Block/Sidebar/Custom.php                                      | 4 +++-
 Block/Sidebar/CustomTwo.php                                   | 4 +++-
 Block/Sidebar/Popular.php                                     | 4 +++-
 Block/Sidebar/PostRelatedProducts.php                         | 4 +++-
 Block/Sidebar/Recent.php                                      | 4 +++-
 Block/Sidebar/Rss.php                                         | 4 +++-
 Block/Sidebar/Search.php                                      | 4 +++-
 Block/Sidebar/TagClaud.php                                    | 4 +++-
 Block/Sidebar/Widget.php                                      | 4 +++-
 Block/Smartwave/Megamenu/Topmenu.php                          | 4 +++-
 Block/Social/AddThis.php                                      | 2 ++
 Block/Tag/AbstractTag.php                                     | 4 +++-
 Block/Tag/Info.php                                            | 4 +++-
 Block/Tag/PostList.php                                        | 4 +++-
 Block/Widget/Featured.php                                     | 4 +++-
 Block/Widget/Link.php                                         | 3 +++
 Block/Widget/PostList.php                                     | 4 +++-
 Block/Widget/Recent.php                                       | 4 +++-
 Controller/Adminhtml/Actions.php                              | 4 +++-
 Controller/Adminhtml/Category.php                             | 4 +++-
 Controller/Adminhtml/Category/Delete.php                      | 4 +++-
 Controller/Adminhtml/Category/Duplicate.php                   | 4 +++-
 Controller/Adminhtml/Category/Edit.php                        | 4 +++-
 Controller/Adminhtml/Category/Grid.php                        | 4 +++-
 Controller/Adminhtml/Category/Index.php                       | 4 +++-
 Controller/Adminhtml/Category/MassStatus.php                  | 4 +++-
 Controller/Adminhtml/Category/NewAction.php                   | 4 +++-
 Controller/Adminhtml/Category/Save.php                        | 4 +++-
 Controller/Adminhtml/Comment.php                              | 4 +++-
 Controller/Adminhtml/Comment/AddReply.php                     | 4 +++-
 Controller/Adminhtml/Comment/Delete.php                       | 4 +++-
 Controller/Adminhtml/Comment/Edit.php                         | 4 +++-
 Controller/Adminhtml/Comment/Grid.php                         | 4 +++-
 Controller/Adminhtml/Comment/Index.php                        | 4 +++-
 Controller/Adminhtml/Comment/MassStatus.php                   | 4 +++-
 Controller/Adminhtml/Comment/NewAction.php                    | 4 +++-
 Controller/Adminhtml/Comment/Save.php                         | 4 +++-
 Controller/Adminhtml/Import/Form.php                          | 4 +++-
 Controller/Adminhtml/Import/Index.php                         | 4 +++-
 Controller/Adminhtml/Import/Run.php                           | 4 +++-
 Controller/Adminhtml/Post.php                                 | 4 +++-
 Controller/Adminhtml/Post/Delete.php                          | 4 +++-
 Controller/Adminhtml/Post/Duplicate.php                       | 4 +++-
 Controller/Adminhtml/Post/Edit.php                            | 4 +++-
 Controller/Adminhtml/Post/Grid.php                            | 4 +++-
 Controller/Adminhtml/Post/Index.php                           | 4 +++-
 Controller/Adminhtml/Post/MassStatus.php                      | 4 +++-
 Controller/Adminhtml/Post/NewAction.php                       | 4 +++-
 Controller/Adminhtml/Post/Preview.php                         | 4 +++-
 Controller/Adminhtml/Post/Save.php                            | 4 +++-
 Controller/Adminhtml/Post/Upload/FeaturedImg.php              | 4 +++-
 Controller/Adminhtml/Post/Upload/Gallery.php                  | 4 +++-
 Controller/Adminhtml/Post/Upload/OgImg.php                    | 4 +++-
 Controller/Adminhtml/Tag.php                                  | 4 +++-
 Controller/Adminhtml/Tag/Autocomplete.php                     | 4 +++-
 Controller/Adminhtml/Tag/Delete.php                           | 4 +++-
 Controller/Adminhtml/Tag/Edit.php                             | 4 +++-
 Controller/Adminhtml/Tag/Grid.php                             | 4 +++-
 Controller/Adminhtml/Tag/Index.php                            | 4 +++-
 Controller/Adminhtml/Tag/MassStatus.php                       | 4 +++-
 Controller/Adminhtml/Tag/NewAction.php                        | 4 +++-
 Controller/Adminhtml/Tag/Save.php                             | 4 +++-
 Controller/Adminhtml/Upload/Image/Action.php                  | 4 +++-
 Controller/Archive/View.php                                   | 3 +++
 Controller/Author/View.php                                    | 3 +++
 Controller/Category/View.php                                  | 3 +++
 Controller/Comment/Post.php                                   | 3 +++
 Controller/Index/Index.php                                    | 3 +++
 Controller/Post/View.php                                      | 3 +++
 Controller/Post/Viewscount.php                                | 4 +++-
 Controller/Router.php                                         | 4 +++-
 Controller/Rss/Feed.php                                       | 3 +++
 Controller/Search/Index.php                                   | 3 +++
 Controller/Tag/View.php                                       | 3 +++
 Cron/ReSaveExistingPosts.php                                  | 4 +++-
 Helper/Config.php                                             | 4 +++-
 Helper/Data.php                                               | 4 +++-
 Helper/Image.php                                              | 3 +++
 Helper/Menu.php                                               | 4 +++-
 Helper/Page.php                                               | 4 +++-
 Model/AbstractManagement.php                                  | 4 +++-
 Model/Author.php                                              | 4 +++-
 Model/AuthorRepository.php                                    | 3 +++
 Model/Category.php                                            | 4 +++-
 Model/CategoryManagement.php                                  | 4 +++-
 Model/CategoryRepository.php                                  | 3 +++
 Model/Comment.php                                             | 4 +++-
 Model/Comment/Notification.php                                | 4 +++-
 Model/CommentRepository.php                                   | 3 +++
 Model/Config.php                                              | 4 +++-
 Model/Config/Source/Author.php                                | 4 +++-
 Model/Config/Source/AuthorType.php                            | 4 +++-
 Model/Config/Source/BlogPages.php                             | 3 +++
 Model/Config/Source/Category.php                              | 4 +++-
 Model/Config/Source/CategoryDisplayMode.php                   | 4 +++-
 Model/Config/Source/CategoryPath.php                          | 4 +++-
 Model/Config/Source/CategoryTree.php                          | 4 +++-
 Model/Config/Source/CommentStatus.php                         | 4 +++-
 Model/Config/Source/CommetType.php                            | 4 +++-
 Model/Config/Source/DisplayMode.php                           | 4 +++-
 Model/Config/Source/LazyLoad.php                              | 4 +++-
 Model/Config/Source/PageLayout.php                            | 4 +++-
 Model/Config/Source/PagePaginationType.php                    | 4 +++-
 Model/Config/Source/PermalinkType.php                         | 4 +++-
 Model/Config/Source/PostsSortBy.php                           | 4 +++-
 Model/Config/Source/ReadingProgressBarPosition.php            | 4 +++-
 Model/Config/Source/Tag.php                                   | 4 +++-
 Model/Config/Source/TagRobots.php                             | 4 +++-
 Model/Config/Source/WidgetTag.php                             | 4 +++-
 Model/Image.php                                               | 4 +++-
 Model/ImageUploader.php                                       | 4 +++-
 Model/Import/AbstractImport.php                               | 4 +++-
 Model/Import/Aw.php                                           | 4 +++-
 Model/Import/Aw2.php                                          | 4 +++-
 Model/Import/Mageplaza.php                                    | 4 +++-
 Model/Import/Mageplaza1.php                                   | 4 +++-
 Model/Import/Mirasvit.php                                     | 4 +++-
 Model/Import/Wordpress.php                                    | 4 +++-
 Model/NoSlashUrlRedirect.php                                  | 3 +++
 Model/Post.php                                                | 4 +++-
 Model/PostManagement.php                                      | 4 +++-
 Model/PostRepository.php                                      | 3 +++
 Model/PreviewUrl.php                                          | 4 +++-
 Model/ResourceModel/Author.php                                | 4 +++-
 Model/ResourceModel/Author/Collection.php                     | 4 +++-
 Model/ResourceModel/Category.php                              | 4 +++-
 Model/ResourceModel/Category/Collection.php                   | 4 +++-
 Model/ResourceModel/Comment.php                               | 4 +++-
 Model/ResourceModel/Comment/Collection.php                    | 4 +++-
 Model/ResourceModel/Comment/Collection/Grid.php               | 4 +++-
 Model/ResourceModel/PageIdentifierGenerator.php               | 4 +++-
 Model/ResourceModel/Post.php                                  | 4 +++-
 Model/ResourceModel/Post/Collection.php                       | 4 +++-
 Model/ResourceModel/Tag.php                                   | 4 +++-
 Model/ResourceModel/Tag/Collection.php                        | 4 +++-
 Model/ShortContentExtractor.php                               | 4 +++-
 Model/Sitemap/ItemProvider/Category.php                       | 4 +++-
 Model/Sitemap/ItemProvider/Index.php                          | 4 +++-
 Model/Sitemap/ItemProvider/Post.php                           | 4 +++-
 Model/SlashUrlRedirect.php                                    | 3 +++
 Model/Tag.php                                                 | 4 +++-
 Model/Tag/AutocompleteData.php                                | 4 +++-
 Model/TagRepository.php                                       | 3 +++
 Model/Url.php                                                 | 4 +++-
 Model/UrlResolver.php                                         | 3 +++
 Observer/InvalidateCache.php                                  | 4 +++-
 Observer/LayoutGenerateBlocksAfter.php                        | 4 +++-
 Observer/LayoutLoadBeforeObserver.php                         | 4 +++-
 Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php        | 4 +++-
 Observer/PredispathFrontendBlogActionControllerObserver.php   | 3 +++
 Plugin/Magento/AdminGws/Model/ModelsPlugin.php                | 4 +++-
 .../Framework/App/Config/ScopeConfigInterfacePlugin.php       | 2 ++
 Plugin/Magento/Framework/View/Element/TemplatePlugin.php      | 4 +++-
 Ui/DataProvider/Category/Form/CategoryDataProvider.php        | 3 +++
 Ui/DataProvider/Comment/Form/CommentDataProvider.php          | 3 +++
 Ui/DataProvider/Post/Form/PostDataProvider.php                | 3 +++
 Ui/DataProvider/Post/Related/PostDataProvider.php             | 4 +++-
 Ui/DataProvider/Post/Related/ProductDataProvider.php          | 4 +++-
 Ui/DataProvider/Tag/Form/TagDataProvider.php                  | 3 +++
 ViewModel/Style.php                                           | 4 +++-
 registration.php                                              | 4 +++-
 254 files changed, 759 insertions(+), 219 deletions(-)

diff --git a/Api/AuthorCollectionInterface.php b/Api/AuthorCollectionInterface.php
index c500f5d4..8016a0e1 100755
--- a/Api/AuthorCollectionInterface.php
+++ b/Api/AuthorCollectionInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 interface AuthorCollectionInterface
diff --git a/Api/AuthorRepositoryInterface.php b/Api/AuthorRepositoryInterface.php
index 41581099..0ce2460b 100644
--- a/Api/AuthorRepositoryInterface.php
+++ b/Api/AuthorRepositoryInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 /**
diff --git a/Api/AuthorResourceModelInterface.php b/Api/AuthorResourceModelInterface.php
index a28dbf39..c388a6d0 100644
--- a/Api/AuthorResourceModelInterface.php
+++ b/Api/AuthorResourceModelInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 interface AuthorResourceModelInterface
diff --git a/Api/CategoryManagementInterface.php b/Api/CategoryManagementInterface.php
index 4f25bc6a..f2e8ace4 100644
--- a/Api/CategoryManagementInterface.php
+++ b/Api/CategoryManagementInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 interface CategoryManagementInterface extends ManagementInterface
diff --git a/Api/CategoryRepositoryInterface.php b/Api/CategoryRepositoryInterface.php
index f3577558..c8395342 100644
--- a/Api/CategoryRepositoryInterface.php
+++ b/Api/CategoryRepositoryInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 use Magefan\Blog\Model\Category;
diff --git a/Api/CommentRepositoryInterface.php b/Api/CommentRepositoryInterface.php
index 81e86ac8..10914303 100644
--- a/Api/CommentRepositoryInterface.php
+++ b/Api/CommentRepositoryInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 use Magefan\Blog\Model\Comment;
diff --git a/Api/ManagementInterface.php b/Api/ManagementInterface.php
index cb749489..36509b99 100644
--- a/Api/ManagementInterface.php
+++ b/Api/ManagementInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 interface ManagementInterface
diff --git a/Api/PostManagementInterface.php b/Api/PostManagementInterface.php
index 38313754..88298b64 100644
--- a/Api/PostManagementInterface.php
+++ b/Api/PostManagementInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 interface PostManagementInterface extends ManagementInterface
diff --git a/Api/PostRepositoryInterface.php b/Api/PostRepositoryInterface.php
index 641b5b28..30268dcb 100644
--- a/Api/PostRepositoryInterface.php
+++ b/Api/PostRepositoryInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 use Magefan\Blog\Model\Post;
diff --git a/Api/ShortContentExtractorInterface.php b/Api/ShortContentExtractorInterface.php
index 83bcd11e..dde69bbc 100644
--- a/Api/ShortContentExtractorInterface.php
+++ b/Api/ShortContentExtractorInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 interface ShortContentExtractorInterface
diff --git a/Api/TagRepositoryInterface.php b/Api/TagRepositoryInterface.php
index dde58fbc..8cefe9dc 100644
--- a/Api/TagRepositoryInterface.php
+++ b/Api/TagRepositoryInterface.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Api;
 
 use Magefan\Blog\Model\Tag;
diff --git a/Api/UrlResolverInterface.php b/Api/UrlResolverInterface.php
index 4668a8d7..f7bbeb58 100644
--- a/Api/UrlResolverInterface.php
+++ b/Api/UrlResolverInterface.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/App/Action/Action.php b/App/Action/Action.php
index 7ed99166..1134bf11 100644
--- a/App/Action/Action.php
+++ b/App/Action/Action.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\App\Action;
 
 /**
diff --git a/Block/Adminhtml/Category.php b/Block/Adminhtml/Category.php
index 38d07de9..98f955df 100755
--- a/Block/Adminhtml/Category.php
+++ b/Block/Adminhtml/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml;
 
 /**
diff --git a/Block/Adminhtml/Category/CreateButton.php b/Block/Adminhtml/Category/CreateButton.php
index a12fa8e5..ae33838e 100755
--- a/Block/Adminhtml/Category/CreateButton.php
+++ b/Block/Adminhtml/Category/CreateButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Category;
 
 /**
diff --git a/Block/Adminhtml/Category/DeleteButton.php b/Block/Adminhtml/Category/DeleteButton.php
index 383c26ce..dd665d54 100755
--- a/Block/Adminhtml/Category/DeleteButton.php
+++ b/Block/Adminhtml/Category/DeleteButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Category;
 
 /**
diff --git a/Block/Adminhtml/Category/DuplicateButton.php b/Block/Adminhtml/Category/DuplicateButton.php
index 7dcb757e..471f4cb8 100644
--- a/Block/Adminhtml/Category/DuplicateButton.php
+++ b/Block/Adminhtml/Category/DuplicateButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Category;
 
 /**
diff --git a/Block/Adminhtml/Category/SaveAndContinueButton.php b/Block/Adminhtml/Category/SaveAndContinueButton.php
index b311b9f6..bc0785f6 100755
--- a/Block/Adminhtml/Category/SaveAndContinueButton.php
+++ b/Block/Adminhtml/Category/SaveAndContinueButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Category;
 
 /**
diff --git a/Block/Adminhtml/Category/SaveButton.php b/Block/Adminhtml/Category/SaveButton.php
index 7134df23..5b8fdd30 100755
--- a/Block/Adminhtml/Category/SaveButton.php
+++ b/Block/Adminhtml/Category/SaveButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Category;
 
 /**
diff --git a/Block/Adminhtml/Comment.php b/Block/Adminhtml/Comment.php
index f64a0210..9c02c7b8 100755
--- a/Block/Adminhtml/Comment.php
+++ b/Block/Adminhtml/Comment.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml;
 
 /**
diff --git a/Block/Adminhtml/Comment/DeleteButton.php b/Block/Adminhtml/Comment/DeleteButton.php
index 7a916dad..c7716181 100755
--- a/Block/Adminhtml/Comment/DeleteButton.php
+++ b/Block/Adminhtml/Comment/DeleteButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Comment;
 
 /**
diff --git a/Block/Adminhtml/Comment/ReplyButton.php b/Block/Adminhtml/Comment/ReplyButton.php
index 169e49a7..e7236da4 100644
--- a/Block/Adminhtml/Comment/ReplyButton.php
+++ b/Block/Adminhtml/Comment/ReplyButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Comment;
 
 use Magefan\Community\Block\Adminhtml\Edit\GenericButton;
diff --git a/Block/Adminhtml/Comment/SaveAndContinueButton.php b/Block/Adminhtml/Comment/SaveAndContinueButton.php
index 8644b27e..79908abd 100755
--- a/Block/Adminhtml/Comment/SaveAndContinueButton.php
+++ b/Block/Adminhtml/Comment/SaveAndContinueButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Comment;
 
 /**
diff --git a/Block/Adminhtml/Comment/SaveButton.php b/Block/Adminhtml/Comment/SaveButton.php
index 93e2530b..4b057bd3 100755
--- a/Block/Adminhtml/Comment/SaveButton.php
+++ b/Block/Adminhtml/Comment/SaveButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Comment;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Author.php b/Block/Adminhtml/Grid/Column/Author.php
index 229b6e0a..d120c7d2 100755
--- a/Block/Adminhtml/Grid/Column/Author.php
+++ b/Block/Adminhtml/Grid/Column/Author.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Categories.php b/Block/Adminhtml/Grid/Column/Categories.php
index 8b3ad9f3..796b23bb 100755
--- a/Block/Adminhtml/Grid/Column/Categories.php
+++ b/Block/Adminhtml/Grid/Column/Categories.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Filter/Author.php b/Block/Adminhtml/Grid/Column/Filter/Author.php
index 0a56ed8b..01561dca 100644
--- a/Block/Adminhtml/Grid/Column/Filter/Author.php
+++ b/Block/Adminhtml/Grid/Column/Filter/Author.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column\Filter;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Filter/Category.php b/Block/Adminhtml/Grid/Column/Filter/Category.php
index dcb44c7b..122c15d9 100644
--- a/Block/Adminhtml/Grid/Column/Filter/Category.php
+++ b/Block/Adminhtml/Grid/Column/Filter/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column\Filter;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Render/Author.php b/Block/Adminhtml/Grid/Column/Render/Author.php
index 97e1d597..dd4ddadf 100644
--- a/Block/Adminhtml/Grid/Column/Render/Author.php
+++ b/Block/Adminhtml/Grid/Column/Render/Author.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column\Render;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Render/Category.php b/Block/Adminhtml/Grid/Column/Render/Category.php
index 34ca1afb..d34d4271 100644
--- a/Block/Adminhtml/Grid/Column/Render/Category.php
+++ b/Block/Adminhtml/Grid/Column/Render/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column\Render;
 
 /**
diff --git a/Block/Adminhtml/Grid/Column/Render/Image.php b/Block/Adminhtml/Grid/Column/Render/Image.php
index 1f188605..bf6eef21 100644
--- a/Block/Adminhtml/Grid/Column/Render/Image.php
+++ b/Block/Adminhtml/Grid/Column/Render/Image.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column\Render;
 
 use Magefan\Blog\Model\Url;
diff --git a/Block/Adminhtml/Grid/Column/Statuses.php b/Block/Adminhtml/Grid/Column/Statuses.php
index dafc7988..9578509f 100755
--- a/Block/Adminhtml/Grid/Column/Statuses.php
+++ b/Block/Adminhtml/Grid/Column/Statuses.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Grid\Column;
 
 /**
diff --git a/Block/Adminhtml/Import/Form.php b/Block/Adminhtml/Import/Form.php
index eee2d733..5b06041a 100644
--- a/Block/Adminhtml/Import/Form.php
+++ b/Block/Adminhtml/Import/Form.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Import;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Adminhtml/Import/Form/Form.php b/Block/Adminhtml/Import/Form/Form.php
index b36bd14a..831db62a 100644
--- a/Block/Adminhtml/Import/Form/Form.php
+++ b/Block/Adminhtml/Import/Form/Form.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Import\Form;
 
 /**
diff --git a/Block/Adminhtml/Post.php b/Block/Adminhtml/Post.php
index ba20eb34..116ef46b 100755
--- a/Block/Adminhtml/Post.php
+++ b/Block/Adminhtml/Post.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml;
 
 /**
diff --git a/Block/Adminhtml/Post/DeleteButton.php b/Block/Adminhtml/Post/DeleteButton.php
index 51cbb5b8..f701d233 100755
--- a/Block/Adminhtml/Post/DeleteButton.php
+++ b/Block/Adminhtml/Post/DeleteButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Post;
 
 /**
diff --git a/Block/Adminhtml/Post/DuplicateButton.php b/Block/Adminhtml/Post/DuplicateButton.php
index 5338cf41..b663a4dd 100644
--- a/Block/Adminhtml/Post/DuplicateButton.php
+++ b/Block/Adminhtml/Post/DuplicateButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Post;
 
 /**
diff --git a/Block/Adminhtml/Post/Helper/Form/Gallery.php b/Block/Adminhtml/Post/Helper/Form/Gallery.php
index b0e5b722..3c512dc3 100644
--- a/Block/Adminhtml/Post/Helper/Form/Gallery.php
+++ b/Block/Adminhtml/Post/Helper/Form/Gallery.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 /**
  * Blog post gallery
  */
diff --git a/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php b/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php
index aabdfd8a..2f2d37ce 100644
--- a/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php
+++ b/Block/Adminhtml/Post/Helper/Form/Gallery/Content.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 /**
  * Blog post gallery content
  */
diff --git a/Block/Adminhtml/Post/SaveAndContinueButton.php b/Block/Adminhtml/Post/SaveAndContinueButton.php
index a048d09d..2a5f81f2 100755
--- a/Block/Adminhtml/Post/SaveAndContinueButton.php
+++ b/Block/Adminhtml/Post/SaveAndContinueButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Post;
 
 /**
diff --git a/Block/Adminhtml/Post/SaveButton.php b/Block/Adminhtml/Post/SaveButton.php
index 09aa0264..9f7e808b 100755
--- a/Block/Adminhtml/Post/SaveButton.php
+++ b/Block/Adminhtml/Post/SaveButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Post;
 
 /**
diff --git a/Block/Adminhtml/Post/Tag/Autocomplete.php b/Block/Adminhtml/Post/Tag/Autocomplete.php
index 07d1424e..a12c3622 100644
--- a/Block/Adminhtml/Post/Tag/Autocomplete.php
+++ b/Block/Adminhtml/Post/Tag/Autocomplete.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Post\Tag;
 
 use \Magento\Framework\Registry;
diff --git a/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php b/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php
index cd79f2fb..b33dfb42 100644
--- a/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php
+++ b/Block/Adminhtml/System/Config/Form/CheckEnableInfo.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
 
 use Magento\Framework\App\ObjectManager;
diff --git a/Block/Adminhtml/System/Config/Form/ColorPicker.php b/Block/Adminhtml/System/Config/Form/ColorPicker.php
index 1f2fc042..1b9f248d 100755
--- a/Block/Adminhtml/System/Config/Form/ColorPicker.php
+++ b/Block/Adminhtml/System/Config/Form/ColorPicker.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
 
 use Magefan\Community\Api\SecureHtmlRendererInterface;
diff --git a/Block/Adminhtml/System/Config/Form/Info.php b/Block/Adminhtml/System/Config/Form/Info.php
index 5021d5c7..d81db108 100755
--- a/Block/Adminhtml/System/Config/Form/Info.php
+++ b/Block/Adminhtml/System/Config/Form/Info.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php b/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php
index 28371cae..18028d29 100644
--- a/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php
+++ b/Block/Adminhtml/System/Config/Form/PermalinkSettingsMessage.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
 
 class PermalinkSettingsMessage extends \Magefan\Community\Block\Adminhtml\System\Config\Form\Info
diff --git a/Block/Adminhtml/System/Config/Form/SitemapInfo.php b/Block/Adminhtml/System/Config/Form/SitemapInfo.php
index 28019fad..b849fedc 100644
--- a/Block/Adminhtml/System/Config/Form/SitemapInfo.php
+++ b/Block/Adminhtml/System/Config/Form/SitemapInfo.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Adminhtml/System/Config/Form/UpdateInfo.php b/Block/Adminhtml/System/Config/Form/UpdateInfo.php
index 6d669198..136dd76b 100644
--- a/Block/Adminhtml/System/Config/Form/UpdateInfo.php
+++ b/Block/Adminhtml/System/Config/Form/UpdateInfo.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
 
 use Magefan\Community\Api\GetModuleVersionInterface;
diff --git a/Block/Adminhtml/Tag.php b/Block/Adminhtml/Tag.php
index ccec3d59..25f2ce3e 100755
--- a/Block/Adminhtml/Tag.php
+++ b/Block/Adminhtml/Tag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml;
 
 /**
diff --git a/Block/Adminhtml/Tag/CreateButton.php b/Block/Adminhtml/Tag/CreateButton.php
index 8e62177d..59c0fdf5 100755
--- a/Block/Adminhtml/Tag/CreateButton.php
+++ b/Block/Adminhtml/Tag/CreateButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Tag;
 
 /**
diff --git a/Block/Adminhtml/Tag/DeleteButton.php b/Block/Adminhtml/Tag/DeleteButton.php
index cf92271c..50d89dae 100755
--- a/Block/Adminhtml/Tag/DeleteButton.php
+++ b/Block/Adminhtml/Tag/DeleteButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Tag;
 
 /**
diff --git a/Block/Adminhtml/Tag/SaveAndContinueButton.php b/Block/Adminhtml/Tag/SaveAndContinueButton.php
index eca2b169..99f7384d 100755
--- a/Block/Adminhtml/Tag/SaveAndContinueButton.php
+++ b/Block/Adminhtml/Tag/SaveAndContinueButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Tag;
 
 /**
diff --git a/Block/Adminhtml/Tag/SaveButton.php b/Block/Adminhtml/Tag/SaveButton.php
index 4f540d97..5a5e6436 100755
--- a/Block/Adminhtml/Tag/SaveButton.php
+++ b/Block/Adminhtml/Tag/SaveButton.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Adminhtml\Tag;
 
 /**
diff --git a/Block/Archive/Archive.php b/Block/Archive/Archive.php
index 0b051b42..ff98c7c0 100644
--- a/Block/Archive/Archive.php
+++ b/Block/Archive/Archive.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Archive;
 
 trait Archive
diff --git a/Block/Archive/PostList.php b/Block/Archive/PostList.php
index 97d4d2e3..3a3c140a 100755
--- a/Block/Archive/PostList.php
+++ b/Block/Archive/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Archive;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Author/PostList.php b/Block/Author/PostList.php
index 7fdd5eca..088d098c 100755
--- a/Block/Author/PostList.php
+++ b/Block/Author/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Author;
 
 use Magefan\Blog\Block\Post\PostList\Toolbar;
diff --git a/Block/Catalog/Product/RelatedPosts.php b/Block/Catalog/Product/RelatedPosts.php
index 307a0c0b..9c3c4279 100755
--- a/Block/Catalog/Product/RelatedPosts.php
+++ b/Block/Catalog/Product/RelatedPosts.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Catalog\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
diff --git a/Block/Category/AbstractCategory.php b/Block/Category/AbstractCategory.php
index 67bd3bc2..16fc5e3d 100644
--- a/Block/Category/AbstractCategory.php
+++ b/Block/Category/AbstractCategory.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © 2016-Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Category;
 
 /**
diff --git a/Block/Category/Info.php b/Block/Category/Info.php
index 06628a86..ade17603 100755
--- a/Block/Category/Info.php
+++ b/Block/Category/Info.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Category;
 
 /**
diff --git a/Block/Category/PostLinks.php b/Block/Category/PostLinks.php
index 00b20b92..a6d77d50 100644
--- a/Block/Category/PostLinks.php
+++ b/Block/Category/PostLinks.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Category;
 
 use Magefan\Blog\Model\Config\Source\CategoryDisplayMode;
diff --git a/Block/Category/PostList.php b/Block/Category/PostList.php
index 02a11be4..54e2ddd0 100644
--- a/Block/Category/PostList.php
+++ b/Block/Category/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Category;
 
 use Magento\Framework\Api\SortOrder;
diff --git a/Block/Category/SubCategoryLinks.php b/Block/Category/SubCategoryLinks.php
index 1fbf9082..68377c6b 100644
--- a/Block/Category/SubCategoryLinks.php
+++ b/Block/Category/SubCategoryLinks.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © 2016-Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Category;
 
 use Magefan\Blog\Model\Config\Source\CategoryDisplayMode;
diff --git a/Block/Category/View.php b/Block/Category/View.php
index 928bd82b..86716058 100755
--- a/Block/Category/View.php
+++ b/Block/Category/View.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Category;
 
 use Magefan\Blog\Block\Post\PostList\Toolbar;
diff --git a/Block/Index.php b/Block/Index.php
index e0d9f7bd..29087d1e 100644
--- a/Block/Index.php
+++ b/Block/Index.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block;
 
 use Magento\Framework\Api\SortOrder;
diff --git a/Block/Infortis/UltraMegamenu/Topmenu.php b/Block/Infortis/UltraMegamenu/Topmenu.php
index d8079a8b..3ad40493 100644
--- a/Block/Infortis/UltraMegamenu/Topmenu.php
+++ b/Block/Infortis/UltraMegamenu/Topmenu.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Infortis\UltraMegamenu;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Link.php b/Block/Link.php
index 54d5c4d5..5571f21f 100755
--- a/Block/Link.php
+++ b/Block/Link.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block;
 
 /**
diff --git a/Block/Post/AbstractPost.php b/Block/Post/AbstractPost.php
index fa4ba897..ccea9ef8 100755
--- a/Block/Post/AbstractPost.php
+++ b/Block/Post/AbstractPost.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/Info.php b/Block/Post/Info.php
index ecfcacdf..d58e45dd 100755
--- a/Block/Post/Info.php
+++ b/Block/Post/Info.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/PostList.php b/Block/Post/PostList.php
index ee025534..bc9911b7 100755
--- a/Block/Post/PostList.php
+++ b/Block/Post/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/PostList/AbstractList.php b/Block/Post/PostList/AbstractList.php
index 9284bd61..d89c9e22 100755
--- a/Block/Post/PostList/AbstractList.php
+++ b/Block/Post/PostList/AbstractList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\PostList;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/PostList/Item.php b/Block/Post/PostList/Item.php
index d24a4f78..2c75d966 100755
--- a/Block/Post/PostList/Item.php
+++ b/Block/Post/PostList/Item.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\PostList;
 
 /**
diff --git a/Block/Post/PostList/Toolbar.php b/Block/Post/PostList/Toolbar.php
index cf683066..9f954029 100755
--- a/Block/Post/PostList/Toolbar.php
+++ b/Block/Post/PostList/Toolbar.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\PostList;
 
 use Magefan\Blog\Model\Config;
diff --git a/Block/Post/PostList/Toolbar/Pager.php b/Block/Post/PostList/Toolbar/Pager.php
index dda682fa..8386342f 100755
--- a/Block/Post/PostList/Toolbar/Pager.php
+++ b/Block/Post/PostList/Toolbar/Pager.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\PostList\Toolbar;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/View.php b/Block/Post/View.php
index c12334bc..a2a3474b 100755
--- a/Block/Post/View.php
+++ b/Block/Post/View.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Post/View/Comments.php b/Block/Post/View/Comments.php
index 25c51d1e..01e19772 100755
--- a/Block/Post/View/Comments.php
+++ b/Block/Post/View/Comments.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/View/Comments/Disqus.php b/Block/Post/View/Comments/Disqus.php
index 0f0e0558..86cf04ce 100755
--- a/Block/Post/View/Comments/Disqus.php
+++ b/Block/Post/View/Comments/Disqus.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View\Comments;
 
 use Magefan\Blog\Model\Config\Source\CommetType;
diff --git a/Block/Post/View/Comments/Facebook.php b/Block/Post/View/Comments/Facebook.php
index 9e21114c..6529feb8 100755
--- a/Block/Post/View/Comments/Facebook.php
+++ b/Block/Post/View/Comments/Facebook.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View\Comments;
 
 use Magefan\Blog\Model\Config\Source\CommetType;
diff --git a/Block/Post/View/Comments/Google.php b/Block/Post/View/Comments/Google.php
index af896f72..fc79a357 100755
--- a/Block/Post/View/Comments/Google.php
+++ b/Block/Post/View/Comments/Google.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View\Comments;
 
 use Magefan\Blog\Model\Config\Source\CommetType;
diff --git a/Block/Post/View/Comments/HeadFbApi.php b/Block/Post/View/Comments/HeadFbApi.php
index 80f08698..d2d33195 100644
--- a/Block/Post/View/Comments/HeadFbApi.php
+++ b/Block/Post/View/Comments/HeadFbApi.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Post/View/Comments/Magefan.php b/Block/Post/View/Comments/Magefan.php
index 81940ad7..58032a84 100755
--- a/Block/Post/View/Comments/Magefan.php
+++ b/Block/Post/View/Comments/Magefan.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View\Comments;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/View/Comments/Magefan/Comment.php b/Block/Post/View/Comments/Magefan/Comment.php
index 27269066..e8ed50ea 100755
--- a/Block/Post/View/Comments/Magefan/Comment.php
+++ b/Block/Post/View/Comments/Magefan/Comment.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View\Comments\Magefan;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/View/Gallery.php b/Block/Post/View/Gallery.php
index 0ef50047..9d7d1dfa 100755
--- a/Block/Post/View/Gallery.php
+++ b/Block/Post/View/Gallery.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Post/View/NextPrev.php b/Block/Post/View/NextPrev.php
index 1b95805a..c15d9c46 100755
--- a/Block/Post/View/NextPrev.php
+++ b/Block/Post/View/NextPrev.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Post/View/Opengraph.php b/Block/Post/View/Opengraph.php
index b711d538..bda8aba4 100755
--- a/Block/Post/View/Opengraph.php
+++ b/Block/Post/View/Opengraph.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Post/View/RelatedPosts.php b/Block/Post/View/RelatedPosts.php
index 8902242a..5bbd4013 100755
--- a/Block/Post/View/RelatedPosts.php
+++ b/Block/Post/View/RelatedPosts.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
diff --git a/Block/Post/View/RelatedProducts.php b/Block/Post/View/RelatedProducts.php
index 3df074b0..5b2122c5 100755
--- a/Block/Post/View/RelatedProducts.php
+++ b/Block/Post/View/RelatedProducts.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
diff --git a/Block/Post/View/Richsnippets.php b/Block/Post/View/Richsnippets.php
index c182ea30..da6ae382 100755
--- a/Block/Post/View/Richsnippets.php
+++ b/Block/Post/View/Richsnippets.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Post/View/ViewsCount.php b/Block/Post/View/ViewsCount.php
index 752d3bbb..78d64277 100644
--- a/Block/Post/View/ViewsCount.php
+++ b/Block/Post/View/ViewsCount.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Post\View;
 
 use \Magefan\Blog\Block\Post\AbstractPost;
diff --git a/Block/Rss/Feed.php b/Block/Rss/Feed.php
index 644d0b11..e71be035 100755
--- a/Block/Rss/Feed.php
+++ b/Block/Rss/Feed.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Rss;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Search/PostList.php b/Block/Search/PostList.php
index b8afc910..880c4605 100755
--- a/Block/Search/PostList.php
+++ b/Block/Search/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Search;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Sidebar.php b/Block/Sidebar.php
index b2a5f304..3ec558c1 100644
--- a/Block/Sidebar.php
+++ b/Block/Sidebar.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Sidebar/Archive.php b/Block/Sidebar/Archive.php
index 55b45bb5..eb2f4433 100755
--- a/Block/Sidebar/Archive.php
+++ b/Block/Sidebar/Archive.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 /**
diff --git a/Block/Sidebar/Categories.php b/Block/Sidebar/Categories.php
index a0bd7da9..4ea76366 100755
--- a/Block/Sidebar/Categories.php
+++ b/Block/Sidebar/Categories.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Sidebar/Custom.php b/Block/Sidebar/Custom.php
index b4d2ba83..b9cb41db 100755
--- a/Block/Sidebar/Custom.php
+++ b/Block/Sidebar/Custom.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Sidebar/CustomTwo.php b/Block/Sidebar/CustomTwo.php
index 7f7e9b73..cf0d94d5 100755
--- a/Block/Sidebar/CustomTwo.php
+++ b/Block/Sidebar/CustomTwo.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Sidebar/Popular.php b/Block/Sidebar/Popular.php
index 4368043c..ac84cba1 100644
--- a/Block/Sidebar/Popular.php
+++ b/Block/Sidebar/Popular.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 /**
diff --git a/Block/Sidebar/PostRelatedProducts.php b/Block/Sidebar/PostRelatedProducts.php
index 732531ac..63261933 100644
--- a/Block/Sidebar/PostRelatedProducts.php
+++ b/Block/Sidebar/PostRelatedProducts.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 use \Magento\Catalog\Block\Product\AbstractProduct;
diff --git a/Block/Sidebar/Recent.php b/Block/Sidebar/Recent.php
index 5f1ce212..82aaccd9 100755
--- a/Block/Sidebar/Recent.php
+++ b/Block/Sidebar/Recent.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 /**
diff --git a/Block/Sidebar/Rss.php b/Block/Sidebar/Rss.php
index 2e9fa9ec..3f89e3fc 100755
--- a/Block/Sidebar/Rss.php
+++ b/Block/Sidebar/Rss.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 /**
diff --git a/Block/Sidebar/Search.php b/Block/Sidebar/Search.php
index 5db2f015..bf58e066 100755
--- a/Block/Sidebar/Search.php
+++ b/Block/Sidebar/Search.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 /**
diff --git a/Block/Sidebar/TagClaud.php b/Block/Sidebar/TagClaud.php
index 4c40a968..82dbf84c 100755
--- a/Block/Sidebar/TagClaud.php
+++ b/Block/Sidebar/TagClaud.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/Block/Sidebar/Widget.php b/Block/Sidebar/Widget.php
index fea592d6..0c66e877 100755
--- a/Block/Sidebar/Widget.php
+++ b/Block/Sidebar/Widget.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Sidebar;
 
 /**
diff --git a/Block/Smartwave/Megamenu/Topmenu.php b/Block/Smartwave/Megamenu/Topmenu.php
index efb5db4f..1dcf66f0 100644
--- a/Block/Smartwave/Megamenu/Topmenu.php
+++ b/Block/Smartwave/Megamenu/Topmenu.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Smartwave\Megamenu;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Social/AddThis.php b/Block/Social/AddThis.php
index cbc98635..dc73dae4 100644
--- a/Block/Social/AddThis.php
+++ b/Block/Social/AddThis.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Magefan\Blog\Block\Social;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Block/Tag/AbstractTag.php b/Block/Tag/AbstractTag.php
index 98643f63..b96c357a 100644
--- a/Block/Tag/AbstractTag.php
+++ b/Block/Tag/AbstractTag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Tag;
 
 use \Magento\Framework\View\Element\Template;
diff --git a/Block/Tag/Info.php b/Block/Tag/Info.php
index 15357646..5712632c 100644
--- a/Block/Tag/Info.php
+++ b/Block/Tag/Info.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Tag;
 
 /**
diff --git a/Block/Tag/PostList.php b/Block/Tag/PostList.php
index 78e973f9..eeb39fed 100755
--- a/Block/Tag/PostList.php
+++ b/Block/Tag/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Tag;
 
 use Magefan\Blog\Block\Post\PostList\Toolbar;
diff --git a/Block/Widget/Featured.php b/Block/Widget/Featured.php
index 733983e3..9acf1448 100644
--- a/Block/Widget/Featured.php
+++ b/Block/Widget/Featured.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Widget;
 
 /**
diff --git a/Block/Widget/Link.php b/Block/Widget/Link.php
index 5b2d0fa9..89a461f9 100644
--- a/Block/Widget/Link.php
+++ b/Block/Widget/Link.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Block/Widget/PostList.php b/Block/Widget/PostList.php
index ceb49bb5..e87d0f30 100644
--- a/Block/Widget/PostList.php
+++ b/Block/Widget/PostList.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © 2015 Ihor Vansach (ihor@magefan.com). All rights reserved.
  * See LICENSE.txt for license details (http://opensource.org/licenses/osl-3.0.php).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Widget;
 
 /**
diff --git a/Block/Widget/Recent.php b/Block/Widget/Recent.php
index 270e4556..e75624d4 100755
--- a/Block/Widget/Recent.php
+++ b/Block/Widget/Recent.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Block\Widget;
 
 use Magefan\Blog\Block\Post\PostList\AbstractList;
diff --git a/Controller/Adminhtml/Actions.php b/Controller/Adminhtml/Actions.php
index a7d2330e..94d543a9 100755
--- a/Controller/Adminhtml/Actions.php
+++ b/Controller/Adminhtml/Actions.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml;
 
 /**
diff --git a/Controller/Adminhtml/Category.php b/Controller/Adminhtml/Category.php
index 9c36a6a1..92d3a926 100755
--- a/Controller/Adminhtml/Category.php
+++ b/Controller/Adminhtml/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml;
 
 /**
diff --git a/Controller/Adminhtml/Category/Delete.php b/Controller/Adminhtml/Category/Delete.php
index ad9a49d8..362e8abc 100755
--- a/Controller/Adminhtml/Category/Delete.php
+++ b/Controller/Adminhtml/Category/Delete.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/Duplicate.php b/Controller/Adminhtml/Category/Duplicate.php
index 203813b3..1021f134 100755
--- a/Controller/Adminhtml/Category/Duplicate.php
+++ b/Controller/Adminhtml/Category/Duplicate.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/Edit.php b/Controller/Adminhtml/Category/Edit.php
index 590ddda4..8373cdd0 100755
--- a/Controller/Adminhtml/Category/Edit.php
+++ b/Controller/Adminhtml/Category/Edit.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/Grid.php b/Controller/Adminhtml/Category/Grid.php
index 3be37e59..f0bb3a98 100755
--- a/Controller/Adminhtml/Category/Grid.php
+++ b/Controller/Adminhtml/Category/Grid.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/Index.php b/Controller/Adminhtml/Category/Index.php
index 2409f508..7c91590d 100755
--- a/Controller/Adminhtml/Category/Index.php
+++ b/Controller/Adminhtml/Category/Index.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/MassStatus.php b/Controller/Adminhtml/Category/MassStatus.php
index e8cbacfa..25de8563 100755
--- a/Controller/Adminhtml/Category/MassStatus.php
+++ b/Controller/Adminhtml/Category/MassStatus.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/NewAction.php b/Controller/Adminhtml/Category/NewAction.php
index 351332c0..acb4b5e5 100755
--- a/Controller/Adminhtml/Category/NewAction.php
+++ b/Controller/Adminhtml/Category/NewAction.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Category/Save.php b/Controller/Adminhtml/Category/Save.php
index 9caa17fb..14bdbc25 100755
--- a/Controller/Adminhtml/Category/Save.php
+++ b/Controller/Adminhtml/Category/Save.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Category;
 
 /**
diff --git a/Controller/Adminhtml/Comment.php b/Controller/Adminhtml/Comment.php
index c999a28e..6b034dc2 100755
--- a/Controller/Adminhtml/Comment.php
+++ b/Controller/Adminhtml/Comment.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml;
 
 /**
diff --git a/Controller/Adminhtml/Comment/AddReply.php b/Controller/Adminhtml/Comment/AddReply.php
index a5c344af..97377f49 100644
--- a/Controller/Adminhtml/Comment/AddReply.php
+++ b/Controller/Adminhtml/Comment/AddReply.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 use Magefan\Blog\Model\Comment;
diff --git a/Controller/Adminhtml/Comment/Delete.php b/Controller/Adminhtml/Comment/Delete.php
index a091bff9..246dcc1e 100755
--- a/Controller/Adminhtml/Comment/Delete.php
+++ b/Controller/Adminhtml/Comment/Delete.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 /**
diff --git a/Controller/Adminhtml/Comment/Edit.php b/Controller/Adminhtml/Comment/Edit.php
index ffca9360..d5cb6df6 100755
--- a/Controller/Adminhtml/Comment/Edit.php
+++ b/Controller/Adminhtml/Comment/Edit.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 /**
diff --git a/Controller/Adminhtml/Comment/Grid.php b/Controller/Adminhtml/Comment/Grid.php
index 535cd204..0ce56e22 100755
--- a/Controller/Adminhtml/Comment/Grid.php
+++ b/Controller/Adminhtml/Comment/Grid.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 /**
diff --git a/Controller/Adminhtml/Comment/Index.php b/Controller/Adminhtml/Comment/Index.php
index 3ece5b4d..f11c3ccf 100755
--- a/Controller/Adminhtml/Comment/Index.php
+++ b/Controller/Adminhtml/Comment/Index.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 /**
diff --git a/Controller/Adminhtml/Comment/MassStatus.php b/Controller/Adminhtml/Comment/MassStatus.php
index ad34acc8..8e03c708 100755
--- a/Controller/Adminhtml/Comment/MassStatus.php
+++ b/Controller/Adminhtml/Comment/MassStatus.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 /**
diff --git a/Controller/Adminhtml/Comment/NewAction.php b/Controller/Adminhtml/Comment/NewAction.php
index a055aa8a..78af42cf 100755
--- a/Controller/Adminhtml/Comment/NewAction.php
+++ b/Controller/Adminhtml/Comment/NewAction.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 /**
diff --git a/Controller/Adminhtml/Comment/Save.php b/Controller/Adminhtml/Comment/Save.php
index 5e551b30..43ce5838 100755
--- a/Controller/Adminhtml/Comment/Save.php
+++ b/Controller/Adminhtml/Comment/Save.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Comment;
 
 use Magefan\Blog\Model\Comment;
diff --git a/Controller/Adminhtml/Import/Form.php b/Controller/Adminhtml/Import/Form.php
index 5d9e3a9b..368e814b 100755
--- a/Controller/Adminhtml/Import/Form.php
+++ b/Controller/Adminhtml/Import/Form.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Import;
 
 use Magento\Framework\Exception\LocalizedException;
diff --git a/Controller/Adminhtml/Import/Index.php b/Controller/Adminhtml/Import/Index.php
index aff94f96..0ef26bdc 100755
--- a/Controller/Adminhtml/Import/Index.php
+++ b/Controller/Adminhtml/Import/Index.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Import;
 
 /**
diff --git a/Controller/Adminhtml/Import/Run.php b/Controller/Adminhtml/Import/Run.php
index 5632e776..29d4729e 100755
--- a/Controller/Adminhtml/Import/Run.php
+++ b/Controller/Adminhtml/Import/Run.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Import;
 
 /**
diff --git a/Controller/Adminhtml/Post.php b/Controller/Adminhtml/Post.php
index 9e207aee..830e5194 100755
--- a/Controller/Adminhtml/Post.php
+++ b/Controller/Adminhtml/Post.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml;
 
 /**
diff --git a/Controller/Adminhtml/Post/Delete.php b/Controller/Adminhtml/Post/Delete.php
index 8f79723d..e05cc32c 100755
--- a/Controller/Adminhtml/Post/Delete.php
+++ b/Controller/Adminhtml/Post/Delete.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/Duplicate.php b/Controller/Adminhtml/Post/Duplicate.php
index d5a22aa3..b89e7935 100755
--- a/Controller/Adminhtml/Post/Duplicate.php
+++ b/Controller/Adminhtml/Post/Duplicate.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/Edit.php b/Controller/Adminhtml/Post/Edit.php
index 8ac010e3..08c72483 100755
--- a/Controller/Adminhtml/Post/Edit.php
+++ b/Controller/Adminhtml/Post/Edit.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/Grid.php b/Controller/Adminhtml/Post/Grid.php
index e9ee54f5..bbfb3070 100755
--- a/Controller/Adminhtml/Post/Grid.php
+++ b/Controller/Adminhtml/Post/Grid.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/Index.php b/Controller/Adminhtml/Post/Index.php
index 9de187ca..b13a2143 100755
--- a/Controller/Adminhtml/Post/Index.php
+++ b/Controller/Adminhtml/Post/Index.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/MassStatus.php b/Controller/Adminhtml/Post/MassStatus.php
index cbea03c2..6f341baf 100755
--- a/Controller/Adminhtml/Post/MassStatus.php
+++ b/Controller/Adminhtml/Post/MassStatus.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/NewAction.php b/Controller/Adminhtml/Post/NewAction.php
index 1f1f33a6..975c96d0 100755
--- a/Controller/Adminhtml/Post/NewAction.php
+++ b/Controller/Adminhtml/Post/NewAction.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/Preview.php b/Controller/Adminhtml/Post/Preview.php
index 4f778080..5cf8ec35 100755
--- a/Controller/Adminhtml/Post/Preview.php
+++ b/Controller/Adminhtml/Post/Preview.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 /**
diff --git a/Controller/Adminhtml/Post/Save.php b/Controller/Adminhtml/Post/Save.php
index d461b729..78d58df6 100755
--- a/Controller/Adminhtml/Post/Save.php
+++ b/Controller/Adminhtml/Post/Save.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post;
 
 use Magefan\Blog\Model\Post;
diff --git a/Controller/Adminhtml/Post/Upload/FeaturedImg.php b/Controller/Adminhtml/Post/Upload/FeaturedImg.php
index b6a28d76..3e129723 100644
--- a/Controller/Adminhtml/Post/Upload/FeaturedImg.php
+++ b/Controller/Adminhtml/Post/Upload/FeaturedImg.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post\Upload;
 
 use Magefan\Blog\Controller\Adminhtml\Upload\Image\Action;
diff --git a/Controller/Adminhtml/Post/Upload/Gallery.php b/Controller/Adminhtml/Post/Upload/Gallery.php
index c8b95812..3f1ff68d 100644
--- a/Controller/Adminhtml/Post/Upload/Gallery.php
+++ b/Controller/Adminhtml/Post/Upload/Gallery.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post\Upload;
 
 use Magefan\Blog\Controller\Adminhtml\Upload\Image\Action;
diff --git a/Controller/Adminhtml/Post/Upload/OgImg.php b/Controller/Adminhtml/Post/Upload/OgImg.php
index 0c18d2cc..80ac8543 100644
--- a/Controller/Adminhtml/Post/Upload/OgImg.php
+++ b/Controller/Adminhtml/Post/Upload/OgImg.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Post\Upload;
 
 use Magefan\Blog\Controller\Adminhtml\Upload\Image\Action;
diff --git a/Controller/Adminhtml/Tag.php b/Controller/Adminhtml/Tag.php
index 345b19e8..8e859788 100755
--- a/Controller/Adminhtml/Tag.php
+++ b/Controller/Adminhtml/Tag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml;
 
 /**
diff --git a/Controller/Adminhtml/Tag/Autocomplete.php b/Controller/Adminhtml/Tag/Autocomplete.php
index e1994e2f..6544b347 100644
--- a/Controller/Adminhtml/Tag/Autocomplete.php
+++ b/Controller/Adminhtml/Tag/Autocomplete.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 use Magento\Framework\Controller\ResultFactory;
diff --git a/Controller/Adminhtml/Tag/Delete.php b/Controller/Adminhtml/Tag/Delete.php
index a7cef09c..c0f064af 100755
--- a/Controller/Adminhtml/Tag/Delete.php
+++ b/Controller/Adminhtml/Tag/Delete.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Tag/Edit.php b/Controller/Adminhtml/Tag/Edit.php
index 2a4c1c37..e703d477 100755
--- a/Controller/Adminhtml/Tag/Edit.php
+++ b/Controller/Adminhtml/Tag/Edit.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Tag/Grid.php b/Controller/Adminhtml/Tag/Grid.php
index 800e8f9a..7ad86804 100755
--- a/Controller/Adminhtml/Tag/Grid.php
+++ b/Controller/Adminhtml/Tag/Grid.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Tag/Index.php b/Controller/Adminhtml/Tag/Index.php
index 9719fc39..bc1b4c9c 100755
--- a/Controller/Adminhtml/Tag/Index.php
+++ b/Controller/Adminhtml/Tag/Index.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Tag/MassStatus.php b/Controller/Adminhtml/Tag/MassStatus.php
index a974767c..86f91a84 100755
--- a/Controller/Adminhtml/Tag/MassStatus.php
+++ b/Controller/Adminhtml/Tag/MassStatus.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Tag/NewAction.php b/Controller/Adminhtml/Tag/NewAction.php
index e353a581..5b4efff7 100755
--- a/Controller/Adminhtml/Tag/NewAction.php
+++ b/Controller/Adminhtml/Tag/NewAction.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Tag/Save.php b/Controller/Adminhtml/Tag/Save.php
index 004380d8..c6fc7bae 100755
--- a/Controller/Adminhtml/Tag/Save.php
+++ b/Controller/Adminhtml/Tag/Save.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Tag;
 
 /**
diff --git a/Controller/Adminhtml/Upload/Image/Action.php b/Controller/Adminhtml/Upload/Image/Action.php
index c1ea83d9..f753da46 100644
--- a/Controller/Adminhtml/Upload/Image/Action.php
+++ b/Controller/Adminhtml/Upload/Image/Action.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Adminhtml\Upload\Image;
 
 use Magento\Framework\Controller\ResultFactory;
diff --git a/Controller/Archive/View.php b/Controller/Archive/View.php
index 1109a3f2..858821df 100755
--- a/Controller/Archive/View.php
+++ b/Controller/Archive/View.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Author/View.php b/Controller/Author/View.php
index 6fdaf6e8..d8b201b8 100755
--- a/Controller/Author/View.php
+++ b/Controller/Author/View.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Category/View.php b/Controller/Category/View.php
index fae9e4b0..a3f5fdc3 100755
--- a/Controller/Category/View.php
+++ b/Controller/Category/View.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Comment/Post.php b/Controller/Comment/Post.php
index 55050d41..bfee7ce6 100755
--- a/Controller/Comment/Post.php
+++ b/Controller/Comment/Post.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Index/Index.php b/Controller/Index/Index.php
index 826c89b7..e19fab1d 100755
--- a/Controller/Index/Index.php
+++ b/Controller/Index/Index.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Post/View.php b/Controller/Post/View.php
index 51f3172d..017ccaf6 100755
--- a/Controller/Post/View.php
+++ b/Controller/Post/View.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Post/Viewscount.php b/Controller/Post/Viewscount.php
index 06ea9526..b03f7c8d 100644
--- a/Controller/Post/Viewscount.php
+++ b/Controller/Post/Viewscount.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller\Post;
 
 /**
diff --git a/Controller/Router.php b/Controller/Router.php
index b5428928..ba10090a 100755
--- a/Controller/Router.php
+++ b/Controller/Router.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Controller;
 
 use Magefan\Blog\Model\Url;
diff --git a/Controller/Rss/Feed.php b/Controller/Rss/Feed.php
index abee5df4..b3117a6b 100755
--- a/Controller/Rss/Feed.php
+++ b/Controller/Rss/Feed.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Search/Index.php b/Controller/Search/Index.php
index aca195ab..8ec2cc29 100755
--- a/Controller/Search/Index.php
+++ b/Controller/Search/Index.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Controller/Tag/View.php b/Controller/Tag/View.php
index b63136dd..297d804a 100755
--- a/Controller/Tag/View.php
+++ b/Controller/Tag/View.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Cron/ReSaveExistingPosts.php b/Cron/ReSaveExistingPosts.php
index 6c57b60c..12a7f497 100644
--- a/Cron/ReSaveExistingPosts.php
+++ b/Cron/ReSaveExistingPosts.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Cron;
 
 use Magefan\Blog\Model\ResourceModel\Post\CollectionFactory as PostCollectionFactory;
diff --git a/Helper/Config.php b/Helper/Config.php
index 40852889..a8acbbb1 100644
--- a/Helper/Config.php
+++ b/Helper/Config.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Helper;
 
 use Magento\Store\Model\ScopeInterface;
diff --git a/Helper/Data.php b/Helper/Data.php
index 5ac746e8..4160f765 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Helper;
 
 use Magento\Framework\App\Action\Action;
diff --git a/Helper/Image.php b/Helper/Image.php
index d714649d..3c13d10a 100644
--- a/Helper/Image.php
+++ b/Helper/Image.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Helper/Menu.php b/Helper/Menu.php
index 4e8ede36..2f46d6a7 100644
--- a/Helper/Menu.php
+++ b/Helper/Menu.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Helper;
 
 use Magento\Framework\Data\Tree\Node;
diff --git a/Helper/Page.php b/Helper/Page.php
index f27033a0..c6b2c371 100644
--- a/Helper/Page.php
+++ b/Helper/Page.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Helper;
 
 use Magento\Framework\App\Action\Action;
diff --git a/Model/AbstractManagement.php b/Model/AbstractManagement.php
index 1425f122..08370be8 100644
--- a/Model/AbstractManagement.php
+++ b/Model/AbstractManagement.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Api\ManagementInterface;
diff --git a/Model/Author.php b/Model/Author.php
index e40da78a..0385da2a 100755
--- a/Model/Author.php
+++ b/Model/Author.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Api\AuthorInterface;
diff --git a/Model/AuthorRepository.php b/Model/AuthorRepository.php
index 29441738..72dc2be8 100644
--- a/Model/AuthorRepository.php
+++ b/Model/AuthorRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Category.php b/Model/Category.php
index 46228786..3fa6d888 100755
--- a/Model/Category.php
+++ b/Model/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Model\Url;
diff --git a/Model/CategoryManagement.php b/Model/CategoryManagement.php
index 5d0856c9..8b04aa0a 100644
--- a/Model/CategoryManagement.php
+++ b/Model/CategoryManagement.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 /**
diff --git a/Model/CategoryRepository.php b/Model/CategoryRepository.php
index 9e834f63..1f3b5db0 100644
--- a/Model/CategoryRepository.php
+++ b/Model/CategoryRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Comment.php b/Model/Comment.php
index 79c273f3..1fb6d85a 100755
--- a/Model/Comment.php
+++ b/Model/Comment.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magento\Framework\Model\AbstractModel;
diff --git a/Model/Comment/Notification.php b/Model/Comment/Notification.php
index 70a77366..f506150d 100644
--- a/Model/Comment/Notification.php
+++ b/Model/Comment/Notification.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Comment;
 
 /**
diff --git a/Model/CommentRepository.php b/Model/CommentRepository.php
index bc4c91e7..d8bbba16 100644
--- a/Model/CommentRepository.php
+++ b/Model/CommentRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Config.php b/Model/Config.php
index b36cb551..fc6cd6dd 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/Model/Config/Source/Author.php b/Model/Config/Source/Author.php
index cb826427..a6371a91 100755
--- a/Model/Config/Source/Author.php
+++ b/Model/Config/Source/Author.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/AuthorType.php b/Model/Config/Source/AuthorType.php
index 832b887a..1cb7e6c1 100755
--- a/Model/Config/Source/AuthorType.php
+++ b/Model/Config/Source/AuthorType.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/BlogPages.php b/Model/Config/Source/BlogPages.php
index f7e0dff6..ccd10e31 100644
--- a/Model/Config/Source/BlogPages.php
+++ b/Model/Config/Source/BlogPages.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Config/Source/Category.php b/Model/Config/Source/Category.php
index 140209d4..2db7bfae 100755
--- a/Model/Config/Source/Category.php
+++ b/Model/Config/Source/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/CategoryDisplayMode.php b/Model/Config/Source/CategoryDisplayMode.php
index d51b86ac..33f09bc2 100644
--- a/Model/Config/Source/CategoryDisplayMode.php
+++ b/Model/Config/Source/CategoryDisplayMode.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © 2015-17 Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/CategoryPath.php b/Model/Config/Source/CategoryPath.php
index 91a9854f..780fcfe1 100755
--- a/Model/Config/Source/CategoryPath.php
+++ b/Model/Config/Source/CategoryPath.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/CategoryTree.php b/Model/Config/Source/CategoryTree.php
index b0da1164..69973e28 100755
--- a/Model/Config/Source/CategoryTree.php
+++ b/Model/Config/Source/CategoryTree.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/CommentStatus.php b/Model/Config/Source/CommentStatus.php
index bfa53c85..74a86e76 100644
--- a/Model/Config/Source/CommentStatus.php
+++ b/Model/Config/Source/CommentStatus.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/CommetType.php b/Model/Config/Source/CommetType.php
index 900395ab..69f0d994 100755
--- a/Model/Config/Source/CommetType.php
+++ b/Model/Config/Source/CommetType.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/DisplayMode.php b/Model/Config/Source/DisplayMode.php
index 6c28a4a1..b1ebc0cc 100644
--- a/Model/Config/Source/DisplayMode.php
+++ b/Model/Config/Source/DisplayMode.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © 2015-17 Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/LazyLoad.php b/Model/Config/Source/LazyLoad.php
index 4aec2538..7ffffa82 100755
--- a/Model/Config/Source/LazyLoad.php
+++ b/Model/Config/Source/LazyLoad.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/PageLayout.php b/Model/Config/Source/PageLayout.php
index ee170122..e53224a7 100755
--- a/Model/Config/Source/PageLayout.php
+++ b/Model/Config/Source/PageLayout.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 use Magento\Framework\Data\OptionSourceInterface;
diff --git a/Model/Config/Source/PagePaginationType.php b/Model/Config/Source/PagePaginationType.php
index 3eb9c9ee..513278bd 100644
--- a/Model/Config/Source/PagePaginationType.php
+++ b/Model/Config/Source/PagePaginationType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 use Magento\Framework\Data\OptionSourceInterface;
diff --git a/Model/Config/Source/PermalinkType.php b/Model/Config/Source/PermalinkType.php
index 171d2336..ea1d8b08 100755
--- a/Model/Config/Source/PermalinkType.php
+++ b/Model/Config/Source/PermalinkType.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 use Magefan\Blog\Model\Url;
diff --git a/Model/Config/Source/PostsSortBy.php b/Model/Config/Source/PostsSortBy.php
index 24ebd9dd..989553d4 100644
--- a/Model/Config/Source/PostsSortBy.php
+++ b/Model/Config/Source/PostsSortBy.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/ReadingProgressBarPosition.php b/Model/Config/Source/ReadingProgressBarPosition.php
index 3605cb9b..d3d99b51 100644
--- a/Model/Config/Source/ReadingProgressBarPosition.php
+++ b/Model/Config/Source/ReadingProgressBarPosition.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/Tag.php b/Model/Config/Source/Tag.php
index 742c876a..43d67505 100755
--- a/Model/Config/Source/Tag.php
+++ b/Model/Config/Source/Tag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Config/Source/TagRobots.php b/Model/Config/Source/TagRobots.php
index d3ca6d75..eefecf66 100644
--- a/Model/Config/Source/TagRobots.php
+++ b/Model/Config/Source/TagRobots.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 use Magento\Config\Model\Config\Source\Design\Robots;
diff --git a/Model/Config/Source/WidgetTag.php b/Model/Config/Source/WidgetTag.php
index 0b93f580..3cac311b 100755
--- a/Model/Config/Source/WidgetTag.php
+++ b/Model/Config/Source/WidgetTag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Config\Source;
 
 /**
diff --git a/Model/Image.php b/Model/Image.php
index 1bc75306..9278a44a 100755
--- a/Model/Image.php
+++ b/Model/Image.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Model\Url;
diff --git a/Model/ImageUploader.php b/Model/ImageUploader.php
index bffced38..90ddf1a5 100755
--- a/Model/ImageUploader.php
+++ b/Model/ImageUploader.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/Model/Import/AbstractImport.php b/Model/Import/AbstractImport.php
index 1af6e1c9..a9481fe4 100644
--- a/Model/Import/AbstractImport.php
+++ b/Model/Import/AbstractImport.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 /**
diff --git a/Model/Import/Aw.php b/Model/Import/Aw.php
index 08cec5a6..80738f1a 100644
--- a/Model/Import/Aw.php
+++ b/Model/Import/Aw.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
diff --git a/Model/Import/Aw2.php b/Model/Import/Aw2.php
index 81fe443a..8278260f 100644
--- a/Model/Import/Aw2.php
+++ b/Model/Import/Aw2.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
diff --git a/Model/Import/Mageplaza.php b/Model/Import/Mageplaza.php
index e621c94f..9d71f1f9 100644
--- a/Model/Import/Mageplaza.php
+++ b/Model/Import/Mageplaza.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
diff --git a/Model/Import/Mageplaza1.php b/Model/Import/Mageplaza1.php
index e8062e3a..67240b08 100644
--- a/Model/Import/Mageplaza1.php
+++ b/Model/Import/Mageplaza1.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
diff --git a/Model/Import/Mirasvit.php b/Model/Import/Mirasvit.php
index 98814921..c6f7f3e9 100644
--- a/Model/Import/Mirasvit.php
+++ b/Model/Import/Mirasvit.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
diff --git a/Model/Import/Wordpress.php b/Model/Import/Wordpress.php
index 3d6fc9e0..c7a7d436 100644
--- a/Model/Import/Wordpress.php
+++ b/Model/Import/Wordpress.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Import;
 
 /**
diff --git a/Model/NoSlashUrlRedirect.php b/Model/NoSlashUrlRedirect.php
index 0cea8588..a66ebce0 100644
--- a/Model/NoSlashUrlRedirect.php
+++ b/Model/NoSlashUrlRedirect.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Post.php b/Model/Post.php
index e3098430..73cb088e 100755
--- a/Model/Post.php
+++ b/Model/Post.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Model\Url;
diff --git a/Model/PostManagement.php b/Model/PostManagement.php
index aaa14c55..1d24ec33 100644
--- a/Model/PostManagement.php
+++ b/Model/PostManagement.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 /**
diff --git a/Model/PostRepository.php b/Model/PostRepository.php
index 7a2e5091..cef99553 100644
--- a/Model/PostRepository.php
+++ b/Model/PostRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/PreviewUrl.php b/Model/PreviewUrl.php
index 2402d749..cdba1ed1 100644
--- a/Model/PreviewUrl.php
+++ b/Model/PreviewUrl.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 /**
diff --git a/Model/ResourceModel/Author.php b/Model/ResourceModel/Author.php
index 75c6097b..2648cf78 100755
--- a/Model/ResourceModel/Author.php
+++ b/Model/ResourceModel/Author.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
diff --git a/Model/ResourceModel/Author/Collection.php b/Model/ResourceModel/Author/Collection.php
index c3824d5b..19817c6b 100755
--- a/Model/ResourceModel/Author/Collection.php
+++ b/Model/ResourceModel/Author/Collection.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel\Author;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
diff --git a/Model/ResourceModel/Category.php b/Model/ResourceModel/Category.php
index 86ea44a8..a3ab5541 100755
--- a/Model/ResourceModel/Category.php
+++ b/Model/ResourceModel/Category.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel;
 
 /**
diff --git a/Model/ResourceModel/Category/Collection.php b/Model/ResourceModel/Category/Collection.php
index e59c3ae9..f262b399 100755
--- a/Model/ResourceModel/Category/Collection.php
+++ b/Model/ResourceModel/Category/Collection.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel\Category;
 
 /**
diff --git a/Model/ResourceModel/Comment.php b/Model/ResourceModel/Comment.php
index 2a6d5206..0656530f 100755
--- a/Model/ResourceModel/Comment.php
+++ b/Model/ResourceModel/Comment.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel;
 
 /**
diff --git a/Model/ResourceModel/Comment/Collection.php b/Model/ResourceModel/Comment/Collection.php
index 9983b732..2770c399 100755
--- a/Model/ResourceModel/Comment/Collection.php
+++ b/Model/ResourceModel/Comment/Collection.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel\Comment;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
diff --git a/Model/ResourceModel/Comment/Collection/Grid.php b/Model/ResourceModel/Comment/Collection/Grid.php
index f3357ffa..a948f8e9 100755
--- a/Model/ResourceModel/Comment/Collection/Grid.php
+++ b/Model/ResourceModel/Comment/Collection/Grid.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel\Comment\Collection;
 
 use Magefan\Blog\Model\ResourceModel\Comment\Collection;
diff --git a/Model/ResourceModel/PageIdentifierGenerator.php b/Model/ResourceModel/PageIdentifierGenerator.php
index e02fdb9c..cbf9e4a6 100644
--- a/Model/ResourceModel/PageIdentifierGenerator.php
+++ b/Model/ResourceModel/PageIdentifierGenerator.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel;
 
 class PageIdentifierGenerator
diff --git a/Model/ResourceModel/Post.php b/Model/ResourceModel/Post.php
index c600a7c8..cf48cc79 100755
--- a/Model/ResourceModel/Post.php
+++ b/Model/ResourceModel/Post.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel;
 
 /**
diff --git a/Model/ResourceModel/Post/Collection.php b/Model/ResourceModel/Post/Collection.php
index b99172f0..10a6e4b0 100755
--- a/Model/ResourceModel/Post/Collection.php
+++ b/Model/ResourceModel/Post/Collection.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel\Post;
 
 /**
diff --git a/Model/ResourceModel/Tag.php b/Model/ResourceModel/Tag.php
index 6bab9e60..c447a5ad 100755
--- a/Model/ResourceModel/Tag.php
+++ b/Model/ResourceModel/Tag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel;
 
 /**
diff --git a/Model/ResourceModel/Tag/Collection.php b/Model/ResourceModel/Tag/Collection.php
index 0f441eae..a7b0c62b 100755
--- a/Model/ResourceModel/Tag/Collection.php
+++ b/Model/ResourceModel/Tag/Collection.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\ResourceModel\Tag;
 
 /**
diff --git a/Model/ShortContentExtractor.php b/Model/ShortContentExtractor.php
index d5afc2fd..be4bfc26 100644
--- a/Model/ShortContentExtractor.php
+++ b/Model/ShortContentExtractor.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Api\ShortContentExtractorInterface;
diff --git a/Model/Sitemap/ItemProvider/Category.php b/Model/Sitemap/ItemProvider/Category.php
index 8d668910..46157a59 100644
--- a/Model/Sitemap/ItemProvider/Category.php
+++ b/Model/Sitemap/ItemProvider/Category.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Model\Sitemap\ItemProvider;
 
 use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
diff --git a/Model/Sitemap/ItemProvider/Index.php b/Model/Sitemap/ItemProvider/Index.php
index e2e1a1b8..431c73f9 100644
--- a/Model/Sitemap/ItemProvider/Index.php
+++ b/Model/Sitemap/ItemProvider/Index.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Model\Sitemap\ItemProvider;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/Model/Sitemap/ItemProvider/Post.php b/Model/Sitemap/ItemProvider/Post.php
index 7b06c32d..7a57306a 100644
--- a/Model/Sitemap/ItemProvider/Post.php
+++ b/Model/Sitemap/ItemProvider/Post.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
-
 namespace Magefan\Blog\Model\Sitemap\ItemProvider;
 
 use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
diff --git a/Model/SlashUrlRedirect.php b/Model/SlashUrlRedirect.php
index 3c3a26b8..145fee03 100644
--- a/Model/SlashUrlRedirect.php
+++ b/Model/SlashUrlRedirect.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Tag.php b/Model/Tag.php
index 52d117d2..a2df625f 100755
--- a/Model/Tag.php
+++ b/Model/Tag.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Model\Url;
diff --git a/Model/Tag/AutocompleteData.php b/Model/Tag/AutocompleteData.php
index e48aa13e..ce48def5 100644
--- a/Model/Tag/AutocompleteData.php
+++ b/Model/Tag/AutocompleteData.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model\Tag;
 
 use Magefan\Blog\Model\ResourceModel\Tag\CollectionFactory;
diff --git a/Model/TagRepository.php b/Model/TagRepository.php
index 41407de2..42174b53 100644
--- a/Model/TagRepository.php
+++ b/Model/TagRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Model/Url.php b/Model/Url.php
index a16d369c..53f17db1 100644
--- a/Model/Url.php
+++ b/Model/Url.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Model;
 
 /**
diff --git a/Model/UrlResolver.php b/Model/UrlResolver.php
index 52c28618..c499d6d9 100644
--- a/Model/UrlResolver.php
+++ b/Model/UrlResolver.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Observer/InvalidateCache.php b/Observer/InvalidateCache.php
index c7aa20ad..58dd9634 100755
--- a/Observer/InvalidateCache.php
+++ b/Observer/InvalidateCache.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
diff --git a/Observer/LayoutGenerateBlocksAfter.php b/Observer/LayoutGenerateBlocksAfter.php
index 1fb6f721..7f93a8dd 100644
--- a/Observer/LayoutGenerateBlocksAfter.php
+++ b/Observer/LayoutGenerateBlocksAfter.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
diff --git a/Observer/LayoutLoadBeforeObserver.php b/Observer/LayoutLoadBeforeObserver.php
index 55abfa82..5f55e746 100644
--- a/Observer/LayoutLoadBeforeObserver.php
+++ b/Observer/LayoutLoadBeforeObserver.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
diff --git a/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php b/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php
index ce3aa371..8293cffe 100644
--- a/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php
+++ b/Observer/PageBlockHtmlTopmenuBethtmlBeforeObserver.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
diff --git a/Observer/PredispathFrontendBlogActionControllerObserver.php b/Observer/PredispathFrontendBlogActionControllerObserver.php
index 0cbeb163..28ccb211 100644
--- a/Observer/PredispathFrontendBlogActionControllerObserver.php
+++ b/Observer/PredispathFrontendBlogActionControllerObserver.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Plugin/Magento/AdminGws/Model/ModelsPlugin.php b/Plugin/Magento/AdminGws/Model/ModelsPlugin.php
index 3ffe401f..f6157f0a 100644
--- a/Plugin/Magento/AdminGws/Model/ModelsPlugin.php
+++ b/Plugin/Magento/AdminGws/Model/ModelsPlugin.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Plugin\Magento\AdminGws\Model;
 
 class ModelsPlugin
diff --git a/Plugin/Magento/Framework/App/Config/ScopeConfigInterfacePlugin.php b/Plugin/Magento/Framework/App/Config/ScopeConfigInterfacePlugin.php
index 6c2534e6..f6af9b05 100644
--- a/Plugin/Magento/Framework/App/Config/ScopeConfigInterfacePlugin.php
+++ b/Plugin/Magento/Framework/App/Config/ScopeConfigInterfacePlugin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Magefan\Blog\Plugin\Magento\Framework\App\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/Plugin/Magento/Framework/View/Element/TemplatePlugin.php b/Plugin/Magento/Framework/View/Element/TemplatePlugin.php
index df478370..8e4fd926 100644
--- a/Plugin/Magento/Framework/View/Element/TemplatePlugin.php
+++ b/Plugin/Magento/Framework/View/Element/TemplatePlugin.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Plugin\Magento\Framework\View\Element;
 
 use Magento\Framework\Module\Manager;
diff --git a/Ui/DataProvider/Category/Form/CategoryDataProvider.php b/Ui/DataProvider/Category/Form/CategoryDataProvider.php
index 4e54fc90..8bc744e1 100644
--- a/Ui/DataProvider/Category/Form/CategoryDataProvider.php
+++ b/Ui/DataProvider/Category/Form/CategoryDataProvider.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Ui/DataProvider/Comment/Form/CommentDataProvider.php b/Ui/DataProvider/Comment/Form/CommentDataProvider.php
index 120d12bd..0bb12634 100755
--- a/Ui/DataProvider/Comment/Form/CommentDataProvider.php
+++ b/Ui/DataProvider/Comment/Form/CommentDataProvider.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Ui/DataProvider/Post/Form/PostDataProvider.php b/Ui/DataProvider/Post/Form/PostDataProvider.php
index 954baf6e..9af38998 100644
--- a/Ui/DataProvider/Post/Form/PostDataProvider.php
+++ b/Ui/DataProvider/Post/Form/PostDataProvider.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/Ui/DataProvider/Post/Related/PostDataProvider.php b/Ui/DataProvider/Post/Related/PostDataProvider.php
index 741863a4..00194a11 100644
--- a/Ui/DataProvider/Post/Related/PostDataProvider.php
+++ b/Ui/DataProvider/Post/Related/PostDataProvider.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Ui\DataProvider\Post\Related;
 
 use Magento\Ui\DataProvider\AbstractDataProvider;
diff --git a/Ui/DataProvider/Post/Related/ProductDataProvider.php b/Ui/DataProvider/Post/Related/ProductDataProvider.php
index a9375c81..edd495f0 100644
--- a/Ui/DataProvider/Post/Related/ProductDataProvider.php
+++ b/Ui/DataProvider/Post/Related/ProductDataProvider.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\Ui\DataProvider\Post\Related;
 
 use Magento\Catalog\Api\Data\ProductInterface;
diff --git a/Ui/DataProvider/Tag/Form/TagDataProvider.php b/Ui/DataProvider/Tag/Form/TagDataProvider.php
index 433fafa5..a3b6b4d8 100644
--- a/Ui/DataProvider/Tag/Form/TagDataProvider.php
+++ b/Ui/DataProvider/Tag/Form/TagDataProvider.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
diff --git a/ViewModel/Style.php b/ViewModel/Style.php
index 8c3f108e..10c09a88 100755
--- a/ViewModel/Style.php
+++ b/ViewModel/Style.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 namespace Magefan\Blog\ViewModel;
 
 use Magento\Framework\View\Asset\Source;
diff --git a/registration.php b/registration.php
index e9707fc2..38eaffae 100755
--- a/registration.php
+++ b/registration.php
@@ -1,11 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
-
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
     'Magefan_Blog',

From a7937dfd38618d6c55a79c43e83abdf4a21f9e0b Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Tue, 17 Jun 2025 16:21:32 +0300
Subject: [PATCH 4/5] fix

---
 Block/Archive/Archive.php            | 6 +++---
 Block/Post/View/Comments/Magefan.php | 4 ++--
 Helper/Data.php                      | 2 +-
 Helper/Image.php                     | 5 +++--
 Model/Image.php                      | 6 +++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Block/Archive/Archive.php b/Block/Archive/Archive.php
index ff98c7c0..e410deb8 100644
--- a/Block/Archive/Archive.php
+++ b/Block/Archive/Archive.php
@@ -14,11 +14,11 @@ trait Archive
 {
     /**
      * Get archive month
-     * @return int
+     * @return string
      */
-    public function getMonth(): int
+    public function getMonth(): string
     {
-        return (int)$this->_coreRegistry->registry('current_blog_archive_month');
+        return (string)$this->_coreRegistry->registry('current_blog_archive_month');
     }
 
     /**
diff --git a/Block/Post/View/Comments/Magefan.php b/Block/Post/View/Comments/Magefan.php
index 58032a84..77a29be5 100755
--- a/Block/Post/View/Comments/Magefan.php
+++ b/Block/Post/View/Comments/Magefan.php
@@ -164,11 +164,11 @@ public function canPost(): bool
     /**
      * Retrieve number of comments to display
      *
-     * @return string
+     * @return int
      */
     public function getNumberOfComments(): int
     {
-        return $this->_scopeConfig->getValue(
+        return (int)$this->_scopeConfig->getValue(
             \Magefan\Blog\Model\Config::NUMBER_OF_COMMENTS,
             ScopeInterface::SCOPE_STORE
         );
diff --git a/Helper/Data.php b/Helper/Data.php
index 4160f765..67f92f60 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -39,7 +39,7 @@ public static function getTranslatedDate($format, $dateOrTime): string|array
         $date = date($format, $time);
 
         foreach ($month as $to => $from) {
-            $date = str_replace($from, __(date($to, $time)), $date);
+            $date = str_replace($from, (string)__(date($to, $time)), $date);
         }
 
         return $date;
diff --git a/Helper/Image.php b/Helper/Image.php
index 3c13d10a..53f0b59b 100644
--- a/Helper/Image.php
+++ b/Helper/Image.php
@@ -99,8 +99,9 @@ public function init($baseFile): static
     }
 
     /**
-     * @param $width
-     * @param null $height
+     * @param string $width
+     * @param $height
+     * @param $keepFrame
      * @return $this
      */
     public function resize(string $width, $height = null, $keepFrame = null): static
diff --git a/Model/Image.php b/Model/Image.php
index 9278a44a..6822a5f5 100755
--- a/Model/Image.php
+++ b/Model/Image.php
@@ -67,11 +67,11 @@ public function getUrl()
 
     /**
      * Resize image
-     * @param int $width
-     * @param int $height
+     * @param string $width
+     * @param string|null $height
      * @return string
      */
-    public function resize($width, $height = null)
+    public function resize(string $width, ?string $height = null)
     {
         return $this->imageHelper->init($this->getFile())
             ->resize($width, $height);

From 29231517ff8f3055efff349262509f6ccc43bd2a Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Wed, 18 Jun 2025 15:38:10 +0300
Subject: [PATCH 5/5] 13372-Auto-Code-Improvements

---
 Controller/Adminhtml/Import/Form.php |  2 +-
 Controller/Adminhtml/Import/Run.php  | 12 ++++++------
 registration.php                     |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Controller/Adminhtml/Import/Form.php b/Controller/Adminhtml/Import/Form.php
index 368e814b..89279a66 100755
--- a/Controller/Adminhtml/Import/Form.php
+++ b/Controller/Adminhtml/Import/Form.php
@@ -26,7 +26,7 @@ class Form extends \Magento\Backend\App\Action
      * Prepare wordpress import
      * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute(): void
+    public function execute()
     {
         try {
             if (!$this->getConfig()->isEnabled()) {
diff --git a/Controller/Adminhtml/Import/Run.php b/Controller/Adminhtml/Import/Run.php
index 29d4729e..a57517ba 100755
--- a/Controller/Adminhtml/Import/Run.php
+++ b/Controller/Adminhtml/Import/Run.php
@@ -19,7 +19,7 @@ class Run extends \Magento\Backend\App\Action
      * Run import
      * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute(): void
+    public function execute()
     {
         //set_time_limit(0);
 
@@ -28,7 +28,7 @@ public function execute(): void
 
         try {
             if (empty($type)) {
-                throw new \Exception(__('Blog import type is not specified.'), 1);
+                throw new \Exception((string)__('Blog import type is not specified.'), 1);
             }
 
             if (!isset($data['store_id'])) {
@@ -44,10 +44,10 @@ public function execute(): void
             $import->prepareData($data)->execute();
 
             $stats = $import->getImportStatistic();
-
+var_dump($stats->getData('skipped_count'));
             if ($stats->getData('imported_count')) {
                 if (!$stats->getData('skipped_count')) {
-                    $this->messageManager->addSuccess(__(
+                    $this->messageManager->addSuccess((string)__(
                         'The import process was completed successfully.
                         %1 posts, %2 categories, %3 tags, %4 authors and %5 comments where imported.',
                         $stats->getData('imported_posts_count'),
@@ -57,7 +57,7 @@ public function execute(): void
                         $stats->getData('imported_comments_count')
                     ));
                 } else {
-                    $this->messageManager->addNotice(__(
+                    $this->messageManager->addNotice((string)__(
                         'The import process completed. %1 posts, %2 categories, %3 tags, %4 authors and %5 comments where imported.
                         Some posts or categories or tags or authors or comments where skipped. %6 %7 %8 %9 %10',
                         $stats->getData('imported_posts_count'),
@@ -81,7 +81,7 @@ public function execute(): void
                 if (!$stats->getData('skipped_count')) {
                     $this->messageManager->addNotice(__('Nothing to import.'));
                 } else {
-                    throw new \Exception(__('Can not make import.'), 1);
+                    throw new \Exception((string)__('Can not make import.'), 1);
                 }
             }
 
diff --git a/registration.php b/registration.php
index 38eaffae..e9707fc2 100755
--- a/registration.php
+++ b/registration.php
@@ -1,13 +1,11 @@
 <?php
-
-declare(strict_types=1);
-
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  *
  * Glory to Ukraine! Glory to the heroes!
  */
+
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
     'Magefan_Blog',