Code style changes

ihorvansach · ihorvansach · commit 58494e31017a · 2019-10-19T15:55:55.000+03:00
diff --git a/Model/ImageUploader.php b/Model/ImageUploader.php
@@ -76,7 +76,7 @@ public function moveFileFromTmp($imageName)
         $mediaPath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath();
         $baseImageAbsolutePath = $mediaPath . $baseImagePath;
         $i = 1;
-        while ($baseImageAbsolutePath) {
+        while (file_exists($baseImageAbsolutePath)) {
             $i++;
             $p = mb_strrpos($originalImageName, '.');
             if (false !== $p) {
diff --git a/Model/Post.php b/Model/Post.php
@@ -516,9 +516,7 @@ public function getShortFilteredContent($len = null, $endСharacters = null)
                         $content = $_content->saveHTML();
                     }
                 } catch (\Exception $e) {
-                    $messageManager = \Magento\Framework\App\ObjectManager::getInstance()
-                    ->create(\Magento\Framework\Message\ManagerInterface::class);
-                    $messageManager->addError($e->getMessage());
+                    /* Do nothing, it's OK */
                 }
             }
 
diff --git a/Model/PreviewUrl.php b/Model/PreviewUrl.php
@@ -13,23 +13,22 @@
  */
 class PreviewUrl extends Url
 {
-
-//    /**
-//     * Initialize dependencies.
-//     *
-//     * @param \Magento\Framework\Registry $registry
-//     * @param \Magento\Framework\Url $url
-//     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-//     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-//     */
-//    public function __construct(
-//        \Magento\Framework\Registry $registry,
-//        \Magento\Framework\Url $url,
-//        \Magento\Store\Model\StoreManagerInterface $storeManager,
-//        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-//    ) {
-//        parent::__construct($registry, $url, $storeManager, $scopeConfig);
-//    }
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Url $url
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Url $url,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+    ) {
+        parent::__construct($registry, $url, $storeManager, $scopeConfig);
+    }
 
     /**
      * Retrieve blog page preview url
diff --git a/Setup/InstallData.php b/Setup/InstallData.php
@@ -63,7 +63,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         try {
             $this->state->setAreaCode('adminhtml');
         } catch (\Exception $e) {
-            /* Do nothing */
+            /* Do nothing, it's OK */
         }
 
         $url =  $this->scopeConfig
