Skip to content

Commit 3bb11bb

Browse files
committed
Simplify some conditional checks
1 parent 250045e commit 3bb11bb

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,7 @@ private function executeHandler($callback, $entityParams)
206206
}
207207
} catch (NoSuchEntityException $e) {
208208
$this->logger->error($e->getMessage());
209-
$result['status'] = ($e instanceof TemporaryStateExceptionInterface) ?
210-
OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED :
211-
OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
209+
$result['status'] = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
212210
$result['error_code'] = $e->getCode();
213211
$result['messages'][] = $e->getMessage();
214212
} catch (LocalizedException $e) {

app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,7 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
154154
$this->stateFactoryMock->expects($this->once())->method('create')->will($this->returnValue($stateMock));
155155

156156
if ($getViewIsEnabled && $getViewGetUpdated) {
157-
if (!$getStateGetUpdated) {
158-
$this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
159-
} else {
160-
if ($getViewGetUpdated == $getStateGetUpdated) {
161-
$this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
162-
} else {
163-
$this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
164-
}
165-
}
157+
$this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
166158
} else {
167159
$this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
168160
}

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ define([
822822
],
823823
'validate-state': [
824824
function (value) {
825-
return value !== 0 || value === '';
825+
return value !== 0;
826826
},
827827
$.mage.__('Please select State/Province.')
828828
],

lib/web/mage/validation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@
11221122
],
11231123
'validate-state': [
11241124
function (v) {
1125-
return v !== 0 || v === '';
1125+
return v !== 0;
11261126
},
11271127
$.mage.__('Please select State/Province.')
11281128
],

0 commit comments

Comments
 (0)