Merge remote-tracking branch 'git-36981/no-author/customer-01' into bluetooth_delivery

engcom-Echo · engcom-Echo · commit 6e7d436898e4 · 2023-09-15T10:10:09.000+05:30
diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
@@ -13,7 +13,6 @@
  * Customer address book block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Book extends \Magento\Framework\View\Element\Template
@@ -167,6 +166,7 @@ public function getAdditionalAddresses()
         try {
             $addresses = $this->addressesGrid->getAdditionalAddresses();
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            return false;
         }
         return empty($addresses) ? false : $addresses;
     }
@@ -198,6 +198,7 @@ public function getCustomer()
         try {
             $customer = $this->currentCustomer->getCustomer();
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            return null;
         }
         return $customer;
     }
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
@@ -12,7 +12,6 @@
  * Address renderer interface
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 interface RendererInterface
 {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php
@@ -4,17 +4,16 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Customer\Block\Adminhtml\Form\Element;
+
 /**
  * Customer Widget Form Boolean Element Block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Customer\Block\Adminhtml\Form\Element;
-
 class Boolean extends \Magento\Framework\Data\Form\Element\Select
 {
     /**
      * Prepare default SELECT values
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
@@ -7,8 +7,6 @@
 
 /**
  * Customer Widget Form File Element Block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class File extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -18,8 +16,6 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
     protected $_assetRepo;
 
     /**
-     * Adminhtml data
-     *
      * @var \Magento\Backend\Helper\Data
      */
     protected $_adminhtmlData = null;
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Widget Form Image File Element Block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Block\Adminhtml\Form\Element;
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php
@@ -7,8 +7,6 @@
 
 /**
  * Country customer grid column filter
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
@@ -34,6 +32,8 @@ public function __construct(
     }
 
     /**
+     * Return options
+     *
      * @return array
      */
     protected function _getOptions()
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
@@ -11,8 +11,6 @@
 
 /**
  * Adminhtml customers wishlist grid item action renderer for few action controls in one cell
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Multiaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group.php b/app/code/Magento/Customer/Block/Adminhtml/Group.php
@@ -6,8 +6,6 @@
 
 /**
  * Adminhtml customers group page content block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Block\Adminhtml;
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -11,8 +11,6 @@
 
 /**
  * VAT ID element renderer
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
 {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php b/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
@@ -6,8 +6,6 @@
 
 /**
  * Adminhtml VAT ID validation block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Block\Adminhtml\System\Config;
 
diff --git a/app/code/Magento/Customer/Block/Form/Login.php b/app/code/Magento/Customer/Block/Form/Login.php
@@ -9,7 +9,6 @@
  * Customer login form block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Login extends \Magento\Framework\View\Element\Template
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php
@@ -7,8 +7,6 @@
 
 /**
  * VAT validation controller
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 abstract class Validatevat extends \Magento\Backend\App\Action
 {
@@ -17,7 +15,7 @@ abstract class Validatevat extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Customer::manage';
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
 
     /**
      * Perform customer VAT ID validation
diff --git a/app/code/Magento/Customer/Model/Address/Form.php b/app/code/Magento/Customer/Model/Address/Form.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Address Form Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Address;
 
diff --git a/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php b/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
@@ -7,8 +7,6 @@
 
 /**
  * Boolean customer attribute backend model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Abstract Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Boolean.php b/app/code/Magento/Customer/Model/Attribute/Data/Boolean.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Boolean Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Date.php b/app/code/Magento/Customer/Model/Attribute/Data/Date.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Date Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/File.php b/app/code/Magento/Customer/Model/Attribute/Data/File.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute File Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Hidden.php b/app/code/Magento/Customer/Model/Attribute/Data/Hidden.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Hidden text Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Image.php b/app/code/Magento/Customer/Model/Attribute/Data/Image.php
@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Image File Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
@@ -7,8 +7,6 @@
 
 /**
  * Customer group collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
@@ -16,8 +16,6 @@
 
 /**
  * Flat customer online grid collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Collection extends SearchResult
 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`* Customer address book block`
`14`	`14`	`*`
`15`	`15`	`* @api`
`16`		`- * @author Magento Core Team <[email protected]>`
`17`	`16`	`* @since 100.0.2`
`18`	`17`	`*/`
`19`	`18`	`class Book extends \Magento\Framework\View\Element\Template`
`@@ -167,6 +166,7 @@ public function getAdditionalAddresses()`
`167`	`166`	`try {`
`168`	`167`	`$addresses = $this->addressesGrid->getAdditionalAddresses();`
`169`	`168`	`} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
	`169`	`+ return false;`
`170`	`170`	`}`
`171`	`171`	`return empty($addresses) ? false : $addresses;`
`172`	`172`	`}`
`@@ -198,6 +198,7 @@ public function getCustomer()`
`198`	`198`	`try {`
`199`	`199`	`$customer = $this->currentCustomer->getCustomer();`
`200`	`200`	`} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
	`201`	`+ return null;`
`201`	`202`	`}`
`202`	`203`	`return $customer;`
`203`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`* Address renderer interface`
`13`	`13`	`*`
`14`	`14`	`* @api`
`15`		`- * @author Magento Core Team <[email protected]>`
`16`	`15`	`*/`
`17`	`16`	`interface RendererInterface`
`18`	`17`	`{`
-Original file line number
+Diff line change
 /**
  * Customer Widget Form Image File Element Block
 - *
 - * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\Customer\Block\Adminhtml\Form\Element;
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Adminhtml customers wishlist grid item action renderer for few action controls in one cell`
`14`		`- *`
`15`		`- * @author Magento Core Team <[email protected]>`
`16`	`14`	`*/`
`17`	`15`	`class Multiaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action`
`18`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`* Customer login form block`
`10`	`10`	`*`
`11`	`11`	`* @api`
`12`		`- * @author Magento Core Team <[email protected]>`
`13`	`12`	`* @since 100.0.2`
`14`	`13`	`*/`
`15`	`14`	`class Login extends \Magento\Framework\View\Element\Template`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Boolean customer attribute backend model`
`10`		`- *`
`11`		`- * @author Magento Core Team <[email protected]>`
`12`	`10`	`*/`
`13`	`11`	`class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Customer group collection`
`10`		`- *`
`11`		`- * @author Magento Core Team <[email protected]>`
`12`	`10`	`*/`
`13`	`11`	`class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Flat customer online grid collection`
`19`		`- *`
`20`		`- * @author Magento Core Team <[email protected]>`
`21`	`19`	`*/`
`22`	`20`	`class Collection extends SearchResult`
`23`	`21`	`{`