Skip to content

Commit f658498

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #14906: [Forwardport] Corrected @param in comment block (by @rostyslav-hymon) - #14907: [Forwardport] Fix typo in doc for updateSpecificCoupons (by @rostyslav-hymon) - #14799: FIX for issue https://github.com/magento-engcom/php-7.2-support/issue… (by @phoenix128)
2 parents 29850c2 + 94e18e3 commit f658498

File tree

4 files changed

+38
-2
lines changed

4 files changed

+38
-2
lines changed

app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Export extends \Magento\Framework\Data\Form\Element\AbstractElement
2121
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
2222
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
2323
* @param \Magento\Framework\Escaper $escaper
24-
* @param \Magento\Backend\Helper\Data $helper
24+
* @param \Magento\Backend\Model\UrlInterface $backendUrl
2525
* @param array $data
2626
*/
2727
public function __construct(

app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function exists($code)
106106
}
107107

108108
/**
109-
* Update auto generated Specific Coupon if it's rule changed
109+
* Update auto generated Specific Coupon if its rule changed
110110
*
111111
* @param \Magento\SalesRule\Model\Rule $rule
112112
* @return $this

lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,32 @@ class Interceptor extends \Magento\Framework\Interception\Code\Generator\TSample
1212
$this->___init();
1313
}
1414

15+
/**
16+
* {@inheritdoc}
17+
*/
18+
public function returnVoid() : void
19+
{
20+
$pluginInfo = $this->pluginList->getNext($this->subjectType, 'returnVoid');
21+
if (!$pluginInfo) {
22+
parent::returnVoid();
23+
} else {
24+
$this->___callPlugins('returnVoid', func_get_args(), $pluginInfo);
25+
}
26+
}
27+
28+
/**
29+
* {@inheritdoc}
30+
*/
31+
public function getNullableValue() : ?string
32+
{
33+
$pluginInfo = $this->pluginList->getNext($this->subjectType, 'getNullableValue');
34+
if (!$pluginInfo) {
35+
return parent::getNullableValue();
36+
} else {
37+
return $this->___callPlugins('getNullableValue', func_get_args(), $pluginInfo);
38+
}
39+
}
40+
1541
/**
1642
* {@inheritdoc}
1743
*/

lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ class TSample
1010
private $value;
1111
private $variadicValue;
1212

13+
public function returnVoid() : void
14+
{
15+
// Nothing to do here
16+
}
17+
18+
public function getNullableValue() : ?string
19+
{
20+
return null;
21+
}
22+
1323
public function getValue() : string
1424
{
1525
return $this->value;

0 commit comments

Comments
 (0)