Skip to content

Commit 98caaa4

Browse files
author
Stanislav Idolov
committed
Minor fixes for builds stabilization
1 parent b815483 commit 98caaa4

File tree

17 files changed

+119
-38
lines changed

17 files changed

+119
-38
lines changed

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,11 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
862862
);
863863
}
864864

865+
/**
866+
* @param string $tableAlias
867+
* @param \Zend_Db_Expr $priceExpression
868+
* @return \Zend_Db_Expr
869+
*/
865870
private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
866871
{
867872
return $this->getConnection()->getCheckSql(

‎app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ class PostTest extends \PHPUnit\Framework\TestCase
6565
*/
6666
private $mailMock;
6767

68+
/**
69+
* test setup
70+
*/
6871
protected function setUp()
6972
{
7073
$this->mailMock = $this->getMockBuilder(MailInterface::class)->getMockForAbstractClass();
@@ -120,6 +123,9 @@ protected function setUp()
120123
);
121124
}
122125

126+
/**
127+
* testExecuteEmptyPost
128+
*/
123129
public function testExecuteEmptyPost()
124130
{
125131
$this->stubRequestPostData([]);
@@ -159,6 +165,9 @@ public function postDataProvider()
159165
];
160166
}
161167

168+
/**
169+
* testExecuteValidPost
170+
*/
162171
public function testExecuteValidPost()
163172
{
164173
$post = ['name' => 'Name', 'comment' => 'Comment', 'email' => 'valid@mail.com', 'hideit' => null];

‎app/code/Magento/Customer/Block/Account/Navigation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public function getLinks()
4747
*/
4848
private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
4949
{
50-
return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
50+
return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
5151
}
5252
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ private function getAuthentication()
442442
}
443443

444444
/**
445-
* {@inheritdoc}
445+
* @inheritdoc
446446
*/
447447
public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
448448
{
@@ -465,7 +465,7 @@ public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
465465
}
466466

467467
/**
468-
* {@inheritdoc}
468+
* @inheritdoc
469469
*/
470470
public function activate($email, $confirmationKey)
471471
{
@@ -474,7 +474,7 @@ public function activate($email, $confirmationKey)
474474
}
475475

476476
/**
477-
* {@inheritdoc}
477+
* @inheritdoc
478478
*/
479479
public function activateById($customerId, $confirmationKey)
480480
{
@@ -514,7 +514,7 @@ private function activateCustomer($customer, $confirmationKey)
514514
}
515515

516516
/**
517-
* {@inheritdoc}
517+
* @inheritdoc
518518
*/
519519
public function authenticate($username, $password)
520520
{
@@ -549,7 +549,7 @@ public function authenticate($username, $password)
549549
}
550550

551551
/**
552-
* {@inheritdoc}
552+
* @inheritdoc
553553
*/
554554
public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken)
555555
{
@@ -558,7 +558,7 @@ public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkTo
558558
}
559559

560560
/**
561-
* {@inheritdoc}
561+
* @inheritdoc
562562
*/
563563
public function initiatePasswordReset($email, $template, $websiteId = null)
564564
{
@@ -611,7 +611,7 @@ private function handleUnknownTemplate($template)
611611
}
612612

613613
/**
614-
* {@inheritdoc}
614+
* @inheritdoc
615615
*/
616616
public function resetPassword($email, $resetToken, $newPassword)
617617
{
@@ -720,7 +720,7 @@ protected function getMinPasswordLength()
720720
}
721721

722722
/**
723-
* {@inheritdoc}
723+
* @inheritdoc
724724
*/
725725
public function getConfirmationStatus($customerId)
726726
{
@@ -736,7 +736,7 @@ public function getConfirmationStatus($customerId)
736736
}
737737

738738
/**
739-
* {@inheritdoc}
739+
* @inheritdoc
740740
*/
741741
public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
742742
{
@@ -758,7 +758,7 @@ public function createAccount(CustomerInterface $customer, $password = null, $re
758758
}
759759

760760
/**
761-
* {@inheritdoc}
761+
* @inheritdoc
762762
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
763763
* @SuppressWarnings(PHPMD.NPathComplexity)
764764
*/
@@ -841,7 +841,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
841841
}
842842

843843
/**
844-
* {@inheritdoc}
844+
* @inheritdoc
845845
*/
846846
public function getDefaultBillingAddress($customerId)
847847
{
@@ -850,7 +850,7 @@ public function getDefaultBillingAddress($customerId)
850850
}
851851

852852
/**
853-
* {@inheritdoc}
853+
* @inheritdoc
854854
*/
855855
public function getDefaultShippingAddress($customerId)
856856
{
@@ -885,7 +885,7 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
885885
}
886886

887887
/**
888-
* {@inheritdoc}
888+
* @inheritdoc
889889
*/
890890
public function changePassword($email, $currentPassword, $newPassword)
891891
{
@@ -898,7 +898,7 @@ public function changePassword($email, $currentPassword, $newPassword)
898898
}
899899

900900
/**
901-
* {@inheritdoc}
901+
* @inheritdoc
902902
*/
903903
public function changePasswordById($customerId, $currentPassword, $newPassword)
904904
{
@@ -966,7 +966,7 @@ private function getEavValidator()
966966
}
967967

968968
/**
969-
* {@inheritdoc}
969+
* @inheritdoc
970970
*/
971971
public function validate(CustomerInterface $customer)
972972
{
@@ -991,7 +991,7 @@ public function validate(CustomerInterface $customer)
991991
}
992992

993993
/**
994-
* {@inheritdoc}
994+
* @inheritdoc
995995
*/
996996
public function isEmailAvailable($customerEmail, $websiteId = null)
997997
{
@@ -1007,7 +1007,7 @@ public function isEmailAvailable($customerEmail, $websiteId = null)
10071007
}
10081008

