Skip to content

Commit 2c952d7

Browse files
ihor-svizievihor-sviziev
committed
Migrate ZF2 components to Laminas components
1 parent ec609e3 commit 2c952d7

File tree

18 files changed

+58
-59
lines changed

18 files changed

+58
-59
lines changed

‎app/code/Magento/Email/Model/Transport.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Transport implements TransportInterface
5353
/**
5454
* @var Sendmail
5555
*/
56-
private $zendTransport;
56+
private $laminasTransport;
5757

5858
/**
5959
* @var MessageInterface
@@ -79,7 +79,7 @@ public function __construct(
7979
ScopeInterface::SCOPE_STORE
8080
);
8181

82-
$this->zendTransport = new Sendmail($parameters);
82+
$this->laminasTransport = new Sendmail($parameters);
8383
$this->message = $message;
8484
}
8585

@@ -89,16 +89,16 @@ public function __construct(
8989
public function sendMessage()
9090
{
9191
try {
92-
$zendMessage = Message::fromString($this->message->getRawMessage())->setEncoding('utf-8');
92+
$laminasMessage = Message::fromString($this->message->getRawMessage())->setEncoding('utf-8');
9393
if (2 === $this->isSetReturnPath && $this->returnPathValue) {
94-
$zendMessage->setSender($this->returnPathValue);
95-
} elseif (1 === $this->isSetReturnPath && $zendMessage->getFrom()->count()) {
96-
$fromAddressList = $zendMessage->getFrom();
94+
$laminasMessage->setSender($this->returnPathValue);
95+
} elseif (1 === $this->isSetReturnPath && $laminasMessage->getFrom()->count()) {
96+
$fromAddressList = $laminasMessage->getFrom();
9797
$fromAddressList->rewind();
98-
$zendMessage->setSender($fromAddressList->current()->getEmail());
98+
$laminasMessage->setSender($fromAddressList->current()->getEmail());
9999
}
100100

101-
$this->zendTransport->send($zendMessage);
101+
$this->laminasTransport->send($laminasMessage);
102102
} catch (\Exception $e) {
103103
throw new MailException(new Phrase($e->getMessage()), $e);
104104
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Integration\Test\Unit\Model\Oauth;
77

88
use Magento\Framework\Url\Validator as UrlValidator;
9-
use Laminas\Validator\Uri as ZendUriValidator;
9+
use Laminas\Validator\Uri as LaminasUriValidator;
1010
use Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength;
1111

1212
/**
@@ -85,7 +85,7 @@ protected function setUp()
8585

8686
$this->keyLengthValidator = new KeyLength();
8787

88-
$this->urlValidator = new UrlValidator(new ZendUriValidator());
88+
$this->urlValidator = new UrlValidator(new LaminasUriValidator());
8989

9090
$this->oauthDataMock = $this->createPartialMock(
9191
\Magento\Integration\Helper\Oauth\Data::class,

‎lib/internal/Magento/Framework/Filesystem/Glob.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Framework\Filesystem;
77

88
use Laminas\Stdlib\Glob as LaminasGlob;
9-
use Laminas\Stdlib\Exception\RuntimeException as ZendRuntimeException;
9+
use Laminas\Stdlib\Exception\RuntimeException as LaminasRuntimeException;
1010

1111
/**
1212
* Wrapper for Laminas\Stdlib\Glob
@@ -25,7 +25,7 @@ public static function glob($pattern, $flags = 0, $forceFallback = false)
2525
{
2626
try {
2727
$result = LaminasGlob::glob($pattern, $flags, $forceFallback);
28-
} catch (ZendRuntimeException $e) {
28+
} catch (LaminasRuntimeException $e) {
2929
$result = [];
3030
}
3131
return $result;

‎lib/internal/Magento/Framework/Mail/EmailMessage.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
namespace Magento\Framework\Mail;
99

1010
use Magento\Framework\Mail\Exception\InvalidArgumentException;
11-
use Laminas\Mail\Address as ZendAddress;
11+
use Laminas\Mail\Address as LaminasAddress;
1212
use Laminas\Mail\AddressList;
13-
use Laminas\Mime\Message as ZendMimeMessage;
13+
use Laminas\Mime\Message as LaminasMimeMessage;
1414

1515
/**
1616
* Email message
@@ -61,7 +61,7 @@ public function __construct(
6161
?string $encoding = 'utf-8'
6262
) {
6363
parent::__construct($encoding);
64-
$mimeMessage = new ZendMimeMessage();
64+
$mimeMessage = new LaminasMimeMessage();
6565
$mimeMessage->setParts($body->getParts());
6666
$this->zendMessage->setBody($mimeMessage);
6767
if ($subject) {
@@ -153,15 +153,15 @@ public function getReplyTo(): ?array
153153
*/
154154
public function getSender(): ?Address
155155
{
156-
/** @var ZendAddress $zendSender */
157-
if (!$zendSender = $this->zendMessage->getSender()) {
156+
/** @var LaminasAddress $laminasSender */
157+
if (!$laminasSender = $this->zendMessage->getSender()) {
158158
return null;
159159
}
160160

161161
return $this->addressFactory->create(
162162
[
163-
'email' => $zendSender->getEmail(),
164-
'name' => $zendSender->getName()
163+
'email' => $laminasSender->getEmail(),
164+
'name' => $laminasSender->getName()
165165
]
166166
);
167167
}
@@ -222,11 +222,11 @@ private function convertAddressListToAddressArray(AddressList $addressList): arr
222222
*/
223223
private function convertAddressArrayToAddressList(array $arrayList): AddressList
224224
{
225-
$zendAddressList = new AddressList();
225+
$laminasAddressList = new AddressList();
226226
foreach ($arrayList as $address) {
227-
$zendAddressList->add($address->getEmail(), $address->getName());
227+
$laminasAddressList->add($address->getEmail(), $address->getName());
228228
}
229229

230-
return $zendAddressList;
230+
return $laminasAddressList;
231231
}
232232
}

