Clean code

mageplaza · Aug 28, 2019 · 7cd5a3d · 7cd5a3d
1 parent 40dd15d
commit 7cd5a3d
Show file tree

Hide file tree

Showing 16 changed files with 202 additions and 195 deletions.
diff --git a/Block/Adminhtml/SeoChecker/CheckForm.php b/Block/Adminhtml/SeoChecker/CheckForm.php
@@ -26,10 +26,13 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action\UrlBuilder;
 use Magento\Cms\Model\PageFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Json\Helper\Data as JsonData;
 use Magento\Framework\Url;
 use Magento\Framework\View\Element\Template;
+use Magento\Sitemap\Model\ResourceModel\Sitemap\Collection;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Mageplaza\Seo\Helper\Data as SeoHelperData;
 
 /**
@@ -129,32 +132,37 @@ public function __construct(
      * get link to check
      *
      * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function getLink()
     {
         $id = $this->_request->getParam('id');
         $storeCode = $this->_storeManager->getStore()->getCode();
         $storeId = $this->_storeManager->getStore()->getId();
         $actionName = $this->_request->getFullActionName();
-        if ($storeId == "0") {
-            $storeId = $this->_storeManager->getDefaultStoreView()->getId();
-            $storeCode = $this->_storeManager->getDefaultStoreView()->getCode();
+        if ($storeId === 0) {
+            $defaultStore = $this->_storeManager->getDefaultStoreView();
+            $storeId = $defaultStore->getId();
+            $storeCode = $defaultStore->getCode();
         }
 
         switch ($actionName) {
             case 'catalog_product_edit':
                 $urlModel = $this->productRepository->getById($id)->getUrlModel();
                 $product = $this->productFactory->create()->load($id)->setStoreId($storeId);
-                $url = $urlModel->getUrl($product) . "?___store=" . $storeCode;
+                $url = $urlModel->getUrl($product, ['_query' => [StoreManagerInterface::PARAM_NAME => $storeCode]]);
                 break;
             case 'catalog_category_edit':
                 $category = $this->categoryRepository->get($id, $storeId);
-                $url = $category->getUrl() . "?___store=" . $storeCode;
+                $url = $category->getUrl(['_query' => [StoreManagerInterface::PARAM_NAME => $storeCode]]);
                 break;
             case 'cms_page_edit':
                 $pageId = $this->_request->getParam('page_id');
-                $url = $this->cmsUrl->getUrl($this->cmsPageFactory->create()->load($pageId)->getIdentifier(), $storeId, $storeCode);
+                $url = $this->cmsUrl->getUrl(
+                    $this->cmsPageFactory->create()->load($pageId)->getIdentifier(),
+                    $storeId,
+                    $storeCode
+                );
                 break;
             default:
                 $url = '';
@@ -167,13 +175,13 @@ public function getLink()
      * get site map links
      *
      * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function sitemap()
     {
         $sitemapLinks = [];
 
-        /** @var \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection $sitemap */
+        /** @var Collection $sitemap */
         $sitemap = $this->sitemapCollection->create();
 
         $storeId = $this->_storeManager->getStore()->getId();
@@ -192,7 +200,7 @@ public function sitemap()
      * get Data to check
      *
      * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function getSeoData()
     {

diff --git a/Block/Adminhtml/System/Config/Date.php b/Block/Adminhtml/System/Config/Date.php
@@ -18,6 +18,7 @@
  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
  * @license     https://www.mageplaza.com/LICENSE.txt
  */
+
 namespace Mageplaza\Seo\Block\Adminhtml\System\Config;
 
 use Magento\Config\Block\System\Config\Form\Field;
@@ -42,4 +43,4 @@ public function render(AbstractElement $element)
 
         return parent::render($element);
     }
