Code style changes

ihorvansach · ihorvansach · commit c36a8b4c34ac · 2018-03-29T23:40:09.000+03:00
diff --git a/Block/Adminhtml/Post.php b/Block/Adminhtml/Post.php
@@ -44,5 +44,4 @@ protected function _prepareLayout()
 
         return parent::_prepareLayout();
     }
-
 }
diff --git a/Block/Adminhtml/System/Config/Form/UpdateInfo.php b/Block/Adminhtml/System/Config/Form/UpdateInfo.php
@@ -112,7 +112,6 @@ public function getLatestVersion()
                     throw new \Exception('Empty response');
                 }
                 $this->latestVersion = $encodedData[self::MODULE_NAME];
-
             } catch (\Exception $e) {
                 $this->latestVersion = false;
             }
@@ -128,5 +127,4 @@ public function needToUpdate()
     {
         return (version_compare($this->getCurrentVersion(), $this->getLatestVersion()) < 0);
     }
-
-}
+}
diff --git a/Block/Adminhtml/Tag.php b/Block/Adminhtml/Tag.php
@@ -44,5 +44,4 @@ protected function _prepareLayout()
 
         return parent::_prepareLayout();
     }
-
 }
diff --git a/Block/Category/PostList.php b/Block/Category/PostList.php
@@ -7,6 +7,7 @@
  */
 
 namespace Magefan\Blog\Block\Category;
+
 use Magento\Framework\Api\SortOrder;
 use Magefan\Blog\Model\Config\Source\CategoryDisplayMode;
 
@@ -34,7 +35,8 @@ protected function _preparePostCollection()
      *
      * @return string
      */