‎lib/internal/Magento/Framework/Mail/MimeMessage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
namespace Magento\Framework\Mail;
99

10-
use Laminas\Mime\Message as ZendMimeMessage;
10+
use Laminas\Mime\Message as LaminasMimeMessage;
1111

1212
/**
1313
* Class MimeMessage
1414
*/
1515
class MimeMessage implements MimeMessageInterface
1616
{
1717
/**
18-
* @var ZendMimeMessage
18+
* @var LaminasMimeMessage
1919
*/
2020
private $mimeMessage;
2121

@@ -26,7 +26,7 @@ class MimeMessage implements MimeMessageInterface
2626
*/
2727
public function __construct(array $parts)
2828
{
29-
$this->mimeMessage = new ZendMimeMessage();
29+
$this->mimeMessage = new LaminasMimeMessage();
3030
$this->mimeMessage->setParts($parts);
3131
}
3232

‎lib/internal/Magento/Framework/Mail/MimePart.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Magento\Framework\Mail;
99

1010
use Magento\Framework\Mail\Exception\InvalidArgumentException;
11-
use Laminas\Mime\Part as ZendMimePart;
11+
use Laminas\Mime\Part as LaminasMimePart;
1212

1313
/**
1414
* @inheritDoc
@@ -21,7 +21,7 @@ class MimePart implements MimePartInterface
2121
public const CHARSET_UTF8 = 'utf-8';
2222

2323
/**
24-
* @var ZendMimePart
24+
* @var LaminasMimePart
2525
*/
2626
private $mimePart;
2727

@@ -61,7 +61,7 @@ public function __construct(
6161
?bool $isStream = null
6262
) {
6363
try {
64-
$this->mimePart = new ZendMimePart($content);
64+
$this->mimePart = new LaminasMimePart($content);
6565
} catch (\Exception $e) {
6666
throw new InvalidArgumentException($e->getMessage());
6767
}

‎lib/internal/Magento/Framework/Mail/Transport.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
use Magento\Framework\Exception\MailException;
99
use Magento\Framework\Phrase;
10-
use Laminas\Mail\Message as ZendMessage;
10+
use Laminas\Mail\Message as LaminasMessage;
1111
use Laminas\Mail\Transport\Sendmail;
1212

1313
class Transport implements \Magento\Framework\Mail\TransportInterface
1414
{
1515
/**
1616
* @var Sendmail
1717
*/
18-
private $zendTransport;
18+
private $laminasTransport;
1919

2020
/**
2121
* @var MessageInterface
@@ -28,7 +28,7 @@ class Transport implements \Magento\Framework\Mail\TransportInterface
2828
*/
2929
public function __construct(MessageInterface $message, $parameters = null)
3030
{
31-
$this->zendTransport = new Sendmail($parameters);
31+
$this->laminasTransport = new Sendmail($parameters);
3232
$this->message = $message;
3333
}
3434

@@ -38,8 +38,8 @@ public function __construct(MessageInterface $message, $parameters = null)
3838
public function sendMessage()
3939
{
4040
try {
41-
$this->zendTransport->send(
42-
ZendMessage::fromString($this->message->getRawMessage())
41+
$this->laminasTransport->send(
42+
LaminasMessage::fromString($this->message->getRawMessage())
4343
);
4444
} catch (\Exception $e) {
4545
throw new MailException(new Phrase($e->getMessage()), $e);

‎lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected function _getClassMethods()
126126
$methods = [$this->_getDefaultConstructorDefinition()];
127127
$interfaceMethodsMap = $this->serviceMethodsMap->getMethodsMap($this->getSourceClassName());
128128
foreach (array_keys($interfaceMethodsMap) as $methodName) {
129-
// Uses Zend Reflection instead MethodsMap service, because second does not support features of PHP 7.x
129+
// Uses Laminas Reflection instead MethodsMap service, because second does not support features of PHP 7.x
130130
$methodReflection = new MethodReflection($this->getSourceClassName(), $methodName);
131131
$sourceMethodParameters = $methodReflection->getParameters();
132132
$methodParameters = [];

‎lib/internal/Magento/Framework/Stdlib/Parameters.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@
77

88
namespace Magento\Framework\Stdlib;
99

10-
use Laminas\Stdlib\Parameters as ZendParameters;
10+
use Laminas\Stdlib\Parameters as LaminasParameters;
1111

1212
/**
1313
* Class Parameters
1414
*/
1515
class Parameters
1616
{
1717
/**
18-
* @var ZendParameters
18+
* @var LaminasParameters
1919
*/
2020
private $parameters;
2121

2222
/**
23-
* @param ZendParameters $parameters
23+
* @param LaminasParameters $parameters
2424
*/
25-
public function __construct(
26-
ZendParameters $parameters
27-
) {
25+
public function __construct(LaminasParameters $parameters)
26+
{
2827
$this->parameters = $parameters;
2928
}
3029

‎lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
1313
protected $object;
1414

1515
/** @var \Laminas\Validator\Uri */
16-
protected $zendValidator;
16+
protected $laminasValidator;
1717

1818
/** @var string[] */
1919
protected $expectedValidationMessages = ['invalidUrl' => "Invalid URL '%value%'."];
@@ -22,10 +22,10 @@ protected function setUp()
2222
{
2323
$objectManager = new ObjectManager($this);
2424

25-
$this->zendValidator = $this->createMock(\Laminas\Validator\Uri::class);
25+
$this->laminasValidator = $this->createMock(\Laminas\Validator\Uri::class);
2626
$this->object = $objectManager->getObject(
2727
\Magento\Framework\Url\Validator::class,
28-
['validator' => $this->zendValidator]
28+
['validator' => $this->laminasValidator]
2929
);
3030
}
3131

@@ -36,7 +36,7 @@ public function testConstruct()
3636

3737
public function testIsValidWhenValid()
3838
{
39-
$this->zendValidator
39+
$this->laminasValidator
4040
->method('isValid')
4141
->with('http://example.com')
4242
->willReturn(true);
@@ -47,7 +47,7 @@ public function testIsValidWhenValid()
4747

4848
public function testIsValidWhenInvalid()
4949
{
50-
$this->zendValidator
50+
$this->laminasValidator
5151
->method('isValid')
5252
->with('%value%')
5353
->willReturn(false);

0 commit comments

Comments
 (0)