-}
+}
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -122,7 +122,10 @@ public function getDuplicateConfig($code = null, $storeId = null)
     public function createStructuredData($data, $prefixComment = '', $subfixComment = '')
     {
         $applicationLdJson = $prefixComment;
-        $applicationLdJson .= '<script type="application/ld+json">' . json_encode($data, JSON_PRETTY_PRINT) . '</script>';
+        $applicationLdJson .= '<script type="application/ld+json">' . json_encode(
+            $data,
+            JSON_PRETTY_PRINT
+        ) . '</script>';
         $applicationLdJson .= $subfixComment;
 
         return $applicationLdJson;

diff --git a/Model/Config/Source/AggregateRating.php b/Model/Config/Source/AggregateRating.php
diff --git a/Observer/RemoveSchemaObserver.php b/Observer/RemoveSchemaObserver.php
@@ -18,6 +18,7 @@
  * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/)
  * @license     https://www.mageplaza.com/LICENSE.txt
  */
+
 namespace Mageplaza\Seo\Observer;
 
 use Magento\Framework\Event\Observer;
@@ -40,9 +41,8 @@ class RemoveSchemaObserver implements ObserverInterface
      *
      * @param HelperData $helperData
      */
-    public function __construct(
-        HelperData $helperData
-    ){
+    public function __construct(HelperData $helperData)
+    {
         $this->_helperData = $helperData;
     }
 

diff --git a/Plugin/Helper/CanUseCanonicalTagForCategories.php b/Plugin/Helper/CanUseCanonicalTagForCategories.php
@@ -21,6 +21,7 @@
 
 namespace Mageplaza\Seo\Plugin\Helper;
 
+use Magento\Catalog\Helper\Category;
 use Mageplaza\Seo\Helper\Data as HelperData;
 
 /**
@@ -30,7 +31,7 @@
 class CanUseCanonicalTagForCategories
 {
     /**
-     * @var \Mageplaza\Seo\Helper\Data
+     * @var HelperData
      */
     protected $_helper;
 
@@ -45,12 +46,12 @@ function __construct(HelperData $helper)
     }
 
     /**
-     * @param \Magento\Catalog\Helper\Category $category
+     * @param Category $category
      * @param $result
      *
      * @return mixed
      */
-    public function afterCanUseCanonicalTag(\Magento\Catalog\Helper\Category $category, $result)
+    public function afterCanUseCanonicalTag(Category $category, $result)
     {
         if ($this->_helper->isEnabled()) {
             return $this->_helper->getDuplicateConfig('category_canonical_tag');

diff --git a/Plugin/Helper/CanUseCanonicalTagForProducts.php b/Plugin/Helper/CanUseCanonicalTagForProducts.php
@@ -21,6 +21,7 @@
 
 namespace Mageplaza\Seo\Plugin\Helper;
 
+use Magento\Catalog\Helper\Product;
 use Mageplaza\Seo\Helper\Data as HelperData;
 
 /**
@@ -30,7 +31,7 @@
 class CanUseCanonicalTagForProducts
 {
     /**
-     * @var \Mageplaza\Seo\Helper\Data
+     * @var HelperData
      */
     protected $_helper;
 
@@ -45,12 +46,12 @@ function __construct(HelperData $helper)
     }
 
     /**
-     * @param \Magento\Catalog\Helper\Product $product
+     * @param Product $product
      * @param $result
      *
      * @return mixed
      */
-    public function afterCanUseCanonicalTag(\Magento\Catalog\Helper\Product $product, $result)
+    public function afterCanUseCanonicalTag(Product $product, $result)
     {
         if ($this->_helper->isEnabled()) {
             return $this->_helper->getDuplicateConfig('product_canonical_tag');

diff --git a/Plugin/RemoveReview.php b/Plugin/RemoveReview.php
@@ -37,9 +37,8 @@ class RemoveReview
      *
      * @param HelperData $helperData
      */
-    public function __construct(
-        HelperData $helperData
-    ) {
+    public function __construct(HelperData $helperData)
+    {
         $this->_helperData = $helperData;
     }