Merge remote-tracking branch '31360/refactor/around-plugins' into comm_78764_31355

Author: Indraniks

app/code/Magento/Bundle/Model/Plugin/PriceBackend.php

@@ -1,18 +1,21 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Bundle\Model\Plugin;
 
 /**
- * Class PriceBackend
- *
- *  Make price validation optional for bundle dynamic
+ * Make price validation optional for bundle dynamic
  */
 class PriceBackend
 {
     /**
+     * Around validate
+     *
      * @param \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $object
@@ -30,6 +33,7 @@ public function aroundValidate(
         ) {
             return true;
         }
+
         return $proceed($object);
     }
 }

app/code/Magento/ConfigurableProduct/Model/Plugin/PriceBackend.php

@@ -3,18 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableProduct\Model\Plugin;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
- * Class PriceBackend
- *
- *  Make price validation optional for configurable product
+ * Make price validation optional for configurable product
  */
 class PriceBackend
 {
     /**
+     * Around validate
+     *
      * @param \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $object
@@ -26,12 +29,10 @@ public function aroundValidate(
         \Closure $proceed,
         $object
     ) {
-        if ($object instanceof \Magento\Catalog\Model\Product
-            && $object->getTypeId() == Configurable::TYPE_CODE
-        ) {
+        if ($object instanceof ProductInterface && $object->getTypeId() === Configurable::TYPE_CODE) {
             return true;
-        } else {
-            return $proceed($object);
         }
+
+        return $proceed($object);
     }
 }

app/code/Magento/Store/Url/Plugin/SecurityInfo.php

@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Store\Url\Plugin;
 
-use \Magento\Store\Model\Store;
-use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Plugin for \Magento\Framework\Url\SecurityInfo
@@ -39,8 +41,8 @@ public function aroundIsSecure(\Magento\Framework\Url\SecurityInfo $subject, \Cl
     {
         if ($this->scopeConfig->getValue(Store::XML_PATH_SECURE_IN_FRONTEND, StoreScopeInterface::SCOPE_STORE)) {
             return $proceed($url);
-        } else {
-            return false;
         }
+
+        return false;
     }
 }

app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Webapi\Model\Plugin;
 
@@ -11,7 +12,7 @@
 /**
  * Plugin around \Magento\Framework\Authorization::isAllowed
  *
- * Plugin to allow guest users to access resources with anonymous permission
+ * Allow guest users to access resources with "anonymous" resource
  */
 class GuestAuthorization
 {
@@ -22,8 +23,7 @@ class GuestAuthorization
      * @param \Closure $proceed
      * @param string $resource
      * @param string $privilege
-     * @return bool true If resource permission is anonymous,
-     * to allow any user access without further checks in parent method
+     * @return bool Is resource permission "anonymous", to allow any user access without further checks in parent method
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundIsAllowed(
@@ -32,10 +32,10 @@ public function aroundIsAllowed(
         $resource,
         $privilege = null
     ) {
-        if ($resource == AuthorizationService::PERMISSION_ANONYMOUS) {
+        if ($resource === AuthorizationService::PERMISSION_ANONYMOUS) {
             return true;
-        } else {
-            return $proceed($resource, $privilege);
         }
+
+        return $proceed($resource, $privilege);
     }
 }

app/code/Magento/Widget/Model/ResourceModel/Layout/Plugin.php

@@ -1,31 +1,30 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Widget\Model\ResourceModel\Layout;
 
-/**
- * Class Plugin
- */
 class Plugin
 {
     /**
-     * @var \Magento\Widget\Model\ResourceModel\Layout\Update
+     * @var Update
      */
     private $update;
 
     /**
-     * @param \Magento\Widget\Model\ResourceModel\Layout\Update $update
+     * @param Update $update
      */
-    public function __construct(
-        \Magento\Widget\Model\ResourceModel\Layout\Update $update
-    ) {
+    public function __construct(Update $update)
+    {
         $this->update = $update;
     }
 
     /**
-     * Around getDbUpdateString
+     * Around update
      *
      * @param \Magento\Framework\View\Model\Layout\Merge $subject
      * @param callable $proceed