-    public function getCollectionOrderField(){
+    public function getCollectionOrderField()
+    {
         if ($this->getCategory()->getData('posts_sort_by')) {
             return self::POSTS_SORT_FIELD_BY_POSITION;
         }
diff --git a/Block/Index.php b/Block/Index.php
@@ -61,11 +61,12 @@ protected function _preparePostCollection()
     }
 
      /**
-     * Retrieve collection order field
-     *
-     * @return string
-     */
-    public function getCollectionOrderField(){
+      * Retrieve collection order field
+      *
+      * @return string
+      */
+    public function getCollectionOrderField()
+    {
         $postsSortBy = $this->_scopeConfig->getValue(
             \Magefan\Blog\Helper\Config::XML_PATH_HOMEPAGE_POSTS_SORT_BY,
             ScopeInterface::SCOPE_STORE
diff --git a/Block/Post/PostList/AbstractList.php b/Block/Post/PostList/AbstractList.php
@@ -10,6 +10,7 @@
 
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\Api\SortOrder;
+
 /**
  * Abstract blog post list block
  */
@@ -95,7 +96,8 @@ protected function _preparePostCollection()
      *
      * @return string
      */
-    public function getCollectionOrderField() {
+    public function getCollectionOrderField()
+    {
         return self::POSTS_SORT_FIELD_BY_PUBLISH_TIME;
     }
 
@@ -104,7 +106,8 @@ public function getCollectionOrderField() {
      *
      * @return string
      */
-    public function getCollectionOrderDirection() {
+    public function getCollectionOrderDirection()
+    {
         return SortOrder::SORT_DESC;
     }
 
@@ -144,7 +147,8 @@ protected function _toHtml()
      *
      * @return array
      */
-    public function getIdentities() {
+    public function getIdentities()
+    {
         $identities = [];
         foreach ($this->getPostCollection() as $item) {
             $identities = array_merge($identities, $item->getIdentities());
diff --git a/Block/Post/View/RelatedProducts.php b/Block/Post/View/RelatedProducts.php
@@ -127,10 +127,10 @@ public function getPost()
     }
 
      /**
-     * Return identifiers for produced content
-     *
-     * @return array
-     */
+      * Return identifiers for produced content
+      *
+      * @return array
+      */
     public function getIdentities()
     {
         $identities = [];
@@ -140,5 +140,4 @@ public function getIdentities()
 
         return $identities;
     }
-    
 }
diff --git a/Block/Sidebar/Categories.php b/Block/Sidebar/Categories.php
@@ -103,7 +103,8 @@ public function maxDepth()
      *
      * @return array
      */
-    public function getIdentities() {
+    public function getIdentities()
+    {
         $identities = [];
         foreach ($this->getGroupedChilds() as $item) {
             $identities = array_merge($identities, $item->getIdentities());
diff --git a/Block/Sidebar/Custom.php b/Block/Sidebar/Custom.php
@@ -9,6 +9,7 @@
 namespace Magefan\Blog\Block\Sidebar;
 
 use \Magento\Store\Model\ScopeInterface;
+
 /**
  * Blog sidebar custom block
  */
@@ -51,7 +52,6 @@ public function getContent()
     {
         $key = 'content';
         if (!$this->hasData($key)) {
-
             $content = $this->_scopeConfig->getValue('mfblog/sidebar/'.$this->_widgetKey.'/html', ScopeInterface::SCOPE_STORE);
             $content = $this->filterProvider->getPageFilter()->filter(
                 $content
diff --git a/Block/Sidebar/CustomTwo.php b/Block/Sidebar/CustomTwo.php
@@ -9,6 +9,7 @@
 namespace Magefan\Blog\Block\Sidebar;
 
 use \Magento\Store\Model\ScopeInterface;
+
 /**
  * Blog sidebar custom block
  */
diff --git a/Block/Sidebar/Featured.php b/Block/Sidebar/Featured.php
@@ -44,5 +44,4 @@ protected function getPostIdsConfigValue()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
-
 }
diff --git a/Block/Sidebar/Recent.php b/Block/Sidebar/Recent.php
@@ -44,5 +44,4 @@ protected function _preparePostCollection()
         parent::_preparePostCollection();
         $this->_postCollection->addRecentFilter();
     }
-
 }
diff --git a/Block/Sidebar/Rss.php b/Block/Sidebar/Rss.php
@@ -25,5 +25,4 @@ class Rss extends \Magento\Framework\View\Element\Template
      * @var array
      */
     protected $_months;
-
 }
diff --git a/Block/Sidebar/TagClaud.php b/Block/Sidebar/TagClaud.php
@@ -126,5 +126,4 @@ public function getTagClass($tag)
         }
         return 'largest';
     }
-
 }
diff --git a/Block/Tag/Info.php b/Block/Tag/Info.php
@@ -14,4 +14,4 @@
 class Info extends \Magefan\Blog\Block\Tag\AbstractTag
 {
 
-}
+}
diff --git a/Block/Widget/Recent.php b/Block/Widget/Recent.php
@@ -106,12 +106,12 @@ protected function _preparePostCollection()
 
         if ($from = $this->getData('from')) {
             $this->_postCollection
-                ->addFieldToFilter('publish_time', array('gteq' => $from . " 00:00:00"));
+                ->addFieldToFilter('publish_time', ['gteq' => $from . " 00:00:00"]);
         }
 
         if ($to = $this->getData('to')) {
             $this->_postCollection
-                ->addFieldToFilter('publish_time', array('lteq' => $to . " 00:00:00"));
+                ->addFieldToFilter('publish_time', ['lteq' => $to . " 00:00:00"]);
         }
     }
 
diff --git a/Controller/Adminhtml/Tag/Save.php b/Controller/Adminhtml/Tag/Save.php
@@ -13,7 +13,7 @@
  */
 class Save extends \Magefan\Blog\Controller\Adminhtml\Tag
 {
-	/**
+    /**
      * Filter request params
      * @param  array $data
      * @return array
diff --git a/Controller/Router.php b/Controller/Router.php
@@ -110,8 +110,8 @@ public function __construct(
         \Magefan\Blog\Model\TagFactory $tagFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResponseInterface $response
-    )
-    {
+    ) {
+    
         $this->actionFactory = $actionFactory;
         $this->_eventManager = $eventManager;
         $this->_url = $url;
diff --git a/Model/Config/Source/WidgetTag.php b/Model/Config/Source/WidgetTag.php
@@ -12,21 +12,20 @@
  * Used in recent post widget
  *
  */
-class WidgetTag extends Tag 
+class WidgetTag extends Tag
 {
     /**
      * Options getter
      *
      * @return array
      */
     public function toOptionArray()
-    {   
+    {
         if ($this->options === null) {
             parent::toOptionArray();
             array_unshift($this->options, ['label' => __('Please select'), 'value' => 0]);
         }
 
         return $this->options;
     }
-
 }
diff --git a/Model/Post.php b/Model/Post.php
@@ -425,7 +425,6 @@ public function getShortFilteredContent($len = null, $endСharacters = null)
     {
         $key = 'short_filtered_content' . $len;
         if (!$this->hasData($key)) {
-
             if ($this->getShortContent()) {
                 $content = $this->filterProvider->getPageFilter()->filter(
                     $this->getShortContent()
@@ -448,7 +447,6 @@ public function getShortFilteredContent($len = null, $endСharacters = null)
             if ($len) {
                 $content = mb_substr($content, 0, $len);
                 try {
-                    
                     $previousLoaderState = libxml_disable_entity_loader(true);
                     $previousErrorState = libxml_use_internal_errors(true);
                     $dom = new \DOMDocument();
diff --git a/Model/ResourceModel/Post/Collection.php b/Model/ResourceModel/Post/Collection.php
@@ -137,7 +137,7 @@ public function addStoreFilter($store, $withAdmin = true)
      */
     public function addRecentFilter()
     {
-      return $this->addFieldToFilter('include_in_recent', 1);
+        return $this->addFieldToFilter('include_in_recent', 1);
     }
     
     /**
diff --git a/Model/Tag.php b/Model/Tag.php
@@ -187,5 +187,4 @@ public function getIdentifier()
     {
         return (string)$this->getData('identifier');
     }
-
 }
diff --git a/Plugin/Magento/Sitemap/SitemapPlugin.php b/Plugin/Magento/Sitemap/SitemapPlugin.php
@@ -61,7 +61,6 @@ public function __construct(
     public function afterGenerateXml(Sitemap $sitemap, $result)
     {
         if (!method_exists($sitemap, 'collectSitemapItems')) {
-
             $sitemapId = $sitemap->getId() ?: 0;
             if (in_array($sitemapId, $this->generated)) {
                 return $result;
@@ -78,7 +77,6 @@ public function afterGenerateXml(Sitemap $sitemap, $result)
             );
 
             $blogSitemap->generateXml();
-
         }
 
         return $result;
@@ -89,7 +87,8 @@ public function afterGenerateXml(Sitemap $sitemap, $result)
      * @param $result
      * @return mixed
      */
-    public function afterCollectSitemapItems(Sitemap $sitemap, $result) {
+    public function afterCollectSitemapItems(Sitemap $sitemap, $result)
+    {
 
         $storeId = $sitemap->getStoreId();
 

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,4 @@ protected function _prepareLayout()`
`44`	`44`
`45`	`45`	`return parent::_prepareLayout();`
`46`	`46`	`}`
`47`		`-`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ public function getLatestVersion()`
`112`	`112`	`throw new \Exception('Empty response');`
`113`	`113`	`}`
`114`	`114`	`$this->latestVersion = $encodedData[self::MODULE_NAME];`
`115`		`-`
`116`	`115`	`} catch (\Exception $e) {`
`117`	`116`	`$this->latestVersion = false;`
`118`	`117`	`}`
`@@ -128,5 +127,4 @@ public function needToUpdate()`
`128`	`127`	`{`
`129`	`128`	`return (version_compare($this->getCurrentVersion(), $this->getLatestVersion()) < 0);`
`130`	`129`	`}`
`131`		`-`
`132`		`-}`
	`130`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,10 @@ public function getPost()`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/**`
`130`		`- * Return identifiers for produced content`
`131`		`- *`
`132`		`- * @return array`
`133`		`- */`
	`130`	`+ * Return identifiers for produced content`
	`131`	`+ *`
	`132`	`+ * @return array`
	`133`	`+ */`
`134`	`134`	`public function getIdentities()`
`135`	`135`	`{`
`136`	`136`	`$identities = [];`
`@@ -140,5 +140,4 @@ public function getIdentities()`
`140`	`140`
`141`	`141`	`return $identities;`
`142`	`142`	`}`
`143`		`-`
`144`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,4 @@ protected function getPostIdsConfigValue()`
`44`	`44`	`\Magento\Store\Model\ScopeInterface::SCOPE_STORE`
`45`	`45`	`);`
`46`	`46`	`}`
`47`		`-`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,4 @@ class Rss extends \Magento\Framework\View\Element\Template`
`25`	`25`	`* @var array`
`26`	`26`	`*/`
`27`	`27`	`protected $_months;`
`28`		`-`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,5 +126,4 @@ public function getTagClass($tag)`
`126`	`126`	`}`
`127`	`127`	`return 'largest';`
`128`	`128`	`}`
`129`		`-`
`130`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`class Info extends \Magefan\Blog\Block\Tag\AbstractTag`
`15`	`15`	`{`
`16`	`16`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -106,12 +106,12 @@ protected function _preparePostCollection()`
`106`	`106`
`107`	`107`	`if ($from = $this->getData('from')) {`
`108`	`108`	`$this->_postCollection`
`109`		`- ->addFieldToFilter('publish_time', array('gteq' => $from . " 00:00:00"));`
	`109`	`+ ->addFieldToFilter('publish_time', ['gteq' => $from . " 00:00:00"]);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if ($to = $this->getData('to')) {`
`113`	`113`	`$this->_postCollection`
`114`		`- ->addFieldToFilter('publish_time', array('lteq' => $to . " 00:00:00"));`
	`114`	`+ ->addFieldToFilter('publish_time', ['lteq' => $to . " 00:00:00"]);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*/`
`14`	`14`	`class Save extends \Magefan\Blog\Controller\Adminhtml\Tag`
`15`	`15`	`{`
`16`		`- /**`
	`16`	`+ /**`
`17`	`17`	`* Filter request params`
`18`	`18`	`* @param array $data`
`19`	`19`	`* @return array`
Original file line number	Diff line number	Diff line change
`@@ -12,21 +12,20 @@`
`12`	`12`	`* Used in recent post widget`
`13`	`13`	`*`
`14`	`14`	`*/`
`15`		`-class WidgetTag extends Tag`
	`15`	`+class WidgetTag extends Tag`
`16`	`16`	`{`
`17`	`17`	`/**`
`18`	`18`	`* Options getter`
`19`	`19`	`*`
`20`	`20`	`* @return array`
`21`	`21`	`*/`
`22`	`22`	`public function toOptionArray()`
`23`		`- {`
	`23`	`+ {`
`24`	`24`	`if ($this->options === null) {`
`25`	`25`	`parent::toOptionArray();`
`26`	`26`	`array_unshift($this->options, ['label' => __('Please select'), 'value' => 0]);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`return $this->options;`
`30`	`30`	`}`
`31`		`-`
`32`	`31`	`}`