ENGCOM-3980: Assign with and, or, replaced by &&, || #20628

magento-engcom-team · magento-engcom-team · commit 0b9bbd8aae83 · 2019-01-28T08:52:11.000-06:00
- Merge Pull Request #20628 from lfluvisotto/magento2:2.3-develop-assign-with-or - Merged commits: 1. e78576e 2. 0a4a1e1 3. 6c2d7d9
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -107,6 +107,8 @@ public function execute()
     }
 
     /**
+     * Get error response.
+     *
      * @return Json
      */
     private function getErrorResponse()
diff --git a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
@@ -48,7 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function check($securityEventType, $accountReference = null, $longIp = null)
     {
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -16,6 +16,7 @@
  * @method \Magento\SendFriend\Model\SendFriend setTime(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
@@ -162,6 +163,8 @@ protected function _construct()
     }
 
     /**
+     * Send email.
+     *
      * @return $this
      * @throws CoreException
      */
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -408,6 +408,7 @@ protected function enhanceTotalData(
 
     /**
      * Process model configuration array.
+     *
      * This method can be used for changing totals collect sort order
      *
      * @param   array $config
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
@@ -11,6 +11,8 @@
 
 /**
  * Message manager model
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Manager implements ManagerInterface
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
@@ -139,7 +139,7 @@ class Session implements ConfigOptionsListInterface
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getOptions()
@@ -289,7 +289,7 @@ public function getOptions()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -320,7 +320,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ public function execute()`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
	`110`	`+ * Get error response.`
	`111`	`+ *`
`110`	`112`	`* @return Json`
`111`	`113`	`*/`
`112`	`114`	`private function getErrorResponse()`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct(`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * {@inheritdoc}`
	`51`	`+ * @inheritdoc`
`52`	`52`	`*/`
`53`	`53`	`public function check($securityEventType, $accountReference = null, $longIp = null)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`* @method \Magento\SendFriend\Model\SendFriend setTime(int $value)`
`17`	`17`	`*`
`18`	`18`	`* @author Magento Core Team <core@magentocommerce.com>`
	`19`	`+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)`
`19`	`20`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`20`	`21`	`*`
`21`	`22`	`* @api`
`@@ -162,6 +163,8 @@ protected function _construct()`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`/**`
	`166`	`+ * Send email.`
	`167`	`+ *`
`165`	`168`	`* @return $this`
`166`	`169`	`* @throws CoreException`
`167`	`170`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,7 @@ protected function enhanceTotalData(`
`408`	`408`
`409`	`409`	`/**`
`410`	`410`	`* Process model configuration array.`
	`411`	`+ *`
`411`	`412`	`* This method can be used for changing totals collect sort order`
`412`	`413`	`*`
`413`	`414`	`* @param array $config`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ class Session implements ConfigOptionsListInterface`
`139`	`139`	`];`
`140`	`140`
`141`	`141`	`/**`
`142`		`- * {@inheritdoc}`
	`142`	`+ * @inheritdoc`
`143`	`143`	`* @SuppressWarnings(PHPMD.ExcessiveMethodLength)`
`144`	`144`	`*/`
`145`	`145`	`public function getOptions()`
`@@ -289,7 +289,7 @@ public function getOptions()`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`/**`
`292`		`- * {@inheritdoc}`
	`292`	`+ * @inheritdoc`
`293`	`293`	`*/`
`294`	`294`	`public function createConfig(array $options, DeploymentConfig $deploymentConfig)`
`295`	`295`	`{`
`@@ -320,7 +320,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`/**`
`323`		`- * {@inheritdoc}`
	`323`	`+ * @inheritdoc`
`324`	`324`	`*/`
`325`	`325`	`public function validate(array $options, DeploymentConfig $deploymentConfig)`
`326`	`326`	`{`