Skip to content

Commit 5a836ab

Browse files
committed
MC-13825: [2.4.x] Migrate ZF2 components to Laminas
1 parent 3f0bde0 commit 5a836ab

File tree

101 files changed

+599
-290
lines changed

Some content is hidden

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

101 files changed

+599
-290
lines changed

app/code/Magento/CacheInvalidate/Model/PurgeCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Magento\Framework\Cache\InvalidateLogger;
99

1010
/**
11-
* Class PurgeCache
11+
* PurgeCache model
1212
*/
1313
class PurgeCache
1414
{

app/code/Magento/CacheInvalidate/Model/SocketFactory.php

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

10+
/**
11+
* Factory for the \Laminas\Http\Client\Adapter\Socket
12+
*/
813
class SocketFactory
914
{
1015
/**
16+
* Create object
17+
*
1118
* @return \Laminas\Http\Client\Adapter\Socket
1219
*/
1320
public function create()

app/code/Magento/Captcha/Model/ResourceModel/Log.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class Log extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1414
{
1515
/**
16-
* Type Remote Address
16+
* Remote Address log type
1717
*/
1818
const TYPE_REMOTE_ADDRESS = 1;
1919

app/code/Magento/Catalog/Controller/Product/Frontend/Action/Synchronize.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77

88
use Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer;
99
use Magento\Framework\App\Action\Context;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
1011
use Magento\Framework\Controller\Result\JsonFactory;
1112

1213
/**
1314
* Synchronizes Product Frontend Actions with database
1415
*/
15-
class Synchronize extends \Magento\Framework\App\Action\Action
16+
class Synchronize extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
1617
{
1718
/**
1819
* @var Context
@@ -46,6 +47,8 @@ public function __construct(
4647
}
4748

4849
/**
50+
* @inheritDoc
51+
*
4952
* This is handle for synchronizing between frontend and backend product actions:
5053
* - visit product page (recently_viewed)
5154
* - compare products (recently_compared)
@@ -57,9 +60,6 @@ public function __construct(
5760
* 'added_at' => "JS_TIMESTAMP"
5861
* ]
5962
* ]
60-
*
61-
*
62-
* @inheritdoc
6363
*/
6464
public function execute()
6565
{

app/code/Magento/Checkout/Model/Cart/RequestQuantityProcessor.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
use Magento\Framework\Locale\ResolverInterface;
1111

12+
/**
13+
* Cart request quantity processor
14+
*/
1215
class RequestQuantityProcessor
1316
{
1417
/**

app/code/Magento/Downloadable/Setup/Patch/Data/AddDownloadableHostsConfig.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@
77

88
namespace Magento\Downloadable\Setup\Patch\Data;
99

10+
use Laminas\Uri\Uri as UriHandler;
11+
use Magento\Backend\App\Area\FrontNameResolver;
1012
use Magento\Config\Model\Config\Backend\Admin\Custom;
13+
use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
1114
use Magento\Framework\App\Config\ScopeConfigInterface;
1215
use Magento\Framework\Exception\NoSuchEntityException;
16+
use Magento\Framework\Setup\ModuleDataSetupInterface;
1317
use Magento\Framework\Setup\Patch\DataPatchInterface;
18+
use Magento\Framework\Url\ScopeResolverInterface;
1419
use Magento\Framework\UrlInterface;
1520
use Magento\Store\Model\ScopeInterface;
1621
use Magento\Store\Model\Store;
17-
use Laminas\Uri\Uri as UriHandler;
18-
use Magento\Framework\Url\ScopeResolverInterface;
19-
use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
20-
use Magento\Framework\Setup\ModuleDataSetupInterface;
21-
use Magento\Backend\App\Area\FrontNameResolver;
2222

2323
/**
2424
* Adding base url as allowed downloadable domain.
25+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2526
*/
2627
class AddDownloadableHostsConfig implements DataPatchInterface
2728
{
@@ -79,7 +80,7 @@ public function __construct(
7980
}
8081

8182
/**
82-
* @inheritdoc
83+
* @inheritDoc
8384
*/
8485
public function apply()
8586
{

app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ protected function setUp()
111111
);
112112

113113
$this->validDataArray = [
114-
'key' => md5(uniqid()),
115-
'secret' => md5(uniqid()),
114+
'key' => md5(uniqid()), // phpcs:ignore Magento2.Security.InsecureFunction
115+
'secret' => md5(uniqid()), // phpcs:ignore Magento2.Security.InsecureFunction
116116
'callback_url' => 'http://example.com/callback',
117117
'rejected_callback_url' => 'http://example.com/rejectedCallback'
118118
];

app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public function __construct(
5353
}
5454

5555
/**
56+
* Add PageCache functionality to Dispatch method
57+
*
5658
* @param \Magento\Framework\App\FrontControllerInterface $subject
5759
* @param callable $proceed
5860
* @param \Magento\Framework\App\RequestInterface $request

app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ class ServerTest extends \PHPUnit\Framework\TestCase
2323
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\UrlInterface */
2424
protected $urlBuilderMock;
2525

26+
/** @var \PHPUnit_Framework_MockObject_MockObject| \Magento\Framework\Cache\InvalidateLogger */
27+
private $loggerMock;
28+
2629
protected function setUp()
2730
{
2831
$this->configMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);

app/code/Magento/Quote/Model/Quote/Item/Updater.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
use Magento\Catalog\Model\ProductFactory;
99
use Magento\Framework\Locale\FormatInterface;
1010
use Magento\Framework\DataObject\Factory as ObjectFactory;
11-
use Magento\Quote\Model\Quote;
1211
use Magento\Quote\Model\Quote\Item;
1312
use Laminas\Code\Exception\InvalidArgumentException;
1413

1514
/**
16-
* Class Updater
15+
* Quote item updater
1716
*/
1817
class Updater
1918
{

0 commit comments

Comments
 (0)