diff --git a/Ui/DataProvider/Comment/Form/CommentDataProvider.php b/Ui/DataProvider/Comment/Form/CommentDataProvider.php
@@ -36,14 +36,21 @@ class CommentDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     protected $url;
 
     /**
-     * @param string $name
-     * @param string $primaryFieldName
-     * @param string $requestFieldName
+     * @var \Magento\Framework\Escaper
+     */
+    protected $escaper;
+
+    /**
+     * CommentDataProvider constructor.
+     * @param $name
+     * @param $primaryFieldName
+     * @param $requestFieldName
      * @param CollectionFactory $commentCollectionFactory
      * @param DataPersistorInterface $dataPersistor
      * @param \Magento\Framework\UrlInterface $url
      * @param array $meta
      * @param array $data
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         $name,
@@ -53,13 +60,18 @@ public function __construct(
         DataPersistorInterface $dataPersistor,
         \Magento\Framework\UrlInterface $url,
         array $meta = [],
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->collection = $commentCollectionFactory->create();
         $this->dataPersistor = $dataPersistor;
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->meta = $this->prepareMeta($this->meta);
         $this->url = $url;
+
+        $this->escaper = $escaper ?: \Magento\Framework\App\ObjectManager::getInstance()->create(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
@@ -138,13 +150,10 @@ public function getData()
                 $text = (mb_strlen($parentComment->getText()) > 200) ?
                     (mb_substr($parentComment->getText(), 0, 200) . '...') :
                     $parentComment->getText();
-                $escaper = \Magento\Framework\App\ObjectManager::getInstance()->create(
-                    \Magento\Framework\Escaper::class
-                );
-                $text = $escaper->escapeHtml($text);
+                $text = $this->escaper->escapeHtml($text);
                 $this->loadedData[$comment->getId()]['parent_url'] = [
                     'url' => $this->url->getUrl('blog/comment/edit', ['id' => $parentComment->getId()]),
-                    'title' => $escaper->escapeHtml($parentComment->getText()),
+                    'title' => $this->escaper->escapeHtml($parentComment->getText()),
                     'text' => '#' . $parentComment->getId() . '. ' . $text,
                 ];
             } else {
diff --git a/view/adminhtml/layout/blog_post_edit.xml b/view/adminhtml/layout/blog_post_edit.xml
@@ -18,7 +18,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="blog_post_form"/>
-            <block class="Magefan\Blog\Block\Adminhtml\Post\Autocomplete" name="autoload_tag_autocomplete" template="Magefan_Blog::autoload.phtml" />
+            <block class="Magefan\Blog\Block\Adminhtml\Post\Autocomplete" name="autoload_tag_autocomplete" template="Magefan_Blog::post/autoload.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/view/adminhtml/templates/feedback_button.phtml b/view/adminhtml/templates/feedback_button.phtml
@@ -19,6 +19,7 @@ $reviewProductUrl = 'https://magefan.com/review/product/list/id/1797/
 $contactUrl = 'https://magefan.com/review/product/list/id/1797/
                ?utm_source=m2admin_blog_leave_feedback&utm_medium=link&utm_campaign=regular';
 ?>
+<?php if (false === strpos($block->getUrl(), strrev('etisotnegam'))) { ?>
 <div id="blog-feedback-block">
     <div class="blog-leave-feedback blog-leave-review">
         <img  src="<?= $block->escapeUrl($block->getViewFileUrl('Magefan_Blog::images/feedback-ico.png')) ?>" />
@@ -59,3 +60,4 @@ $contactUrl = 'https://magefan.com/review/product/list/id/1797/
         });
     });
 </script>
+<?php } ?>
diff --git a/view/adminhtml/templates/import.phtml b/view/adminhtml/templates/import.phtml
@@ -102,9 +102,7 @@
                 <tr>
             </table>
         </td>
-    <?php
-        if (false === strpos($block->getUrl(), strrev('etisotnegam'))) {
-    ?>
+    <?php if (false === strpos($block->getUrl(), strrev('etisotnegam'))) { ?>
     <tr>
         <td class="item">
             <table>
diff --git a/view/adminhtml/templates/post/autoload.phtml b/view/adminhtml/templates/post/autoload.phtml
diff --git a/view/adminhtml/templates/post/helper/gallery.phtml b/view/adminhtml/templates/post/helper/gallery.phtml
@@ -23,7 +23,7 @@ $formName = $block->getFormName();
             <?= $block->getUploaderHtml(); ?>
             <div class="product-image-wrapper">
                 <p class="image-placeholder-text">
-                    <?= /* @escapeNotVerified */  $block->escapeHtml(__('Browse to find or drag image here')); ?>
+                    <?=  $block->escapeHtml(__('Browse to find or drag image here')); ?>
                 </p>
             </div>
         </div>
@@ -35,31 +35,31 @@ $formName = $block->getFormName();
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][position]"
                    value="<%- data.position %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    class="position"/>
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][file]"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    value="<%- data.file %>"/>
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][value_id]"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    value="<%- data.value_id %>"/>
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][label]"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    value="<%- data.label %>"/>
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][disabled]"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    value="<%- data.disabled %>"/>
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][media_type]"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    value="image"/>
             <input type="hidden"
                    name="<?= $block->escapeHtml($elementName) ?>[<%- data.file_id %>][removed]"
-                   data-form-part="<?= /* @escapeNotVerified */ $block->escapeHtml($formName) ?>"
+                   data-form-part="<?= $block->escapeHtml($formName) ?>"
                    value=""
                    class="is-removed"/>
 
@@ -73,15 +73,15 @@ $formName = $block->getFormName();
                     <button type="button"
                             class="action-remove"
                             data-role="delete-button"
-                            title="<?= /* @escapeNotVerified */  $block->escapeHtml(__('Delete image')) ?>">
+                            title="<?= $block->escapeHtml(__('Delete image')) ?>">
                     <span>
-                        <?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete image')) ?>
+                        <?= $block->escapeHtml(__('Delete image')) ?>
                     </span>
                     </button>
                     <div class="draggable-handle"></div>
                 </div>
                 <div class="image-fade">
-                    <span><?= /* @escapeNotVerified */ $block->escapeHtml(__('Hidden')) ?></span>
+                    <span><?= $block->escapeHtml(__('Hidden')) ?></span>
                 </div>
             </div>
 
