Merge remote-tracking branch '37003-v1/no-author/email-fedex-groupedproduct-integration' into compr248beta1

Indrani Sonawane · Indrani Sonawane · commit e9830bf23477 · 2024-07-05T13:20:21.000+05:30
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -6,8 +6,6 @@
 
 /**
  * Adminhtml system templates page content block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Email\Block\Adminhtml;
 
@@ -52,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -90,7 +88,7 @@ public function getCreateUrl()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -109,7 +107,7 @@ public function getHeaderText()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function removeButton($buttonId)
     {
@@ -135,7 +133,7 @@ protected function getAddButtonHtml()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -12,7 +12,6 @@
 /**
  * Adminhtml system template edit block
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @method array getTemplateOptions()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -21,6 +20,7 @@ class Edit extends Widget implements ContainerInterface
     /**
      * @var \Magento\Framework\Registry
      * @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
+     * @see Nothing
      */
     protected $_registryManager;
 
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php
@@ -7,8 +7,6 @@
 
 /**
  * Adminhtml system template grid type filter
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -7,8 +7,6 @@
 
 /**
  * Email templates grid block action item renderer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -7,8 +7,6 @@
 
 /**
  * Adminhtml system templates grid block sender item renderer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
@@ -7,8 +7,6 @@
 
 /**
  * Adminhtml system templates grid block type item renderer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
@@ -7,8 +7,6 @@
 
 /**
  * System Template admin controller
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 abstract class Template extends \Magento\Backend\App\Action
 {
@@ -17,13 +15,14 @@ abstract class Template extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Email::template';
+    public const ADMIN_RESOURCE = 'Magento_Email::template';
 
     /**
-     * Core registry
+     * Core registry variable
      *
      * @var \Magento\Framework\Registry
      * @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
+     * @see Nothing
      */
     protected $_coreRegistry = null;
 
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -20,7 +20,6 @@
  * Template model class.
  *
  * phpcs:disable Magento2.Classes.AbstractApi
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @api
diff --git a/app/code/Magento/Fedex/Model/Source/Freemethod.php b/app/code/Magento/Fedex/Model/Source/Freemethod.php
@@ -7,13 +7,11 @@
 
 /**
  * Fedex freemethod source implementation
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Freemethod extends \Magento\Fedex\Model\Source\Method
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Fedex/Model/Source/Method.php b/app/code/Magento/Fedex/Model/Source/Method.php
@@ -6,8 +6,6 @@
 
 /**
  * Fedex method source implementation
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Fedex\Model\Source;
 
diff --git a/app/code/Magento/Fedex/Model/Source/Packaging.php b/app/code/Magento/Fedex/Model/Source/Packaging.php
@@ -6,8 +6,6 @@
 
 /**
  * Fedex packaging source implementation
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Fedex\Model\Source;
 
diff --git a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,6 @@
 
 /**
  * Products in grouped grid
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts;
 
@@ -18,7 +16,7 @@
 class ListAssociatedProducts extends \Magento\Backend\Block\Template
 {
     /**
-     * Registry
+     * Registry variable
      *
      * @var \Magento\Framework\Registry
      */
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
@@ -6,8 +6,6 @@
 
 /**
  * Grouped Products Stock Status Indexer Resource Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\GroupedProduct\Model\ResourceModel\Indexer\Stock;
 
@@ -32,7 +30,7 @@ class Grouped extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stoc
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param null $connectionName
+     * @param null|string $connectionName
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
      */
     public function __construct(
diff --git a/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php b/app/code/Magento/GroupedProduct/Model/Sales/AdminOrder/Product/Quote/Plugin/Initializer.php
@@ -6,9 +6,6 @@
 
 /**
  * Product quote initializer plugin
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- *
  */
 namespace Magento\GroupedProduct\Model\Sales\AdminOrder\Product\Quote\Plugin;
 
@@ -17,6 +14,8 @@
 class Initializer
 {
     /**
+     * After Initialization
+     *
      * @param \Magento\Sales\Model\AdminOrder\Product\Quote\Initializer $subject
      * @param \Magento\Quote\Model\Quote\Item|string $item
      * @param \Magento\Quote\Model\Quote $quote
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php
@@ -11,7 +11,6 @@
  * Consumer model
  *
  * @api
- * @author Magento Core Team <core@magentocommerce.com>
  * @method string getName()
  * @method Consumer setName(string $name)
  * @method Consumer setKey(string $key)
diff --git a/app/code/Magento/Integration/Model/Oauth/Nonce.php b/app/code/Magento/Integration/Model/Oauth/Nonce.php
@@ -7,7 +7,6 @@
 
 /**
  * Nonce model
- * @author Magento Core Team <core@magentocommerce.com>
  * @method string getNonce()
  * @method \Magento\Integration\Model\Oauth\Nonce setNonce() setNonce(string $nonce)
  * @method int getConsumerId()
@@ -18,7 +17,7 @@
 class Nonce extends \Magento\Framework\Model\AbstractModel
 {
     /**
-     * Oauth data
+     * Oauth data function
      *
      * @var \Magento\Integration\Helper\Oauth\Data
      */
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Nonce.php
@@ -7,8 +7,6 @@
 
 /**
  * oAuth nonce resource model
- *
- * @author Magento Core Team <core@magentocommerce.com>
  */
 class Nonce extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Adminhtml system templates page content block`
`9`		`- *`
`10`		`- * @author Magento Core Team <core@magentocommerce.com>`
`11`	`9`	`*/`
`12`	`10`	`namespace Magento\Email\Block\Adminhtml;`
`13`	`11`
`@@ -52,7 +50,7 @@ public function __construct(`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`/**`
`55`		`- * {@inheritdoc}`
	`53`	`+ * @inheritdoc`
`56`	`54`	`*/`
`57`	`55`	`public function updateButton($buttonId, $key, $data)`
`58`	`56`	`{`
`@@ -90,7 +88,7 @@ public function getCreateUrl()`
`90`	`88`	`}`
`91`	`89`
`92`	`90`	`/**`
`93`		`- * {@inheritdoc}`
	`91`	`+ * @inheritdoc`
`94`	`92`	`*/`
`95`	`93`	`public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')`
`96`	`94`	`{`
`@@ -109,7 +107,7 @@ public function getHeaderText()`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`/**`
`112`		`- * {@inheritdoc}`
	`110`	`+ * @inheritdoc`
`113`	`111`	`*/`
`114`	`112`	`public function removeButton($buttonId)`
`115`	`113`	`{`
`@@ -135,7 +133,7 @@ protected function getAddButtonHtml()`
`135`	`133`	`}`
`136`	`134`
`137`	`135`	`/**`
`138`		`- * {@inheritdoc}`
	`136`	`+ * @inheritdoc`
`139`	`137`	`*/`
`140`	`138`	`public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)`
`141`	`139`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Adminhtml system template grid type filter`
`10`		`- *`
`11`		`- * @author Magento Core Team <core@magentocommerce.com>`
`12`	`10`	`*/`
`13`	`11`	`class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Email templates grid block action item renderer`
`10`		`- *`
`11`		`- * @author Magento Core Team <core@magentocommerce.com>`
`12`	`10`	`*/`
`13`	`11`	`class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Adminhtml system templates grid block sender item renderer`
`10`		`- *`
`11`		`- * @author Magento Core Team <core@magentocommerce.com>`
`12`	`10`	`*/`
`13`	`11`	`class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`* Template model class.`
`21`	`21`	`*`
`22`	`22`	`* phpcs:disable Magento2.Classes.AbstractApi`
`23`		`- * @author Magento Core Team <core@magentocommerce.com>`
`24`	`23`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`25`	`24`	`* @SuppressWarnings(PHPMD.TooManyFields)`
`26`	`25`	`* @api`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,11 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Fedex freemethod source implementation`
`10`		`- *`
`11`		`- * @author Magento Core Team <core@magentocommerce.com>`
`12`	`10`	`*/`
`13`	`11`	`class Freemethod extends \Magento\Fedex\Model\Source\Method`
`14`	`12`	`{`
`15`	`13`	`/**`
`16`		`- * {@inheritdoc}`
	`14`	`+ * @inheritdoc`
`17`	`15`	`*/`
`18`	`16`	`public function toOptionArray()`
`19`	`17`	`{`