Skip to content

Commit 6f11d16

Browse files
author
Stanislav Idolov
committed
magento-engcom/magento2ce#3248: Code style fixes
1 parent 36d389f commit 6f11d16

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

app/code/Magento/Customer/Model/Customer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ public function getAddressCollection()
513513
/**
514514
* Customer addresses collection
515515
*
516-
* @return ResourceModel\Address\Collection
516+
* @return \Magento\Customer\Model\ResourceModel\Address\Collection
517517
* @throws \Magento\Framework\Exception\LocalizedException
518518
*/
519519
public function getAddressesCollection()
@@ -600,7 +600,7 @@ public function hashPassword($password, $salt = true)
600600
* Validate password with salted hash
601601
*
602602
* @param string $password
603-
* @return bool
603+
* @return boolean
604604
* @throws \Exception
605605
*/
606606
public function validatePassword($password)

lib/web/mage/adminhtml/browser.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ define([
5252
content = '<div class="popup-window" id="' + windowId + '"></div>',
5353
self = this;
5454

55-
if (this.modalLoaded === true
56-
&& options
57-
&& self.targetElementId
58-
&& self.targetElementId === options.targetElementId) {
55+
if (this.modalLoaded === true &&
56+
options &&
57+
self.targetElementId &&
58+
self.targetElementId === options.targetElementId
59+
) {
5960
if (typeof options.closed !== 'undefined') {
6061
this.modal.modal('option', 'closed', options.closed);
6162
}

0 commit comments

Comments
 (0)