Merge branch 'no-author/paypal' into comm_prd_may_abhi_v1

glo24157 · glo24157 · commit 756da78b4d44 · 2025-05-05T12:23:01.000+05:30
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
@@ -1,15 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate;
 
 /**
  * Shipping carrier table rate grid block
  * WARNING: This grid used for export table rates
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\OfflineShipping\Block\Adminhtml\Form\Field;
 
 /**
  * Export CSV button for shipping table rates
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Export extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -36,6 +34,8 @@ public function __construct(
     }
 
     /**
+     * Get elementHtml
+     *
      * @return string
      */
     public function getElementHtml()
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\OfflineShipping\Block\Adminhtml\Form\Field;
 
 /**
  * Custom import CSV file field for shipping table rates
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Import extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
+     * Initialize Import
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Free shipping model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\OfflineShipping\Model\Carrier;
 
diff --git a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
@@ -1,16 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\OfflineShipping\Model\Config\Backend;
 
 use Magento\Framework\Model\AbstractModel;
 
 /**
  * Backend model for shipping table rates CSV importing
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Tablerate extends \Magento\Framework\App\Config\Value
 {
@@ -44,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * After save
+     *
      * @return $this
      */
     public function afterSave()
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Shipping table rates
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier;
diff --git a/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php b/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Shopping Cart Rule data model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\OfflineShipping\Model\SalesRule;
 
diff --git a/app/code/Magento/OfflineShipping/Model/SalesRule/Rule.php b/app/code/Magento/OfflineShipping/Model/SalesRule/Rule.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Shopping Cart Rule data model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\OfflineShipping\Model\SalesRule;
 
@@ -20,10 +18,10 @@ class Rule
     /**
      * Free Shipping option "For matching items only"
      */
-    const FREE_SHIPPING_ITEM = 1;
+    public const FREE_SHIPPING_ITEM = 1;
 
     /**
      * Free Shipping option "For shipment with matching items"
      */
-    const FREE_SHIPPING_ADDRESS = 2;
+    public const FREE_SHIPPING_ADDRESS = 2;
 }
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 /**
  * Custom import CSV file field for shipping table rates
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\OfflineShipping\Test\Unit\Block\Adminhtml\Form\Field;
 
diff --git a/app/code/Magento/Payment/Model/Method/Online/GatewayInterface.php b/app/code/Magento/Payment/Model/Method/Online/GatewayInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Payment\Model\Method\Online;
 
@@ -10,8 +10,6 @@
 
 /**
  * Gateway interface for online payment methods
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 interface GatewayInterface
 {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Details.php
@@ -1,20 +1,17 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Block\Adminhtml\Settlement;
 
 /**
  * Settlement reports transaction details
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Details extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * Block construction
-     * Initialize titles, buttons
+     * Block construction Initialize titles, buttons
      *
      * @return void
      */
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
@@ -1,15 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Block\Adminhtml\Settlement;
 
 /**
  * Adminhtml paypal settlement reports grid block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Report extends \Magento\Backend\Block\Widget\Grid\Container
diff --git a/app/code/Magento/Paypal/Block/Express/Review.php b/app/code/Magento/Paypal/Block/Express/Review.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Paypal\Block\Express;
@@ -13,7 +13,6 @@
  * Paypal Express Onepage checkout block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Review extends \Magento\Framework\View\Element\Template
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Block\Hosted\Pro;
 
 /**
  * Hosted Pro link form
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Form extends \Magento\Payment\Block\Form
 {
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Iframe.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Iframe.php
@@ -1,20 +1,17 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Block\Hosted\Pro;
 
 /**
  * Hosted Pro iframe block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Iframe extends \Magento\Paypal\Block\Iframe
 {
     /**
-     * Internal constructor
-     * Set payment method code
+     * Internal constructor Set payment method code
      *
      * @return void
      */
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Info.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Info.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Hosted Pro link infoblock
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Paypal\Block\Hosted\Pro;
 
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Block\Payflow\Advanced;
 
 /**
  * Payflow Advanced iframe block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Form extends \Magento\Paypal\Block\Payflow\Link\Form
 {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Block\Payflow\Link;
 
 /**
  * Payflow link iframe block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Form extends \Magento\Payment\Block\Form
 {
diff --git a/app/code/Magento/Paypal/Model/Hostedpro/Request.php b/app/code/Magento/Paypal/Model/Hostedpro/Request.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Model\Hostedpro;
 
@@ -15,8 +15,6 @@
 
 /**
  *  Website Payments Pro Hosted Solution request model to get token.
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Request extends DataObject
 {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Request.php b/app/code/Magento/Paypal/Model/Payflow/Request.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Paypal\Model\Payflow;
 
 /**
  * Payflow Link request model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Request extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement/Row.php b/app/code/Magento/Paypal/Model/Report/Settlement/Row.php
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row.php
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row/Collection.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Row/Collection.php
