Skip to content

Commit eb7d819

Browse files
engcom-Echoengcom-Echo
committed
Refactoring
1 parent 779301e commit eb7d819

File tree

17 files changed

+188
-149
lines changed

17 files changed

+188
-149
lines changed

‎app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Customer\Observer;
89

@@ -17,6 +18,7 @@
1718
use Magento\Framework\App\State as AppState;
1819
use Magento\Framework\DataObject;
1920
use Magento\Framework\Escaper;
21+
use Magento\Framework\Event\Observer;
2022
use Magento\Framework\Event\ObserverInterface;
2123
use Magento\Framework\Message\ManagerInterface;
2224
use Magento\Framework\Registry;
@@ -25,6 +27,7 @@
2527
/**
2628
* Customer Observer Model
2729
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
30+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2831
*/
2932
class AfterAddressSaveObserver implements ObserverInterface
3033
{
@@ -114,11 +117,11 @@ public function __construct(
114117
/**
115118
* Address after save event handler
116119
*
117-
* @param \Magento\Framework\Event\Observer $observer
120+
* @param Observer $observer
118121
* @return void
119122
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
120123
*/
121-
public function execute(\Magento\Framework\Event\Observer $observer)
124+
public function execute(Observer $observer)
122125
{
123126
/** @var $customerAddress Address */
124127
$customerAddress = $observer->getCustomerAddress();

‎app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -80,29 +80,23 @@ class AfterAddressSaveObserverTest extends TestCase
8080
protected $appState;
8181

8282
/**
83-
* @var Customer|MockObject
83+
* @var Session|MockObject
8484
*/
85-
protected $customerMock;
85+
protected $customerSessionMock;
8686

8787
/**
88-
* @var Session|MockObject
88+
* @var GroupInterface|MockObject
8989
*/
90-
protected $customerSessionMock;
90+
protected $group;
9191

9292
protected function setUp(): void
9393
{
94-
$this->vat = $this->getMockBuilder(Vat::class)
95-
->disableOriginalConstructor()
96-
->getMock();
97-
98-
$this->helperAddress = $this->getMockBuilder(\Magento\Customer\Helper\Address::class)
99-
->disableOriginalConstructor()
100-
->getMock();
101-
102-
$this->registry = $this->getMockBuilder(Registry::class)
103-
->disableOriginalConstructor()
104-
->getMock();
105-
94+
$this->vat = $this->createMock(Vat::class);
95+
$this->helperAddress = $this->createMock(HelperAddress::class);
96+
$this->registry = $this->createMock(Registry::class);
97+
$this->escaper = $this->createMock(Escaper::class);
98+
$this->appState = $this->createMock(AppState::class);
99+
$this->customerSessionMock = $this->createMock(Session::class);
106100
$this->group = $this->getMockBuilder(GroupInterface::class)
107101
->setMethods(['getId'])
108102
->getMockForAbstractClass();
@@ -114,22 +108,9 @@ protected function setUp(): void
114108

115109
$this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
116110
->getMockForAbstractClass();
117-
118111
$this->messageManager = $this->getMockBuilder(ManagerInterface::class)
119112
->getMockForAbstractClass();
120113

121-
$this->escaper = $this->getMockBuilder(Escaper::class)
122-
->disableOriginalConstructor()
123-
->getMock();
124-
125-
$this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
126-
->disableOriginalConstructor()
127-
->getMock();
128-
129-
$this->customerSessionMock = $this->getMockBuilder(Session::class)
130-
->disableOriginalConstructor()
131-
->getMock();
132-
133114
$this->model = new AfterAddressSaveObserver(
134115
$this->vat,
135116
$this->helperAddress,

‎app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,36 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
810

11+
use Magento\Catalog\Controller\Adminhtml\Product\Edit as ProductEdit;
912
use Magento\Downloadable\Helper\Download as DownloadHelper;
13+
use Magento\Downloadable\Helper\File;
14+
use Magento\Downloadable\Model\Link as ModelLink;
1015
use Magento\Framework\App\Response\Http as HttpResponse;
1116

12-
class Link extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
17+
class Link extends ProductEdit
1318
{
1419
/**
15-
* @return \Magento\Downloadable\Model\Link
20+
* Create link
21+
*
22+
* @return ModelLink
1623
*/
1724
protected function _createLink()
1825
{
19-
return $this->_objectManager->create(\Magento\Downloadable\Model\Link::class);
26+
return $this->_objectManager->create(ModelLink::class);
2027
}
2128

2229
/**
23-
* @return \Magento\Downloadable\Model\Link
30+
* Get link
31+
*
32+
* @return ModelLink
2433
*/
2534
protected function _getLink()
2635
{
27-
return $this->_objectManager->get(\Magento\Downloadable\Model\Link::class);
36+
return $this->_objectManager->get(ModelLink::class);
2837
}
2938

3039
/**
@@ -34,10 +43,10 @@ protected function _getLink()
3443
* @param string $resourceType
3544
* @return void
3645
*/
37-
protected function _processDownload($resource, $resourceType)
46+
protected function _processDownload(string $resource, string $resourceType)
3847
{
39-
/* @var $helper \Magento\Downloadable\Helper\Download */
40-
$helper = $this->_objectManager->get(\Magento\Downloadable\Helper\Download::class);
48+
/* @var $helper DownloadHelper */
49+
$helper = $this->_objectManager->get(DownloadHelper::class);
4150
$helper->setResource($resource, $resourceType);
4251

4352
$fileName = $helper->getFilename();
@@ -77,7 +86,7 @@ protected function _processDownload($resource, $resourceType)
7786
//Rendering
7887
$response->clearBody();
7988
$response->sendHeaders();
80-
89+
8190
$helper->output();
8291
}
8392

@@ -90,7 +99,7 @@ public function execute()
9099
{
91100
$linkId = $this->getRequest()->getParam('id', 0);
92101
$type = $this->getRequest()->getParam('type', 0);
93-
/** @var \Magento\Downloadable\Model\Link $link */
102+
/** @var ModelLink $link */
94103
$link = $this->_createLink()->load($linkId);
95104
if ($link->getId()) {
96105
$resource = '';
@@ -101,7 +110,7 @@ public function execute()
101110
$resourceType = DownloadHelper::LINK_TYPE_URL;
102111
} elseif ($link->getLinkType() == DownloadHelper::LINK_TYPE_FILE) {
103112
$resource = $this->_objectManager->get(
104-
\Magento\Downloadable\Helper\File::class
113+
File::class
105114
)->getFilePath(
106115
$this->_getLink()->getBasePath(),
107116
$link->getLinkFile()
@@ -114,7 +123,7 @@ public function execute()
114123
$resourceType = DownloadHelper::LINK_TYPE_URL;
115124
} elseif ($link->getSampleType() == DownloadHelper::LINK_TYPE_FILE) {
116125
$resource = $this->_objectManager->get(
117-
\Magento\Downloadable\Helper\File::class
126+
File::class
118127
)->getFilePath(
119128
$this->_getLink()->getBaseSamplePath(),
120129
$link->getSampleFile()

‎app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,33 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
810

911
use Magento\Downloadable\Helper\Download as DownloadHelper;
12+
use Magento\Downloadable\Model\Sample as ModelSample;
1013

11-
class Sample extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Link
14+
class Sample extends Link
1215
{
1316
/**
14-
* @return \Magento\Downloadable\Model\Sample
17+
* Create link
18+
*
19+
* @return ModelSample
1520
*/
1621
protected function _createLink()
1722
{
18-
return $this->_objectManager->create(\Magento\Downloadable\Model\Sample::class);
23+
return $this->_objectManager->create(ModelSample::class);
1924
}
2025

2126
/**
22-
* @return \Magento\Downloadable\Model\Sample
27+
* Get link
28+
*
29+
* @return ModelSample
2330
*/
2431
protected function _getLink()
2532
{
26-
return $this->_objectManager->get(\Magento\Downloadable\Model\Sample::class);
33+
return $this->_objectManager->get(ModelSample::class);
2734
}
2835

2936
/**
@@ -34,7 +41,7 @@ protected function _getLink()
3441
public function execute()
3542
{
3643
$sampleId = $this->getRequest()->getParam('id', 0);
37-
/** @var \Magento\Downloadable\Model\Sample $sample */
44+
/** @var ModelSample $sample */
3845
$sample = $this->_createLink()->load($sampleId);
3946
if ($sample->getId()) {
4047
$resource = '';

‎app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ public function testExecuteUrl()
184184
->willReturn('1');
185185
$this->sampleModel->expects($this->any())->method('getSampleType')
186186
->willReturn('url');
187+
$this->sampleModel->expects($this->once())->method('getSampleUrl')
188+
->willReturn('http://example.com/simple.jpg');
187189
$this->objectManager->expects($this->once())->method('create')
188190
->willReturn($this->sampleModel);
189191

‎app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,71 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\ImportExport\Controller\Adminhtml\Import;
79

10+
use Magento\Backend\App\Action\Context;
11+
use Magento\Framework\App\Action\HttpGetActionInterface;
812
use Magento\Framework\App\Filesystem\DirectoryList;
13+
use Magento\Framework\App\ObjectManager;
14+
use Magento\Framework\App\Response\Http\FileFactory;
915
use Magento\Framework\Component\ComponentRegistrar;
16+
use Magento\Framework\Controller\Result\Raw;
17+
use Magento\Framework\Controller\Result\RawFactory;
1018
use Magento\Framework\Controller\Result\Redirect;
1119
use Magento\Framework\Exception\NoSuchEntityException;
20+
use Magento\Framework\Filesystem\Directory\ReadFactory;
1221
use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
22+
use Magento\ImportExport\Model\Import\SampleFileProvider;
1323

1424
/**
1525
* Download sample file controller
1626
*/
17-
class Download extends ImportController
27+
class Download extends ImportController implements HttpGetActionInterface
1828
{
1929
const SAMPLE_FILES_MODULE = 'Magento_ImportExport';
2030

2131
/**
22-
* @var \Magento\Framework\Controller\Result\RawFactory
32+
* @var RawFactory
2333
*/
2434
protected $resultRawFactory;
2535

2636
/**
27-
* @var \Magento\Framework\Filesystem\Directory\ReadFactory
37+
* @var ReadFactory
2838
*/
2939
protected $readFactory;
3040

3141
/**
32-
* @var \Magento\Framework\Component\ComponentRegistrar
42+
* @var ComponentRegistrar
3343
*/
3444
protected $componentRegistrar;
3545

3646
/**
37-
* @var \Magento\Framework\App\Response\Http\FileFactory
47+
* @var FileFactory
3848
*/
3949
protected $fileFactory;
4050

4151
/**
42-
* @var \Magento\ImportExport\Model\Import\SampleFileProvider
52+
* @var SampleFileProvider
4353
*/
4454
private $sampleFileProvider;
4555

4656
/**
47-
* @param \Magento\Backend\App\Action\Context $context
48-
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
49-
* @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
50-
* @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
51-
* @param \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider
57+
* @param Context $context
58+
* @param FileFactory $fileFactory
59+
* @param RawFactory $resultRawFactory
60+
* @param ReadFactory $readFactory
5261
* @param ComponentRegistrar $componentRegistrar
53-
* @param \Magento\ImportExport\Model\Import\SampleFileProvider|null $sampleFileProvider
62+
* @param SampleFileProvider|null $sampleFileProvider
5463
*/
5564
public function __construct(
56-
\Magento\Backend\App\Action\Context $context,
57-
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
58-
\Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
59-
\Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
60-
\Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
61-
\Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider = null
65+
Context $context,
66+
FileFactory $fileFactory,
67+
RawFactory $resultRawFactory,
68+
ReadFactory $readFactory,
69+
ComponentRegistrar $componentRegistrar,
70+
SampleFileProvider $sampleFileProvider = null
6271
) {
6372
parent::__construct(
6473
$context
@@ -68,14 +77,14 @@ public function __construct(
6877
$this->readFactory = $readFactory;
6978
$this->componentRegistrar = $componentRegistrar;
7079
$this->sampleFileProvider = $sampleFileProvider
71-
?: \Magento\Framework\App\ObjectManager::getInstance()
72-
->get(\Magento\ImportExport\Model\Import\SampleFileProvider::class);
80+
?: ObjectManager::getInstance()
81+
->get(SampleFileProvider::class);
7382
}
7483

7584
/**
7685
* Download sample file action
7786
*
78-
* @return \Magento\Framework\Controller\Result\Raw
87+
* @return Raw
7988
*/
8089
public function execute()
8190
{
@@ -105,13 +114,15 @@ public function execute()
105114
$fileSize
106115
);
107116

108-
/** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
109117
$resultRaw = $this->resultRawFactory->create();
110118
$resultRaw->setContents($fileContents);
119+
111120
return $resultRaw;
112121
}
113122

114123
/**
124+
* Get redirect result
125+
*
115126
* @return Redirect
116127
*/
117128
private function getResultRedirect(): Redirect

0 commit comments

Comments
 (0)