Code style improvements

ihorvansach · ihorvansach · commit 96d0cc652d90 · 2019-07-27T22:48:02.000+03:00
diff --git a/Model/Post.php b/Model/Post.php
@@ -519,7 +519,6 @@ public function getShortFilteredContent($len = null, $endСharacters = null)
         }
 
         return $this->getData($key);
-        ;
     }
 
     /**
diff --git a/view/frontend/templates/addthis-js.phtml b/view/frontend/templates/addthis-js.phtml
@@ -6,11 +6,13 @@
  * Glory to Ukraine! Glory to the heroes!
  */
 ?>
-
+<?php
+/** @var $block \Magefan\Blog\Block\Social\AddThis */
+?>
 <script type="text/javascript">
     var addthis_config = {
-        "ui_language": '<?php echo $this->getAddThisLanguage(); ?>',
+        "ui_language": '<?php echo $block->getAddThisLanguage() ?>',
         "data_track_clickback":false
     }
 </script>
-<script type="text/javascript" async src="<?php echo '/' . '/' ?>s7.addthis.com/js/250/addthis_widget.js#pubid=<?php echo $this->getAddThisPubId(); ?>"></script>
+<script type="text/javascript" async src="<?php echo '/' . '/' ?>s7.addthis.com/js/250/addthis_widget.js#pubid=<?php echo $block->getAddThisPubId() ?>"></script>
diff --git a/view/frontend/templates/category/info.phtml b/view/frontend/templates/category/info.phtml
@@ -14,6 +14,6 @@
  */
 ?>
 
-<?php if ($content = $this->getContent()): ?>
+<?php if ($content = $block->getContent()) : ?>
     <div class="category-content"><?php echo $content ?></div>
-<?php endif; ?>
+<?php endif ?>
diff --git a/view/frontend/templates/post/info.phtml b/view/frontend/templates/post/info.phtml
@@ -33,7 +33,7 @@
         <?php } ?>
     </div>
     <?php } ?>
