Skip to content

Commit 47385e5

Browse files
committed
MC-21671: [S4] Unreliable implementation for the release publishing functionality
1 parent f1d85cd commit 47385e5

File tree

8 files changed

+24
-17
lines changed

8 files changed

+24
-17
lines changed

app/code/Magento/Downloadable/Model/Sample/Builder.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
namespace Magento\Downloadable\Model\Sample;
77

88
use Magento\Downloadable\Api\Data\SampleInterface;
9-
use Magento\Catalog\Model\Product;
109
use Magento\Downloadable\Helper\File;
1110
use Magento\Downloadable\Model\Sample;
1211
use Magento\Downloadable\Model\SampleFactory;
@@ -24,7 +23,7 @@ class Builder
2423
* @var Sample
2524
*/
2625
private $component;
27-
26+
2827
/**
2928
* @var File
3029
*/
@@ -51,8 +50,6 @@ class Builder
5150
private $data = [];
5251

5352
/**
54-
* Mapper constructor.
55-
*
5653
* @param File $downloadableFile
5754
* @param Copy $objectCopyService
5855
* @param DataObjectHelper $dataObjectHelper
@@ -71,9 +68,10 @@ public function __construct(
7168
}
7269

7370
/**
71+
* Set data.
72+
*
7473
* @param array $data
75-
* @return $this;
76-
* @since 100.1.0
74+
* @return $this
7775
* @since 100.1.0
7876
*/
7977
public function setData(array $data)
@@ -83,6 +81,8 @@ public function setData(array $data)
8381
}
8482

8583
/**
84+
* Build sample object.
85+
*
8686
* @param SampleInterface $sample
8787
* @return SampleInterface
8888
* @throws \Magento\Framework\Exception\LocalizedException
@@ -123,6 +123,8 @@ public function build(SampleInterface $sample)
123123
}
124124

125125
/**
126+
* Reset data.
127+
*
126128
* @return void
127129
*/
128130
private function resetData()
@@ -131,6 +133,8 @@ private function resetData()
131133
}
132134

133135
/**
136+
* Return component.
137+
*
134138
* @return Sample
135139
*/
136140
private function getComponent()

app/code/Magento/Email/Controller/Adminhtml/Email/Template.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ abstract class Template extends \Magento\Backend\App\Action
2323
* Core registry
2424
*
2525
* @var \Magento\Framework\Registry
26-
* @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
26+
* @deprecated 101.0.0 in favor of stateful global objects elimination.
2727
*/
2828
protected $_coreRegistry = null;
2929

app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Quote\Model\Quote\Validator\MinimumOrderAmount;
77

8+
/**
9+
* Provide validation message.
10+
*/
811
class ValidationMessage
912
{
1013
/**
@@ -19,7 +22,7 @@ class ValidationMessage
1922

2023
/**
2124
* @var \Magento\Framework\Locale\CurrencyInterface
22-
* @deprecated 101.0.3 since 101.0.0
25+
* @deprecated 101.0.3
2326
*/
2427
private $currency;
2528

@@ -60,10 +63,14 @@ public function getMessage()
6063
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
6164
);
6265
if (!$message) {
63-
$minimumAmount = $this->priceHelper->currency($this->scopeConfig->getValue(
64-
'sales/minimum_order/amount',
65-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
66-
), true, false);
66+
$minimumAmount = $this->priceHelper->currency(
67+
$this->scopeConfig->getValue(
68+
'sales/minimum_order/amount',
69+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
70+
),
71+
true,
72+
false
73+
);
6774

6875
$message = __('Minimum order amount is %1', $minimumAmount);
6976
} else {

lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* @api
1010
* @since 102.0.3
11-
* @since 100.0.2
1211
*/
1312
interface EnvelopeInterface
1413
{

lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*
1111
* @api
1212
* @since 102.0.3
13-
* @since 100.0.2
1413
*/
1514
interface ExchangeInterface
1615
{

lib/internal/Magento/Framework/MessageQueue/Publisher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private function getPublisherConfig()
124124
*
125125
* @return AmqpConfig
126126
*
127-
* @deprecated 100.2.0 102.0.3
127+
* @deprecated 102.0.3
128128
*/
129129
private function getAmqpConfig()
130130
{

lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*
1111
* @api
1212
* @since 102.0.3
13-
* @since 100.0.2
1413
*/
1514
interface PublisherInterface
1615
{

lib/internal/Magento/Framework/MessageQueue/QueueInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*
1111
* @api
1212
* @since 102.0.3
13-
* @since 100.0.2
1413
*/
1514
interface QueueInterface
1615
{

0 commit comments

Comments
 (0)