Skip to content

Commit 4560978

Browse files
committed
Merge branch 'master' into magento2.4.x
2 parents aa44a28 + d3bcd3b commit 4560978

File tree

206 files changed

+1348
-1819
lines changed

Some content is hidden

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

206 files changed

+1348
-1819
lines changed

Block/Adminhtml/Action/Edit/BackButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class BackButton implements ButtonProviderInterface
1616
/**
1717
* @var UrlInterface
1818
*/
19-
private $urlBuilder;
19+
private UrlInterface $urlBuilder;
2020

2121
public function __construct(
2222
UrlInterface $urlBuilder

Block/Adminhtml/Config/Form/Field/Select/OptionSourceSelect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class OptionSourceSelect extends Select
1616
/**
1717
* @var OptionSourceInterface
1818
*/
19-
private $optionSource;
19+
private OptionSourceInterface $optionSource;
2020

2121
public function __construct(
2222
Context $context,

Block/Adminhtml/Customer/Edit/EraseButton.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,9 @@
1717

1818
final class EraseButton extends GenericButton implements ButtonProviderInterface
1919
{
20-
/**
21-
* @var EraseEntityCheckerInterface
22-
*/
23-
private $eraseCustomerChecker;
24-
25-
/**
26-
* @var Config
27-
*/
28-
private $config;
20+
private EraseEntityCheckerInterface $eraseCustomerChecker;
21+
22+
private Config $config;
2923

3024
public function __construct(
3125
Context $context,

Block/Adminhtml/Customer/Edit/ExportButton.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616

1717
final class ExportButton extends GenericButton implements ButtonProviderInterface
1818
{
19-
/**
20-
* @var Config
21-
*/
22-
private $config;
19+
private Config $config;
2320

2421
public function __construct(
2522
Context $context,

Block/Adminhtml/Order/Edit/EraseButton.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616

1717
class EraseButton extends AbstractBlock
1818
{
19-
/**
20-
* @var EraseEntityCheckerInterface
21-
*/
22-
private $eraseEntityChecker;
19+
private EraseEntityCheckerInterface $eraseEntityChecker;
2320

2421
public function __construct(
2522
Context $context,

Console/Command/EraseCommand.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,13 @@ class EraseCommand extends Command
2525
private const INPUT_ARGUMENT_ENTITY_ID = 'entity_id';
2626
private const INPUT_ARGUMENT_ENTITY_TYPE = 'entity_type';
2727

28-
/**
29-
* @var State
30-
*/
31-
private $appState;
28+
private State $appState;
3229

33-
/**
34-
* @var Registry
35-
*/
36-
private $registry;
30+
private Registry $registry;
3731

38-
/**
39-
* @var ActionInterface
40-
*/
41-
private $action;
32+
private ActionInterface $action;
4233

43-
/**
44-
* @var ContextBuilder
45-
*/
46-
private $actionContextBuilder;
34+
private ContextBuilder $actionContextBuilder;
4735

4836
public function __construct(
4937
State $appState,

Console/Command/ExportCommand.php

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,11 @@ class ExportCommand extends Command
2929
private const INPUT_ARGUMENT_ENTITY_TYPE = 'entity_type';
3030
private const INPUT_OPTION_FILENAME = 'filename';
3131

32-
/**
33-
* @var State
34-
*/
35-
private $appState;
32+
private State $appState;
3633

37-
/**
38-
* @var ActionInterface
39-
*/
40-
private $action;
34+
private ActionInterface $action;
4135

42-
/**
43-
* @var ContextBuilder
44-
*/
45-
private $actionContextBuilder;
36+
private ContextBuilder $actionContextBuilder;
4637

4738
public function __construct(
4839
State $appState,

Controller/AbstractAction.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,13 @@
1919

2020
abstract class AbstractAction implements ActionInterface
2121
{
22-
/**
23-
* @var RequestInterface
24-
*/
25-
protected $request;
22+
protected RequestInterface $request;
2623

27-
/**
28-
* @var ResultFactory
29-
*/
30-
protected $resultFactory;
24+
protected ResultFactory $resultFactory;
3125

32-
/**
33-
* @var ManagerInterface
34-
*/
35-
protected $messageManager;
26+
protected ManagerInterface $messageManager;
3627

37-
/**
38-
* @var Config
39-
*/
40-
protected $config;
28+
protected Config $config;
4129

4230
public function __construct(
4331
RequestInterface $request,

Controller/AbstractGuest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ abstract class AbstractGuest extends AbstractAction
2121
/**
2222
* @var OrderLoaderInterface
2323
*/
24-
protected $orderLoader;
24+
protected OrderLoaderInterface $orderLoader;
2525

26-
/**
27-
* @var Registry
28-
*/
29-
protected $registry;
26+
protected Registry $registry;
3027

3128
public function __construct(
3229
RequestInterface $request,

Controller/AbstractPrivacy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ abstract class AbstractPrivacy extends AbstractAction
2626
/**
2727
* @var Session
2828
*/
29-
protected $customerSession;
29+
protected Session $customerSession;
3030

3131
/**
3232
* @var Http
3333
*/
34-
private $response;
34+
private Http $response;
3535

3636
public function __construct(
3737
RequestInterface $request,

0 commit comments

Comments
 (0)