5152-Code-Quality-Check

magefan · May 28, 2021 · 9745b7e · 9745b7e
1 parent 87d9999
commit 9745b7e
Show file tree

Hide file tree

Showing 33 changed files with 88 additions and 89 deletions.
diff --git a/Block/Adminhtml/Import/Form/Form.php b/Block/Adminhtml/Import/Form/Form.php
@@ -82,9 +82,9 @@ protected function _prepareForm()
             [
                 'label' => __('NOTICE'),
                 'name' => 'prefix',
-                'after_element_html' => 'When the import is completed successfully, 
-                                        please copy image files from the old blog to Magento 
-                                        <strong style="color:#105610;">pub/media/magefan_blog</strong> 
+                'after_element_html' => 'When the import is completed successfully,
+                                        please copy image files from the old blog to Magento
+                                        <strong style="color:#105610;">pub/media/magefan_blog</strong>
                                         directory.',
             ]
         );
@@ -188,7 +188,7 @@ protected function _prepareForm()
 
         $this->_eventManager->dispatch('magefan_blog_import_' . $type . '_prepare_form', ['form' => $form]);
 
-	/*
+        /*
         if (empty($data['prefix'])) {
             $data['prefix'] = 'wp_';
         }

diff --git a/Block/Adminhtml/Post/Tag/Autocomplete.php b/Block/Adminhtml/Post/Tag/Autocomplete.php
@@ -28,7 +28,7 @@ class Autocomplete extends Template
      * @param array $data
      * @param Registry $registry
      */
-    public function __construct(Context $context, array $data = [], Registry $registry)
+    public function __construct(Context $context, Registry $registry, array $data = [])
     {
         parent::__construct($context, $data);
         $this->registry = $registry;

diff --git a/Block/Index.php b/Block/Index.php
@@ -68,7 +68,6 @@ public function getToolbarBlock()
         return $toolBarBlock;
     }
 
-
     /**
      * Prepare posts collection
      *
@@ -218,7 +217,7 @@ protected function _toHtml()
 
     /**
      * Retrieve identities
-     *git add
+     * git add
      * @return array
      */
     public function getIdentities()

diff --git a/Block/Post/AbstractPost.php b/Block/Post/AbstractPost.php
@@ -200,9 +200,9 @@ public function authorPageEnabled()
     public function magefanCommentsEnabled()
     {
         return $this->_scopeConfig->getValue(
-                'mfblog/post_view/comments/type',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            ) == \Magefan\Blog\Model\Config\Source\CommetType::MAGEFAN;
+            'mfblog/post_view/comments/type',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        ) == \Magefan\Blog\Model\Config\Source\CommetType::MAGEFAN;
     }
 
     /**
@@ -225,7 +225,7 @@ public function getStyleViewModel()
         if (!$viewModel) {
             $viewModel = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magefan\Blog\ViewModel\Style::class);
-            $this->setData('style_view_model', $viewModel );
+            $this->setData('style_view_model', $viewModel);
         }
 
         return $viewModel;

diff --git a/Block/Post/PostList.php b/Block/Post/PostList.php
@@ -80,7 +80,6 @@ protected function getPostTemplateType()
         );
     }
 
-
     /**
      * Retrieve Toolbar Block
      * @return \Magefan\Blog\Block\Post\PostList\Toolbar

diff --git a/Block/Post/PostList/AbstractList.php b/Block/Post/PostList/AbstractList.php
@@ -195,7 +195,7 @@ public function getCacheKeyInfo()
         );
     }
 
-   /**
+    /**
      * Retrieve 1 if display author information is enabled
      * @return int
      */
@@ -226,9 +226,9 @@ public function authorPageEnabled()
     public function magefanCommentsEnabled()
     {
         return $this->_scopeConfig->getValue(
-                'mfblog/post_view/comments/type',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            ) == \Magefan\Blog\Model\Config\Source\CommetType::MAGEFAN;
+            'mfblog/post_view/comments/type',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        ) == \Magefan\Blog\Model\Config\Source\CommetType::MAGEFAN;
     }
 
     /**
@@ -251,7 +251,7 @@ public function getStyleViewModel()
         if (!$viewModel) {
             $viewModel = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magefan\Blog\ViewModel\Style::class);
-            $this->setData('style_view_model', $viewModel );
+            $this->setData('style_view_model', $viewModel);
         }
 
         return $viewModel;

diff --git a/Block/Post/View/Comments/HeadFbApi.php b/Block/Post/View/Comments/HeadFbApi.php
@@ -8,7 +8,7 @@
 namespace Magefan\Blog\Block\Post\View\Comments;
 
 /**
- * Class HeadFbApi
+ * Class HeadFbApi class
  */
 class HeadFbApi extends \Magento\Framework\View\Element\AbstractBlock
 {

diff --git a/Block/Post/View/NextPrev.php b/Block/Post/View/NextPrev.php
@@ -180,7 +180,6 @@ public function getNextPost()
         return $this->_nextPost;
     }
 