-    <?php if ($this->magefanCommentsEnabled() && $_post->getCommentsCount()) { ?>
+    <?php if ($block->magefanCommentsEnabled() && $_post->getCommentsCount()) { ?>
     <div class="dash">|</div>
     <div class="item post-comments">
         <span class="label"><?php echo __('Comments:') ?></span>
diff --git a/view/frontend/templates/post/list.phtml b/view/frontend/templates/post/list.phtml
@@ -37,5 +37,5 @@ $_postCollection = $block->getPostCollection();
     </div>
 
     <?php echo $block->getToolbarHtml() ?>
-    <?php echo $this->getChildHtml('addthisJs'); ?>
+    <?php echo $block->getChildHtml('addthisJs'); ?>
 <?php endif; ?>
diff --git a/view/frontend/templates/post/list/item.phtml b/view/frontend/templates/post/list/item.phtml
@@ -14,7 +14,7 @@
  */
 ?>
 <?php
-    $_post = $this->getPost();
+    $_post = $block->getPost();
     $_postUrl = $_post->getPostUrl();
     $_postName = $block->escapeHtml($_post->getTitle(), null, true);
 ?>
@@ -42,7 +42,7 @@
             </div>
         </div>
 
-        <?php echo $this->getInfoHtml() ?>
+        <?php echo $block->getInfoHtml() ?>
     </div>
 
     <div class="post-content">
diff --git a/view/frontend/templates/post/view.phtml b/view/frontend/templates/post/view.phtml
@@ -14,9 +14,9 @@
  */
 ?>
 <?php
-    $_post = $this->getPost();
+    $_post = $block->getPost();
     $_postUrl = $_post->getPostUrl();
-    $_postName = $block->escapeHtml($_post->getTitle(), null, true);
+    $_postName = $block->escapeHtml($_post->getTitle(), null);
 ?>
 <div class="post-view">
     <div class="post-holder post-holder-<?php echo $_post->getId() ?>">
@@ -27,7 +27,7 @@
                 <a class="addthis_button_email"></a>
                 <a class="addthis_button_compact"></a>
             </div>
-            <?php echo $this->getInfoHtml() ?>
+            <?php echo $block->getInfoHtml() ?>
         </div>
 
         <div class="post-content">
@@ -45,7 +45,7 @@
         </div>
 
         <div class="post-bottom">
-            <?php echo $this->getChildHtml('blog.post.bottom') ?>
+            <?php echo $block->getChildHtml('blog.post.bottom') ?>
         </div>
     </div>
 </div>
diff --git a/view/frontend/templates/post/view/nextprev.phtml b/view/frontend/templates/post/view/nextprev.phtml
@@ -16,8 +16,8 @@
 
 <?php if ($block->displayLinks()) { ?>
     <?php
-        $prevPost = $this->getPrevPost();
-        $nextPost = $this->getNextPost();
+        $prevPost = $block->getPrevPost();
+        $nextPost = $block->getNextPost();
     ?>
     <?php if ($prevPost || $nextPost) { ?>
         <div class="post-nextprev-hld clearfix">
diff --git a/view/frontend/templates/post/view/relatedproducts.phtml b/view/frontend/templates/post/view/relatedproducts.phtml
@@ -15,7 +15,7 @@
 ?>
 
 <?php
-if ($exist = $block->getItems()->getSize() && $this->displayProducts()) {
+if ($exist = $block->getItems()->getSize() && $block->displayProducts()) {
     $type = 'related';
     $class = $type;
 
diff --git a/view/frontend/templates/sidebar/categories.phtml b/view/frontend/templates/sidebar/categories.phtml
@@ -14,7 +14,7 @@
  */
 ?>
 
-<?php $items = $this->getGroupedChilds(); ?>
+<?php $items = $block->getGroupedChilds(); ?>
 
 <?php if (count($items)) { ?>
 
diff --git a/view/frontend/templates/sidebar/rss.phtml b/view/frontend/templates/sidebar/rss.phtml
@@ -16,6 +16,6 @@
 <div class="widget block block-rss" data-bind="scope: 'blog-rss'">
     <div class="block-title">
         <img width="17" height="17" class="rss-icon" src="<?php echo $block->getViewFileUrl('Magefan_Blog::images/rss-icon.png') ?>" alt="<?php echo __('RSS Feed') ?>" >
-        <strong><a target="_blank" href="<?php echo $this->getUrl('blog/rss/feed') ?>"><?php echo __('RSS Feed') ?></a></strong>
+        <strong><a target="_blank" href="<?php echo $block->getUrl('blog/rss/feed') ?>"><?php echo __('RSS Feed') ?></a></strong>
     </div>
 </div>
diff --git a/view/frontend/templates/sidebar/tag_claud.phtml b/view/frontend/templates/sidebar/tag_claud.phtml
@@ -13,10 +13,10 @@
  * @var $block \Magefan\Blog\Block\Sidebar\TagClaud
  */
 ?>
-<?php $tags = $this->getTags(); ?>
+<?php $tags = $block->getTags(); ?>
 
 <?php if (count($tags)) { ?>
-<?php $maxCount = $this->getMaxCount() ?>
+<?php $maxCount = $block->getMaxCount() ?>
 
 <div class="widget block block-tagclaud" data-bind="scope: 'tagclaud'">
     <div class="block-title">
@@ -26,7 +26,7 @@
     <div class="tagclaud-hld">
     <?php foreach ($tags as $tag) { ?>
         <?php $title = $block->escapeHtml($tag->getTitle()) ?>
-        <span class="<?php echo $this->getTagClass($tag) ?>">
+        <span class="<?php echo $block->getTagClass($tag) ?>">
             <a href="<?php echo $tag->getTagUrl() ?>" title="<?php echo $title ?>">
                 <?php echo $title ?>
             </a>
diff --git a/view/frontend/templates/tag/info.phtml b/view/frontend/templates/tag/info.phtml
@@ -14,6 +14,6 @@
  */
 ?>
 
-<?php if ($content = $this->getContent()): ?>
+<?php if ($content = $block->getContent()) : ?>
     <div class="tag-content"><?php echo $content ?></div>
-<?php endif; ?>
+<?php endif ?>
diff --git a/view/frontend/web/js/lazyload.js b/view/frontend/web/js/lazyload.js
@@ -98,7 +98,7 @@
                 startLoading();
             });
         }
-    }
+    };
 
     return function (options) {
         new Lazyload(options)
diff --git a/view/frontend/web/js/magefan-comments.js b/view/frontend/web/js/magefan-comments.js
@@ -25,7 +25,7 @@ define(
                     + '<div>' + msg + '</div>'
                 +'</div>';
                 return $(h);
-            }
+            };
 
             var processError = function ($form, msg) {
                 $form.find('[type=submit]').removeAttr('disabled');
@@ -34,7 +34,7 @@ define(
                 setTimeout(function () {
                     $h.remove();
                 }, msgLifetime);
-            }
+            };
 
             var processSuccess = function ($form, msg) {
                 $form.find('[type=submit]').removeAttr('disabled');
@@ -44,7 +44,7 @@ define(
                 setTimeout(function () {
                     $h.remove();
                 }, msgLifetime);
-            }
+            };
 
             $hd.find('form').submit(function () {
                 var $form = $(this);

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,6 @@ public function getShortFilteredContent($len = null, $endСharacters = null)`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`return $this->getData($key);`
`522`		`- ;`
`523`	`522`	`}`
`524`	`523`
`525`	`524`	`/**`