Merge branch 'AC-13306' of github.com:magento-gl/magento2ce into AC-13306

glo71317 · glo71317 · commit 5eccf70eb081 · 2025-01-07T18:55:35.000+05:30
diff --git a/app/code/Magento/AwsS3/Driver/AwsS3Factory.php b/app/code/Magento/AwsS3/Driver/AwsS3Factory.php
@@ -21,6 +21,8 @@
 
 /**
  * Creates a pre-configured instance of AWS S3 driver.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AwsS3Factory implements DriverFactoryInterface
 {
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
@@ -21,6 +21,7 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
@@ -27,6 +27,7 @@
  *
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Design extends \Magento\Framework\Model\AbstractModel
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -18,6 +18,7 @@
  * @method int getStoreId()
  * @method \Magento\Catalog\Model\Product\Compare\Item setStoreId(int $value)
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\DataObject\IdentityInterface
 {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
-class DefaultTemplate extends \Magento\Email\Controller\Adminhtml\Email\Template
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DefaultTemplate extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Email\Model\Template\Config

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* Creates a pre-configured instance of AWS S3 driver.`
	`24`	`+ *`
	`25`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`24`	`26`	`*/`
`25`	`27`	`class AwsS3Factory implements DriverFactoryInterface`
`26`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* @SuppressWarnings(PHPMD.TooManyFields)`
`23`	`23`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`24`	`+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)`
`24`	`25`	`* @since 100.0.2`
`25`	`26`	`*/`
`26`	`27`	`class Data extends \Magento\Framework\App\Helper\AbstractHelper`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @since 100.0.2`
`29`	`29`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`30`	`+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)`
`30`	`31`	`*/`
`31`	`32`	`class Design extends \Magento\Framework\Model\AbstractModel`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`* @method int getStoreId()`
`19`	`19`	`* @method \Magento\Catalog\Model\Product\Compare\Item setStoreId(int $value)`
`20`	`20`	`* @since 100.0.2`
	`21`	`+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)`
`21`	`22`	`*/`
`22`	`23`	`class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\DataObject\IdentityInterface`
`23`	`24`	`{`