10091009
/**
1010-
* {@inheritDoc}
1010+
* @inheritDoc
10111011
*/
10121012
public function isCustomerInStore($customerWebsiteId, $storeId)
10131013
{

‎app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,9 @@ public function testCreateAccountWithPasswordInputException(
789789
$this->accountManagement->createAccount($customer, $password);
790790
}
791791

792+
/**
793+
* @throws \Magento\Framework\Exception\LocalizedException
794+
*/
792795
public function testCreateAccountInputExceptionExtraLongPassword()
793796
{
794797
$password = '257*chars*************************************************************************************'
@@ -1146,11 +1149,11 @@ protected function prepareInitiatePasswordReset($email, $templateIdentifier, $se
11461149
}
11471150

11481151
/**
1149-
* @param $email
1150-
* @param $templateIdentifier
1151-
* @param $sender
1152-
* @param $storeId
1153-
* @param $customerName
1152+
* @param string $email
1153+
* @param int $templateIdentifier
1154+
* @param string $sender
1155+
* @param int $storeId
1156+
* @param string $customerName
11541157
*/
11551158
protected function prepareEmailSend($email, $templateIdentifier, $sender, $storeId, $customerName)
11561159
{
@@ -1185,6 +1188,9 @@ protected function prepareEmailSend($email, $templateIdentifier, $sender, $store
11851188
->method('sendMessage');
11861189
}
11871190

1191+
/**
1192+
* @throws \Magento\Framework\Exception\LocalizedException
1193+
*/
11881194
public function testInitiatePasswordResetEmailReminder()
11891195
{
11901196
$customerId = 1;
@@ -1208,6 +1214,9 @@ public function testInitiatePasswordResetEmailReminder()
12081214
$this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
12091215
}
12101216

1217+
/**
1218+
* @throws \Magento\Framework\Exception\LocalizedException
1219+
*/
12111220
public function testInitiatePasswordResetEmailReset()
12121221
{
12131222
$storeId = 1;
@@ -1230,6 +1239,9 @@ public function testInitiatePasswordResetEmailReset()
12301239
$this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
12311240
}
12321241

1242+
/**
1243+
* @throws \Magento\Framework\Exception\LocalizedException
1244+
*/
12331245
public function testInitiatePasswordResetNoTemplate()
12341246
{
12351247
$storeId = 1;

‎app/code/Magento/Eav/Api/Data/AttributeInterface.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
* @api
1212
* @since 100.0.2
1313
*/
14-
interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface,
14+
interface AttributeInterface
15+
extends \Magento\Framework\Api\CustomAttributesDataInterface,
1516
\Magento\Framework\Api\MetadataObjectInterface
1617
{
1718
const ATTRIBUTE_ID = 'attribute_id';

‎app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ class PrintActionTest extends \PHPUnit\Framework\TestCase
8181
*/
8282
protected $resultForwardMock;
8383

84+
/**
85+
* test setup
86+
*/
8487
protected function setUp()
8588
{
8689
$this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)

‎app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function _prepareColumns()
120120
}
121121

122122
/**
123-
* {@inheritdoc}
123+
* @inheritdoc
124124
*/
125125
public function getRowUrl($row)
126126
{

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ class Edit extends \Magento\Backend\App\Action
3333
/**
3434
* Edit constructor.
3535
*
36-
* @param \Magento\Backend\App\Action\Context $context
37-
* @param \Magento\Framework\Registry $registry
36+
* @param \Magento\Backend\App\Action\Context $context
37+
* @param \Magento\Framework\Registry $registry
3838
* @param \Magento\Search\Controller\Adminhtml\Synonyms\ResultPageBuilder $pageBuilder
39-
* @param \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
39+
* @param \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
4040
*/
4141
public function __construct(
4242
\Magento\Backend\App\Action\Context $context,

‎app/code/Magento/Search/Model/SynonymGroupRepository.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct(
4545
}
4646

4747
/**
48-
* {@inheritdoc}
48+
* @inheritdoc
4949
*/
5050
public function save(SynonymGroupInterface $synonymGroup, $errorOnMergeConflict = false)
5151
{
@@ -103,7 +103,7 @@ public function get($synonymGroupId)
103103
* Private helper to create a synonym group, throw exception on merge conflict
104104
*
105105
* @param SynonymGroupInterface $synonymGroup
106-
* @param bool $errorOnMergeConflict
106+
* @param bool $errorOnMergeConflict
107107
* @return SynonymGroupInterface
108108
* @throws Synonym\MergeConflictException
109109
* @throws \Magento\Framework\Exception\AlreadyExistsException
@@ -143,7 +143,7 @@ private function create(SynonymGroupInterface $synonymGroup, $errorOnMergeConfli
143143
* Perform synonyms merge
144144
*
145145
* @param SynonymGroupInterface $synonymGroupToMerge
146-
* @param array $matchingGroupIds
146+
* @param array $matchingGroupIds
147147
* @return array
148148
* @throws \Exception
149149
*/
@@ -179,9 +179,9 @@ private function populateSynonymGroupModel(SynonymGroup $modelToPopulate, Synony
179179
/**
180180
* Private helper to update a synonym group, throw exception on merge conflict
181181
*
182-
* @param SynonymGroup $oldSynonymGroup
182+
* @param SynonymGroup $oldSynonymGroup
183183
* @param SynonymGroupInterface $newSynonymGroup
184-
* @param bool $errorOnMergeConflict
184+
* @param bool $errorOnMergeConflict
185185
* @return SynonymGroupInterface
186186
* @throws Synonym\MergeConflictException
187187
* @throws \Magento\Framework\Exception\AlreadyExistsException

0 commit comments

Comments
 (0)