Skip to content

Commit 0e487b4

Browse files
DianaRusinDianaRusin
committed
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-58213
2 parents e509cb5 + 94ccd58 commit 0e487b4

File tree

293 files changed

+12324
-3518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+12324
-3518
lines changed

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ public function getPopupTitle()
7777
$messageCount = count($this->_messages->getUnread());
7878
if ($messageCount > 1) {
7979
return __('You have %1 new system messages', $messageCount);
80-
} else {
81-
return __('You have %1 new system message', $messageCount);
8280
}
81+
return __('You have %1 new system message', $messageCount);
8382
}
8483

8584
/**

‎app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,9 @@ protected function _getLatestItem()
9898
{
9999
if ($this->_latestItem == null) {
100100
$items = array_values($this->_criticalCollection->getItems());
101+
$this->_latestItem = false;
101102
if (count($items)) {
102103
$this->_latestItem = $items[0];
103-
} else {
104-
$this->_latestItem = false;
105104
}
106105
}
107106
return $this->_latestItem;

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
"require": {
88
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
99
"lib-libxml": "*",
10-
"magento/framework": "100.3.*",
11-
"magento/module-backend": "100.3.*",
12-
"magento/module-media-storage": "100.3.*",
13-
"magento/module-store": "100.3.*",
14-
"magento/module-ui": "100.3.*"
10+
"magento/framework": "*",
11+
"magento/module-backend": "*",
12+
"magento/module-media-storage": "*",
13+
"magento/module-store": "*",
14+
"magento/module-ui": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "100.3.0-dev",
1817
"license": [
1918
"OSL-3.0",
2019
"AFL-3.0"

‎app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,8 @@ protected function _getCustomerGroupById(
626626
): string {
627627
if ($allGroups !== 0) {
628628
return ImportAdvancedPricing::VALUE_ALL_GROUPS;
629-
} else {
630-
return $this->_groupRepository->getById($groupId)->getCode();
631629
}
630+
return $this->_groupRepository->getById($groupId)->getCode();
632631
}
633632

634633
/**

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,8 @@ protected function deleteProductTierPrices(array $listSku, $table)
482482
$this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, 0);
483483
return false;
484484
}
485-
} else {
486-
return false;
487485
}
486+
return false;
488487
}
489488

490489
/**

‎app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
},
77
"require": {
88
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9-
"magento/framework": "100.3.*",
10-
"magento/module-catalog": "101.2.*",
11-
"magento/module-catalog-import-export": "100.3.*",
12-
"magento/module-catalog-inventory": "100.3.*",
13-
"magento/module-customer": "100.3.*",
14-
"magento/module-eav": "100.3.*",
15-
"magento/module-import-export": "100.3.*",
16-
"magento/module-store": "100.3.*"
9+
"magento/framework": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-catalog-import-export": "*",
12+
"magento/module-catalog-inventory": "*",
13+
"magento/module-customer": "*",
14+
"magento/module-eav": "*",
15+
"magento/module-import-export": "*",
16+
"magento/module-store": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.3.0-dev",
2019
"license": [
2120
"OSL-3.0",
2221
"AFL-3.0"

‎app/code/Magento/AdvancedSearch/composer.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"magento/framework": "100.3.*",
9-
"magento/module-backend": "100.3.*",
10-
"magento/module-catalog": "101.2.*",
11-
"magento/module-catalog-search": "100.3.*",
12-
"magento/module-config": "100.3.*",
13-
"magento/module-customer": "100.3.*",
14-
"magento/module-search": "100.3.*",
15-
"magento/module-store": "100.3.*",
8+
"magento/framework": "*",
9+
"magento/module-backend": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-catalog-search": "*",
12+
"magento/module-config": "*",
13+
"magento/module-customer": "*",
14+
"magento/module-search": "*",
15+
"magento/module-store": "*",
1616
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.3.0-dev",
2019
"license": [
2120
"proprietary"
2221
],

‎app/code/Magento/Amqp/composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"magento/framework": "100.3.*",
9-
"magento/framework-amqp": "100.1.*",
10-
"magento/framework-message-queue": "100.3.*",
8+
"magento/framework": "*",
9+
"magento/framework-amqp": "*",
10+
"magento/framework-message-queue": "*",
1111
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.3.0-dev",
1514
"license": [
1615
"proprietary"
1716
],

‎app/code/Magento/Analytics/Model/Config/Backend/Enabled.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,7 @@ public function afterSave()
6767
try {
6868
if ($this->isValueChanged()) {
6969
$enabled = $this->getData('value');
70-
71-
if ($enabled) {
72-
$this->subscriptionHandler->processEnabled();
73-
} else {
74-
$this->subscriptionHandler->processDisabled();
75-
}
70+
$enabled ? $this->subscriptionHandler->processEnabled() : $this->subscriptionHandler->processDisabled();
7671
}
7772
} catch (\Exception $e) {
7873
$this->_logger->error($e->getMessage());

‎app/code/Magento/Analytics/composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-backend": "100.3.*",
7-
"magento/module-config": "100.3.*",
8-
"magento/module-integration": "100.3.*",
9-
"magento/module-store": "100.3.*",
10-
"magento/framework": "100.3.*"
6+
"magento/module-backend": "*",
7+
"magento/module-config": "*",
8+
"magento/module-integration": "*",
9+
"magento/module-store": "*",
10+
"magento/framework": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.3.0-dev",
1413
"license": [
1514
"OSL-3.0",
1615
"AFL-3.0"

0 commit comments

Comments
 (0)