Code style fixes

ihorvansach · ihorvansach · commit b676d4008dc9 · 2018-11-11T18:19:13.000+02:00
diff --git a/Block/Adminhtml/Category.php b/Block/Adminhtml/Category.php
@@ -45,5 +45,4 @@ protected function _prepareLayout()
         }
         return parent::_prepareLayout();
     }
-
 }
diff --git a/Block/Adminhtml/Category/CreateButton.php b/Block/Adminhtml/Category/CreateButton.php
@@ -11,7 +11,7 @@
 /**
  * Class CreateButton
  */
-class CreateButton extends  \Magefan\Community\Block\Adminhtml\Edit\CreateButton
+class CreateButton extends \Magefan\Community\Block\Adminhtml\Edit\CreateButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Category/DuplicateButton.php b/Block/Adminhtml/Category/DuplicateButton.php
@@ -23,6 +23,4 @@ public function getButtonData()
         }
         return parent::getButtonData();
     }
-
-
 }
diff --git a/Block/Adminhtml/Category/SaveAndContinueButton.php b/Block/Adminhtml/Category/SaveAndContinueButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveAndContinueButton
  */
-class SaveAndContinueButton  extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
+class SaveAndContinueButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Category/SaveButton.php b/Block/Adminhtml/Category/SaveButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveButton
  */
-class SaveButton extends  \Magefan\Community\Block\Adminhtml\Edit\SaveButton
+class SaveButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Comment/SaveAndContinueButton.php b/Block/Adminhtml/Comment/SaveAndContinueButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveAndContinueButton
  */
-class SaveAndContinueButton  extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
+class SaveAndContinueButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Comment/SaveButton.php b/Block/Adminhtml/Comment/SaveButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveButton
  */
-class SaveButton extends  \Magefan\Community\Block\Adminhtml\Edit\SaveButton
+class SaveButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Post.php b/Block/Adminhtml/Post.php
@@ -29,7 +29,6 @@ protected function _construct()
         if (!$this->_authorization->isAllowed("Magefan_Blog::post_save")) {
             $this->removeButton('add');
         }
-
     }
 
     /**
diff --git a/Block/Adminhtml/Post/DuplicateButton.php b/Block/Adminhtml/Post/DuplicateButton.php
@@ -23,6 +23,4 @@ public function getButtonData()
         }
         return parent::getButtonData();
     }
-
-
 }
diff --git a/Block/Adminhtml/Post/SaveAndContinueButton.php b/Block/Adminhtml/Post/SaveAndContinueButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveAndContinueButton
  */
-class SaveAndContinueButton  extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
+class SaveAndContinueButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Tag/CreateButton.php b/Block/Adminhtml/Tag/CreateButton.php
@@ -11,7 +11,7 @@
 /**
  * Class CreateButton
  */
-class CreateButton extends  \Magefan\Community\Block\Adminhtml\Edit\SaveButton
+class CreateButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Tag/SaveAndContinueButton.php b/Block/Adminhtml/Tag/SaveAndContinueButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveAndContinueButton
  */