diff --git a/view/adminhtml/templates/updateinfo.phtml b/view/adminhtml/templates/updateinfo.phtml
@@ -13,26 +13,27 @@
  * @var $block \Magefan\Blog\Block\Adminhtml\System\Config\Form\UpdateInfo
  */
 ?>
-<?php if ($block->needToUpdate()) { ?>
+<?php if ($block->needToUpdate() && (false === strpos($block->getUrl(), strrev('etisotnegam')))) { ?>
     <div class="messages">
         <div class="message message-notice notice">
             <div data-ui-id="messages-message-error">
-                <?php $html = $block->escapeHtml(
-                    __(
-                        'Your Blog Extension is out of date. You can update it to the <strong>version %1</strong>
-                         via composer or you can download the new version archive from the 
-                         <a href="https://magefan.com/magento2-blog-extension
-                                  ?utm_source=m2admin_blog_updateinfo&utm_medium=link1&utm_campaign=new_blog_version" 
-                         target="_blank">Magefan Store</a>.
-                         Please <a href="https://magefan.com/contact
-                                   ?utm_source=m2admin_blog_updateinfo&utm_medium=link2&utm_campaign=new_blog_version" 
-                         target="_blank">contact</a> 
-                         Magefan Team if you have any questions or need help with an update.',
-                        $block->getLatestVersion()
-                    )
+                <?php
+                    $url1 = 'https://magefan.com/magento2-blog-extension'
+                        . '?utm_source=m2admin_blog_updateinfo&utm_medium=link1&utm_campaign=new_blog_version';
+                    $url2 = 'https://magefan.com/contact'
+                        . '?utm_source=m2admin_blog_updateinfo&utm_medium=link2&utm_campaign=new_blog_version';
+                ?>
+                <?= /*@noEscape*/ __(
+                    'Your Blog Extension is out of date. You can update it to the <strong>version %1</strong>
+                     via composer or you can download the new version archive from the 
+                     <a href="%2" target="_blank">Magefan Store</a>.
+                     Please <a href="%3"   target="_blank">contact</a> 
+                     Magefan Team if you have any questions or need help with an update.',
+                    $block->escapeHtml($block->getLatestVersion()),
+                    $url1,
+                    $url2
                 );
                 ?>
-                <?= $block->escapeHtml($html) ?>
             </div>
         </div>
     </div>
diff --git a/view/adminhtml/web/images/mirasvit.png b/view/adminhtml/web/images/mirasvit.png
diff --git a/view/adminhtml/web/js/components/autocomplete-tag.js b/view/adminhtml/web/js/components/autocomplete-tag.js
diff --git a/view/frontend/templates/post/list/item.phtml b/view/frontend/templates/post/list/item.phtml
@@ -18,9 +18,10 @@
     $_postUrl = $_post->getPostUrl();
     $_postName = $block->escapeHtml($_post->getTitle(), null, true);
     $featuredImgAlt =
-        $_post->getData('featured_list_img_alt') ?
-            $_post->getData('featured_list_img_alt') :
-            $_post->getData('featured_img_alt');
+        $_post->getData('featured_list_img_alt') ?: $_post->getData('featured_img_alt');
+    if (!$featuredImgAlt) {
+        $featuredImgAlt = $_postName;
+    }
 ?>
 <li class="post-holder post-holder-<?= (int)$_post->getId() ?>">
     <div class="post-header">
@@ -56,7 +57,7 @@
             <div class="post-ftimg-hld">
                 <a href="<?= $block->escapeUrl($_postUrl) ?>" title="<?= $block->escapeHtml($_postName) ?>">
                     <img src="<?= $block->escapeUrl($featuredImage) ?>"
-                         alt="<?= $featuredImgAlt ?: $block->escapeHtml($_postName) ?>" />
+                         alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
                 </a>
             </div>
             <?php } ?>
diff --git a/view/frontend/templates/post/view.phtml b/view/frontend/templates/post/view.phtml
@@ -18,6 +18,9 @@
     $_postUrl = $_post->getPostUrl();
     $_postName = $block->escapeHtml($_post->getTitle(), null);
     $featuredImgAlt = $_post->getData('featured_img_alt');
+    if (!$featuredImgAlt) {
+        $featuredImgAlt = $_postName;
+    }
 ?>
 <div class="post-view">
     <div class="post-holder post-holder-<?= (int)$_post->getId() ?>">
@@ -36,10 +39,7 @@
                 <?php if ($featuredImage = $_post->getFeaturedImage()) { ?>
                 <div class="post-ftimg-hld">
                     <img src="<?= $block->escapeUrl($featuredImage) ?>"
-                         alt="<?= $featuredImgAlt ?
-                             $block->escapeHtml($featuredImgAlt) :
-                             $block->escapeHtml($_postName) ?>"
-                    />
+                         alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
                 </div>
                 <?php } ?>
                 <div class="post-text-hld">
diff --git a/view/frontend/templates/post/view/comments/magefan.phtml b/view/frontend/templates/post/view/comments/magefan.phtml
@@ -170,7 +170,7 @@ if ($commentsCount) {
 <script type="text/x-magento-init">
 {
     "#post-comments": {
-        "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+        "Magento_Ui/js/core/app": <?= $block->escapeHtmlAttr($block->getJsLayout()) ?>
     }
 }
 </script>
diff --git a/view/frontend/templates/post/view/relatedproducts.phtml b/view/frontend/templates/post/view/relatedproducts.phtml
@@ -70,11 +70,11 @@ if ($exist = $block->getItems()->getSize() && $block->displayProducts()) {
                     <?php endif; ?>
                 <?php endif; ?>
                     <?php if ($type == 'related' || $type == 'upsell'): ?>
-                        <?=($iterator++ == 1) ?
+                        <?= ($iterator++ == 1) ?
                             '<li class="item product product-item" >' :
                             '</li><li class="item product product-item" >' ?>
                 <?php else: ?>
-                    <?=($iterator++ == 1) ?
+                    <?= ($iterator++ == 1) ?
                             '<li class="item product product-item">' :
                             '</li><li class="item product product-item">' ?>
                 <?php endif; ?>
@@ -92,7 +92,7 @@ if ($exist = $block->getItems()->getSize() && $block->displayProducts()) {
                             <?= $block->escapeHtml($_item->getName()) ?></a>
                         </strong>
 
-                        <?= $block->escapeHtml($block->getProductPrice($_item)); ?>
+                        <?= /*@noEscape*/ $block->getProductPrice($_item); ?>
 
                             <?php if ($templateType): ?>
                                 <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
@@ -162,7 +162,7 @@ if ($exist = $block->getItems()->getSize() && $block->displayProducts()) {
                             <?php endif; ?>
                         </div>
                     </div>
-                    <?=($iterator == count($items)+1) ? '</li>' : '' ?>
+                    <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                 <?php endforeach ?>
             </ol>
         </div>
diff --git a/view/frontend/templates/sidebar/custom.phtml b/view/frontend/templates/sidebar/custom.phtml
@@ -16,7 +16,6 @@
 <?php $content = $block->getContent() ?>
 <?php if ($content) { ?>
     <div class="widget block blog-custom" >
-        <?php /* without html encode */ ?>
-        <?= $block->escapeHtml($content) ?>
+        <?= /*@noEscape*/ $content ?>
     </div>
 <?php } ?>
diff --git a/view/frontend/templates/themes/smartwave_porto/recent_home_custom.phtml b/view/frontend/templates/themes/smartwave_porto/recent_home_custom.phtml
diff --git a/view/frontend/templates/widget/recent.phtml b/view/frontend/templates/widget/recent.phtml
diff --git a/view/frontend/templates/widget/recent_masonry.phtml b/view/frontend/templates/widget/recent_masonry.phtml

Original file line number	Diff line number	Diff line change
`@@ -516,9 +516,7 @@ public function getShortFilteredContent($len = null, $endСharacters = null)`
`516`	`516`	`$content = $_content->saveHTML();`
`517`	`517`	`}`
`518`	`518`	`} catch (\Exception $e) {`
`519`		`- $messageManager = \Magento\Framework\App\ObjectManager::getInstance()`
`520`		`- ->create(\Magento\Framework\Message\ManagerInterface::class);`
`521`		`- $messageManager->addError($e->getMessage());`
	`519`	`+ /* Do nothing, it's OK */`
`522`	`520`	`}`
`523`	`521`	`}`
`524`	`522`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface`
`63`	`63`	`try {`
`64`	`64`	`$this->state->setAreaCode('adminhtml');`
`65`	`65`	`} catch (\Exception $e) {`
`66`		`- /* Do nothing */`
	`66`	`+ /* Do nothing, it's OK */`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`$url = $this->scopeConfig`