Skip to content

Commit de842be

Browse files
committed
MC-13825: [2.4.x] Migrate ZF2 components to Laminas
1 parent 4ddb85c commit de842be

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ public function apply()
142142
}
143143

144144
$this->domainManager->addDomains($this->whitelist);
145+
146+
return $this;
145147
}
146148

147149
/**

dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
'lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php',
1212
'dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php',
1313
'lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php',
14-
'lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php'
14+
'lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php',
15+
'setup/src/Zend/Mvc/Controller/LazyControllerAbstractFactory.php',
1516
];

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,5 @@
200200
['Magento\BraintreeTwo', 'Magento\Braintree'],
201201
['Magento\MysqlMq\Model\Resource', 'Magento\MysqlMq\Model\ResourceModel'],
202202
['Magento\BulkOperations', 'Magento\AsynchronousOperations'],
203+
['Zend', 'Laminas'],
203204
];

lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Code\Test\Unit\Generator;
77

8+
/**
9+
* Test for Magento\Framework\Code\Generator\ClassGenerator
10+
*/
811
class ClassGeneratorTest extends \PHPUnit\Framework\TestCase
912
{
1013
/**#@+
@@ -333,9 +336,9 @@ public function testNamespaceName($actualNamespace, $expectedNamespace)
333336
public function providerNamespaces()
334337
{
335338
return [
336-
['Zend', 'Zend'],
337-
['\Zend', 'Zend'],
338-
['\Zend\SomeClass', 'Zend\SomeClass'],
339+
['Laminas', 'Laminas'],
340+
['\Laminas', 'Laminas'],
341+
['\Laminas\SomeClass', 'Laminas\SomeClass'],
339342
['', null],
340343
];
341344
}

0 commit comments

Comments
 (0)