-class SaveAndContinueButton  extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
+class SaveAndContinueButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveAndContinueButton
 {
     /**
      * @return array|string
diff --git a/Block/Adminhtml/Tag/SaveButton.php b/Block/Adminhtml/Tag/SaveButton.php
@@ -11,7 +11,7 @@
 /**
  * Class SaveButton
  */
-class SaveButton extends  \Magefan\Community\Block\Adminhtml\Edit\SaveButton
+class SaveButton extends \Magefan\Community\Block\Adminhtml\Edit\SaveButton
 {
     /**
      * @return array|string
diff --git a/Block/Category/PostList.php b/Block/Category/PostList.php
@@ -41,11 +41,11 @@ public function getCollectionOrderField()
         $postsSortBy = $this->getCategory()->getData('posts_sort_by');
 
         switch ($postsSortBy) {
-            case PostsSortBy::POSITION :
+            case PostsSortBy::POSITION:
                 return self::POSTS_SORT_FIELD_BY_POSITION;
-            case PostsSortBy::TITLE :
+            case PostsSortBy::TITLE:
                 return self::POSTS_SORT_FIELD_BY_TITLE;
-            default :
+            default:
                 return parent::getCollectionOrderField();
         }
     }
diff --git a/Block/Index.php b/Block/Index.php
@@ -78,11 +78,11 @@ public function getCollectionOrderField()
         );
 
         switch ($postsSortBy) {
-            case PostsSortBy::POSITION :
+            case PostsSortBy::POSITION:
                 return self::POSTS_SORT_FIELD_BY_POSITION;
-            case PostsSortBy::TITLE :
+            case PostsSortBy::TITLE:
                 return self::POSTS_SORT_FIELD_BY_TITLE;
-            default :
+            default:
                 return parent::getCollectionOrderField();
         }
     }
diff --git a/Block/Post/View/Comments.php b/Block/Post/View/Comments.php
@@ -69,7 +69,8 @@ public function getCommentsType()
     /**
      * @return bool
      */
-    public function displayPrivacyPolicyCheckbox() {
+    public function displayPrivacyPolicyCheckbox()
+    {
         return $this->_scopeConfig->getValue(
             'mfblog/post_view/comments/display_privacy_policy_checkbox',
             ScopeInterface::SCOPE_STORE
diff --git a/Block/Rss/Feed.php b/Block/Rss/Feed.php
@@ -65,7 +65,7 @@ public function getPostContent($post)
     {
         $content = $post->getFilteredContent();
         /* Remove iframes */
-        $content = preg_replace('/<iframe.*?\/iframe>/i','', $content);
+        $content = preg_replace('/<iframe.*?\/iframe>/i', '', $content);
 
         /* Remove style tags */
         $content = preg_replace('/(<[^>]+) style=".*?"/i', '$1', $content);
diff --git a/Controller/Adminhtml/Tag/Save.php b/Controller/Adminhtml/Tag/Save.php
@@ -45,5 +45,4 @@ protected function filterParams($data)
 
         return $data;
     }
-
 }
diff --git a/Model/CategoryManagement.php b/Model/CategoryManagement.php
@@ -30,15 +30,15 @@ public function __construct(
     }
     
      /**
-     * Retrieve list of category by page type, term, store, etc
-     *
-     * @param  string $type
-     * @param  string $term
-     * @param  int $storeId
-     * @param  int $page
-     * @param  int $limit
-     * @return string
-     */
+      * Retrieve list of category by page type, term, store, etc
+      *
+      * @param  string $type
+      * @param  string $term
+      * @param  int $storeId
+      * @param  int $page
+      * @param  int $limit
+      * @return string
+      */
     public function getList($type, $term, $storeId, $page, $limit)
     {
         try {
diff --git a/Model/Config.php b/Model/Config.php
@@ -14,7 +14,7 @@
 /**
  * Magefan Blog Config Model
  */
-class Config 
+class Config
 {
     /**
      * Extension enabled config path
@@ -151,11 +151,11 @@ public function getConfig($path, $storeId = null)
      * @param $pageType
      * @return bool
      */
-    public function getDisplayCanonicalTag($pageType) {
+    public function getDisplayCanonicalTag($pageType)
+    {
 
         $displayFor = explode(',', $this->getConfig(self::XML_PATH_DISPLAY_CANONICAL_TAG_FOR));
 
-        return in_array($pageType, $displayFor) ||  in_array(self::CANONICAL_PAGE_TYPE_ALL, $displayFor) ? true : false;
-
+        return in_array($pageType, $displayFor) || in_array(self::CANONICAL_PAGE_TYPE_ALL, $displayFor) ? true : false;
     }
 }
diff --git a/Model/Config/Source/BlogPages.php b/Model/Config/Source/BlogPages.php
@@ -2,7 +2,6 @@
 
 namespace Magefan\Blog\Model\Config\Source;
 
-
 class BlogPages implements \Magento\Framework\Option\ArrayInterface
 {
     /**
@@ -37,4 +36,4 @@ public function toArray()
         }
         return $array;
     }
-}
+}
diff --git a/Model/Import/Aw.php b/Model/Import/Aw.php
@@ -148,8 +148,6 @@ public function execute()
                     $tag = $existingTags[$data['title']];
                     $oldTags[$data['old_id']] = $tag;
                 }
-
-
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->_skippedTags[] = $data['title'];
                 $this->_logger->addDebug('Blog Tag Import [' . $data['title'] . ']: '. $e->getMessage());
diff --git a/Plugin/Magento/Sitemap/SitemapPlugin.php b/Plugin/Magento/Sitemap/SitemapPlugin.php
@@ -93,7 +93,6 @@ public function afterGenerateXml(\Magento\Framework\Model\AbstractModel $sitemap
 
                 $blogSitemap->generateXml();
             }
-
         }
         return $result;
     }
diff --git a/Setup/InstallData.php b/Setup/InstallData.php
@@ -54,8 +54,9 @@ public function __construct(
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         try {
-            $this->state->setAreaCode('adminhtml');    
-        } catch (\Exception $e) {}
+            $this->state->setAreaCode('adminhtml');
+        } catch (\Exception $e) {
+        }
 
         $data = [
             'title' => 'Hello world!',

Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,4 @@ protected function _prepareLayout()`
`45`	`45`	`}`
`46`	`46`	`return parent::_prepareLayout();`
`47`	`47`	`}`
`48`		`-`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`/**`
`12`	`12`	`* Class CreateButton`
`13`	`13`	`*/`
`14`		`-class CreateButton extends \Magefan\Community\Block\Adminhtml\Edit\CreateButton`
	`14`	`+class CreateButton extends \Magefan\Community\Block\Adminhtml\Edit\CreateButton`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* @return array\|string`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,4 @@ public function getButtonData()`
`23`	`23`	`}`
`24`	`24`	`return parent::getButtonData();`
`25`	`25`	`}`
`26`		`-`
`27`		`-`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ protected function _construct()`
`29`	`29`	`if (!$this->_authorization->isAllowed("Magefan_Blog::post_save")) {`
`30`	`30`	`$this->removeButton('add');`
`31`	`31`	`}`
`32`		`-`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ public function getCollectionOrderField()`
`41`	`41`	`$postsSortBy = $this->getCategory()->getData('posts_sort_by');`
`42`	`42`
`43`	`43`	`switch ($postsSortBy) {`
`44`		`- case PostsSortBy::POSITION :`
	`44`	`+ case PostsSortBy::POSITION:`
`45`	`45`	`return self::POSTS_SORT_FIELD_BY_POSITION;`
`46`		`- case PostsSortBy::TITLE :`
	`46`	`+ case PostsSortBy::TITLE:`
`47`	`47`	`return self::POSTS_SORT_FIELD_BY_TITLE;`
`48`		`- default :`
	`48`	`+ default:`
`49`	`49`	`return parent::getCollectionOrderField();`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,11 @@ public function getCollectionOrderField()`
`78`	`78`	`);`
`79`	`79`
`80`	`80`	`switch ($postsSortBy) {`
`81`		`- case PostsSortBy::POSITION :`
	`81`	`+ case PostsSortBy::POSITION:`
`82`	`82`	`return self::POSTS_SORT_FIELD_BY_POSITION;`
`83`		`- case PostsSortBy::TITLE :`
	`83`	`+ case PostsSortBy::TITLE:`
`84`	`84`	`return self::POSTS_SORT_FIELD_BY_TITLE;`
`85`		`- default :`
	`85`	`+ default:`
`86`	`86`	`return parent::getCollectionOrderField();`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getPostContent($post)`
`65`	`65`	`{`
`66`	`66`	`$content = $post->getFilteredContent();`
`67`	`67`	`/* Remove iframes */`
`68`		`- $content = preg_replace('/<iframe.*?\/iframe>/i','', $content);`
	`68`	`+ $content = preg_replace('/<iframe.*?\/iframe>/i', '', $content);`
`69`	`69`
`70`	`70`	`/* Remove style tags */`
`71`	`71`	`$content = preg_replace('/(<[^>]+) style=".*?"/i', '$1', $content);`
Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,4 @@ protected function filterParams($data)`
`45`	`45`
`46`	`46`	`return $data;`
`47`	`47`	`}`
`48`		`-`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Magefan\Blog\Model\Config\Source;`
`4`	`4`
`5`		`-`
`6`	`5`	`class BlogPages implements \Magento\Framework\Option\ArrayInterface`
`7`	`6`	`{`
`8`	`7`	`/**`
`@@ -37,4 +36,4 @@ public function toArray()`
`37`	`36`	`}`
`38`	`37`	`return $array;`
`39`	`38`	`}`
`40`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,6 @@ public function execute()`
`148`	`148`	`$tag = $existingTags[$data['title']];`
`149`	`149`	`$oldTags[$data['old_id']] = $tag;`
`150`	`150`	`}`
`151`		`-`
`152`		`-`
`153`	`151`	`} catch (\Magento\Framework\Exception\LocalizedException $e) {`
`154`	`152`	`$this->_skippedTags[] = $data['title'];`
`155`	`153`	`$this->_logger->addDebug('Blog Tag Import [' . $data['title'] . ']: '. $e->getMessage());`