-
     /**
      * Retrieve post collection with frontend filters and order
      * @return bool

diff --git a/Block/Rss/Feed.php b/Block/Rss/Feed.php
@@ -74,7 +74,6 @@ public function getPostContent($post)
 
         return $content;
     }
-
 
     /**
      * Prepare posts collection

diff --git a/Block/Widget/Recent.php b/Block/Widget/Recent.php
@@ -16,7 +16,7 @@ class Recent extends \Magefan\Blog\Block\Post\PostList\AbstractList implements \
     /**
      * @var array
      */
-    static $processedIds = [];
+    public static $processedIds = [];
 
     /**
      * @var \Magefan\Blog\Model\CategoryFactory
@@ -128,10 +128,9 @@ protected function _preparePostCollection()
         }
 
         $enableNoRepeat = $this->getData('no_repeat_posts_enable');
-        if ($enableNoRepeat && self::$processedIds){
+        if ($enableNoRepeat && self::$processedIds) {
             $this->_postCollection->addFieldToFilter('post_id', ['nin' => self::$processedIds]);
         }
-
     }
 
     /**

diff --git a/Controller/Adminhtml/Import/Form.php b/Controller/Adminhtml/Import/Form.php
@@ -9,6 +9,7 @@
 namespace Magefan\Blog\Controller\Adminhtml\Import;
 
 use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Blog prepare import controller
  */
@@ -70,7 +71,6 @@ protected function _isAllowed()
         return $this->_authorization->isAllowed('Magefan_Blog::import');
     }
 
-
     /**
      * Retrieve store config value
      *

diff --git a/Helper/Image.php b/Helper/Image.php
@@ -172,9 +172,8 @@ public function __toString()
     {
         $url = "";
         if ($this->_baseFile) {
-            $url = $this->_storeManager->getStore()->getBaseUrl(
-                    \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-                ) . $this->_newFile;
+            $url = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) .
+                $this->_newFile;
         }
         return $url;
     }

diff --git a/Model/CategoryManagement.php b/Model/CategoryManagement.php
@@ -90,11 +90,7 @@ protected function getDynamicData($item)
         ];
 
         foreach ($keys as $key) {
-            $method = 'get' . str_replace(
-                    '_',
-                    '',
-                    ucwords($key, '_')
-                );
+            $method = 'get' . str_replace('_', '', ucwords($key, '_'));
             $data[$key] = $item->$method();
         }
 

diff --git a/Model/Config/Source/Template.php b/Model/Config/Source/Template.php
@@ -60,4 +60,4 @@ public function toOptionArray():array
         }
         return $this->options[$this->templateType];
     }
-}
+}
diff --git a/Model/Import/Wordpress.php b/Model/Import/Wordpress.php
@@ -325,13 +325,13 @@ public function execute()
                 $post->setData($data)->save();
 
                 /* find post comment s*/
-                $sql = 'SELECT 
-                            * 
-                        FROM 
-                            '.$_pref.'comments 
-                        WHERE 
-                            `comment_approved`=1 
-                        AND 
+                $sql = 'SELECT
+                            *
+                        FROM
+                            '.$_pref.'comments
+                        WHERE
+                            `comment_approved`=1
+                        AND
                             `comment_post_ID` = ' . $wordpressPostId;
                 $resultComments = $adapter->query($sql)->execute();
                 $commentParents = [];
@@ -579,7 +579,6 @@ protected function wordpressOutoutWrap($pee, $br = true)
                 }
             }
 
-
             $divElement = str_replace('[video', '<video controls ', $divElement);
             $divElement = str_replace('align="', 'class="wp-caption ', $divElement);
             $divElement = str_replace(']', '>', $divElement);

