Merge remote-tracking branch '37016/no-author/sales-rule-shipping-sitemap' into commpr-10131-0608

del10131 · del10131 · commit 17ad9685ce07 · 2025-08-06T10:55:45.000+05:30
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Updatedat.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Updatedat.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\SalesRule\Model\ResourceModel\Report\Rule;
 
 /**
  * Rule report resource model with aggregation by updated at
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Updatedat extends \Magento\SalesRule\Model\ResourceModel\Report\Rule\Createdat
 {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Updatedat/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Updatedat/Collection.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\SalesRule\Model\ResourceModel\Report\Updatedat;
 
 /**
  * Sales report coupons collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Collection extends \Magento\SalesRule\Model\ResourceModel\Report\Collection
 {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer.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\SalesRule\Model\ResourceModel\Rule;
 
 /**
  * SalesRule Rule Customer Model Resource
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Customer extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Customer/Collection.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\SalesRule\Model\ResourceModel\Rule\Customer;
 
 /**
  * SalesRule Model Resource Rule Customer_Collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Customer.php b/app/code/Magento/SalesRule/Model/Rule/Customer.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\SalesRule\Model\Rule;
 
@@ -14,8 +14,6 @@
  * @method \Magento\SalesRule\Model\Rule\Customer setCustomerId(int $value)
  * @method int getTimesUsed()
  * @method \Magento\SalesRule\Model\Rule\Customer setTimesUsed(int $value)
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Customer extends \Magento\Framework\Model\AbstractModel
 {
diff --git a/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php b/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php
@@ -1,20 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\SalesRule\Model\System\Config\Source\Coupon;
 
 /**
  * Options for Code Format Field in Auto Generated Specific Coupon Codes configuration section
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Format implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * Sales rule coupon
-     *
      * @var \Magento\SalesRule\Helper\Coupon
      */
     protected $_salesRuleCoupon = null;
@@ -28,7 +24,7 @@ public function __construct(\Magento\SalesRule\Helper\Coupon $salesRuleCoupon)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.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\SendFriend\Block;
 
@@ -12,21 +12,16 @@
  * Email to a Friend Block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Send extends \Magento\Framework\View\Element\Template
 {
     /**
-     * SendFriend data
-     *
      * @var \Magento\SendFriend\Helper\Data
      */
     protected $_sendfriendData = null;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
@@ -245,5 +240,6 @@ protected function _prepareLayout()
                 ]
             );
         }
+        return $this;
     }
 }
diff --git a/app/code/Magento/SendFriend/Helper/Data.php b/app/code/Magento/SendFriend/Helper/Data.php
@@ -1,38 +1,36 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\SendFriend\Helper;
 
 /**
  * SendFriend Data Helper
  *
- * @author      Magento Core Team <core@magentocommerce.com>
- *
  * @api
  * @since 100.0.2
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    const XML_PATH_ENABLED = 'sendfriend/email/enabled';
+    public const XML_PATH_ENABLED = 'sendfriend/email/enabled';
 
-    const XML_PATH_ALLOW_FOR_GUEST = 'sendfriend/email/allow_guest';
+    public const XML_PATH_ALLOW_FOR_GUEST = 'sendfriend/email/allow_guest';
 
-    const XML_PATH_MAX_RECIPIENTS = 'sendfriend/email/max_recipients';
+    public const XML_PATH_MAX_RECIPIENTS = 'sendfriend/email/max_recipients';
 
-    const XML_PATH_MAX_PER_HOUR = 'sendfriend/email/max_per_hour';
+    public const XML_PATH_MAX_PER_HOUR = 'sendfriend/email/max_per_hour';
 
-    const XML_PATH_LIMIT_BY = 'sendfriend/email/check_by';
+    public const XML_PATH_LIMIT_BY = 'sendfriend/email/check_by';
 
-    const XML_PATH_EMAIL_TEMPLATE = 'sendfriend/email/template';
+    public const XML_PATH_EMAIL_TEMPLATE = 'sendfriend/email/template';
 
-    const COOKIE_NAME = 'stf';
+    public const COOKIE_NAME = 'stf';
 
-    const CHECK_IP = 1;
+    public const CHECK_IP = 1;
 
-    const CHECK_COOKIE = 0;
+    public const CHECK_COOKIE = 0;
 
     /**
      * Check is enabled Module
diff --git a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend/Collection.php b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend/Collection.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\SendFriend\Model\ResourceModel\SendFriend;
 
 /**
  * SendFriend log resource collection
  *
- * @author      Magento Core Team <core@magentocommerce.com>
- *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -22,7 +22,6 @@
  * @method int getTime()
  * @method \Magento\SendFriend\Model\SendFriend setTime(int $value)
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
diff --git a/app/code/Magento/SendFriend/Model/Source/Checktype.php b/app/code/Magento/SendFriend/Model/Source/Checktype.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Send to a Friend Limit sending by Source
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\SendFriend\Model\Source;
 
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View.php b/app/code/Magento/Shipping/Block/Adminhtml/View.php
@@ -1,22 +1,19 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Shipping\Block\Adminhtml;
 
 /**
  * Adminhtml shipment create
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
@@ -36,6 +33,8 @@ public function __construct(
     }
 
     /**
+     * Initialize View
+     *
      * @return void
      */
     protected function _construct()
@@ -85,6 +84,8 @@ public function getShipment()
     }
 
     /**
+     * Header Text get
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
@@ -107,6 +108,8 @@ public function getHeaderText()
     }
 
     /**
+     * Get URL
+     *
      * @return string
      */
     public function getBackUrl()
@@ -121,6 +124,8 @@ public function getBackUrl()
     }
 
     /**
+     * Get Email Url
+     *
      * @return string
      */
     public function getEmailUrl()
@@ -129,6 +134,8 @@ public function getEmailUrl()
     }
 
     /**
+     * Get Print Url
+     *
      * @return string
      */
     public function getPrintUrl()
@@ -137,6 +144,8 @@ public function getPrintUrl()
     }
 
     /**
+     * Update back button url
+     *
      * @param bool $flag
      * @return $this
      */
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Comments.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Comments.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Adminhtml sales shipment comment view block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Shipping\Block\Adminhtml\View;
 
@@ -18,8 +16,6 @@
 class Comments extends \Magento\Backend\Block\Text\ListText
 {
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Shipment view form
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Shipping\Block\Adminhtml\View;
 
diff --git a/app/code/Magento/Shipping/Block/Items.php b/app/code/Magento/Shipping/Block/Items.php
diff --git a/app/code/Magento/Shipping/Model/Shipment/Request.php b/app/code/Magento/Shipping/Model/Shipment/Request.php
diff --git a/app/code/Magento/Shipping/Model/Shipment/ReturnShipment.php b/app/code/Magento/Shipping/Model/Shipment/ReturnShipment.php
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap/Collection.php b/app/code/Magento/Sitemap/Model/ResourceModel/Sitemap/Collection.php