diff --git a/Model/Post.php b/Model/Post.php
@@ -546,7 +546,6 @@ public function getShortFilteredContent($len = null, $endСharacters = null)
                         foreach (explode(' ', $stcc) as $s) {
                             $str .= ($str ? ' ' : '') . $s;
 
-
                             $pos = mb_strpos($content, $str);
                             if (false !== $pos) {
                                 $start = $pos;
@@ -565,7 +564,7 @@ public function getShortFilteredContent($len = null, $endСharacters = null)
 
                 /* Do not cut words */
                 while ($len < strlen($content)
-                    && !in_array($content[$len], [' ', '<', "\t", "\r", "\n"]) ) {
+                    && !in_array($content[$len], [' ', '<', "\t", "\r", "\n"])) {
                     $len++;
                 }
 
@@ -950,7 +949,6 @@ public function isPublishDateEnabled()
             'mfblog/design/publication_date',
             ScopeInterface::SCOPE_STORE
         );
-        return true;
     }
 
     /**

diff --git a/Model/PostManagement.php b/Model/PostManagement.php
@@ -126,11 +126,7 @@ protected function getDynamicData($item)
         ];
 
         foreach ($keys as $key) {
-            $method = 'get' . str_replace(
-                    '_',
-                    '',
-                    ucwords($key, '_')
-                );
+            $method = 'get' . str_replace('_', '', ucwords($key, '_'));
             $data[$key] = $item->$method();
         }
 

diff --git a/Model/ResourceModel/Post/Collection.php b/Model/ResourceModel/Post/Collection.php
@@ -346,7 +346,7 @@ public function addSearchFilter($term)
             );
 
             if ($advancedSortingEnabled) {
-                    
+
                 if ($tagPostIdsCount > 200) {
                     $tagPostIds = array_slice($tagPostIds, 0, 200);
                 }
@@ -376,7 +376,7 @@ public function addSearchFilter($term)
             if ($advancedSortingEnabled) {
                 $this->addExpressionFieldToSelect(
                     'search_rate',
-                    '(0 ' . 
+                    '(0 ' .
                     '+ FORMAT(MATCH (title, meta_keywords, meta_description, identifier, content) AGAINST ("{{term}}"), 4))',
                     [
                         'term' => $this->getConnection()->quote($term)

diff --git a/Model/SlashUrlRedirect.php b/Model/SlashUrlRedirect.php
@@ -79,7 +79,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         ScopeInterface::SCOPE_STORE
                     );
                     if ($controllerSufix) {
-                        if (strpos($result[0], $controllerSufix) == strlen($result[0]) - strlen($controllerSufix) ) {
+                        if (strpos($result[0], $controllerSufix) == strlen($result[0]) - strlen($controllerSufix)) {
                             return;
                         }
                     }

diff --git a/Model/TemplatePool.php b/Model/TemplatePool.php
@@ -63,4 +63,4 @@ public function getTemplate(string $templateType, string $name):string
         }
         return '';
     }
-}
+}
diff --git a/Plugin/Magento/AdminGws/Model/ModelsPlugin.php b/Plugin/Magento/AdminGws/Model/ModelsPlugin.php
@@ -9,7 +9,7 @@
 namespace Magefan\Blog\Plugin\Magento\AdminGws\Model;
 
 /**
- * Class ModelsPlugin
+ * Class ModelsPlugin class
  */
 class ModelsPlugin
 {

diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
@@ -41,7 +41,6 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             );
             $tags = $connection->fetchAll($tagSelect);
 
-
             $count = count($tags);
             if ($count) {
                 $data = [];

diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
@@ -737,8 +737,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
             );
         }
 
-
-
         if (version_compare($version, '2.9.8') < 0) {
             /**
              * Create table 'magefan_blog_tag_store'
@@ -805,4 +803,4 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
 
         $setup->endSetup();
     }
-}
+}
diff --git a/Ui/DataProvider/Comment/Form/CommentDataProvider.php b/Ui/DataProvider/Comment/Form/CommentDataProvider.php
@@ -121,7 +121,6 @@ public function getData()
                     $this->loadedData[$comment->getId()]['author_url'] = $guestData;
                     break;
                 case \Magefan\Blog\Model\Config\Source\AuthorType::CUSTOMER:
-
                     if ($author->getCustomer()) {
                         $this->loadedData[$comment->getId()]['author_url'] = [
                             'url' => $this->url->getUrl(

diff --git a/ViewModel/Style.php b/ViewModel/Style.php
@@ -31,11 +31,15 @@ class Style implements \Magento\Framework\View\Element\Block\ArgumentInterface
      */
     private $done = [];
 
-
+    /**
+     * Style constructor.
+     * @param Source $source
+     * @param AssetRepository $assetRepository
+     */
     public function __construct(
         Source $source,
         AssetRepository $assetRepository
-    )  {
+    ) {
         $this->source = $source;
         $this->assetRepository = $assetRepository;
     }
@@ -50,7 +54,6 @@ public function getStyle($file)
         }
         $this->done[$file] = true;
 
-
         if (false === strpos($file, '::')) {
             $file = 'Magefan_Blog::css/' . $file;
         }
@@ -92,6 +95,5 @@ public function getStyle($file)
         return PHP_EOL . '
         <!-- Start CSS ' . $file . ' ' . ((int)(strlen($fileContent) / 1024)) . 'Kb -->
         <style>' . $fileContent . '</style>';
-
     }
 }
diff --git a/view/adminhtml/templates/import/item.phtml b/view/adminhtml/templates/import/item.phtml
@@ -27,8 +27,7 @@
                     $url = $block->getUrl('blog/import/form', ['type' => $block->getImportType()]);
                 }
                 $action = 'window.location=\'' .  $block->escapeUrl($url) . '\'';
-            }
-         ?>
+            } ?>
          onclick="<?= $action ?>">
         <img class="img"
              src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImage())) ?>" />

diff --git a/view/frontend/templates/addthis-js.phtml b/view/frontend/templates/addthis-js.phtml
@@ -16,4 +16,5 @@
     }
 </script>
 <script type="text/javascript" async
-        src="<?= '/' . '/' ?>s7.addthis.com/js/300/addthis_widget.js#pubid=<?= $block->escapeUrl($block->getAddThisPubId()) ?>"></script>
+        src="<?= '/' . '/' ?>s7.addthis.com/js/300/addthis_widget.js#pubid=<?= $block->escapeUrl($block->getAddThisPubId()) ?>">
+</script>