Skip to content

Commit 3ea6da6

Browse files
SilinMykolaSilinMykola
committed
39362: remove old code for PHP versions we no longer support
1 parent e885088 commit 3ea6da6

File tree

57 files changed

+6
-212
lines changed

Some content is hidden

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

57 files changed

+6
-212
lines changed

‎.htaccess.sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
</IfModule>
106106

107107
############################################
108-
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
108+
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch
109109
## Please, set it on virtual host configuration level
110110

111111
## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1

‎app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
2626

2727
protected function setUp(): void
2828
{
29-
if (!function_exists('libxml_set_external_entity_loader')) {
30-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
31-
}
3229
$urnResolver = new UrnResolver();
3330
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Backend:etc/menu.xsd');
3431
$this->_xsdValidator = new XsdValidator();

‎app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ class XsdTest extends TestCase
2121

2222
protected function setUp(): void
2323
{
24-
if (!function_exists('libxml_set_external_entity_loader')) {
25-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
26-
}
2724
$urnResolver = new UrnResolver();
2825
$this->_schemaFile = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd');
2926
}

‎app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/XsdTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
2626

2727
protected function setUp(): void
2828
{
29-
if (!function_exists('libxml_set_external_entity_loader')) {
30-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
31-
}
3229
$urnResolver = new UrnResolver();
3330
$this->_xsdSchemaPath = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/');
3431
$this->_xsdValidator = new XsdValidator();

‎app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdMergedTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class XsdMergedTest extends TestCase
2626

2727
protected function setUp(): void
2828
{
29-
if (!function_exists('libxml_set_external_entity_loader')) {
30-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
31-
}
3229
$urnResolver = new UrnResolver();
3330
$this->_xsdSchema = $urnResolver->getRealPath(
3431
'urn:magento:module:Magento_Catalog:etc/product_types_merged.xsd'

‎app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
2626

2727
protected function setUp(): void
2828
{
29-
if (!function_exists('libxml_set_external_entity_loader')) {
30-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
31-
}
3229
$urnResolver = new UrnResolver();
3330
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/product_types.xsd');
3431
$this->_xsdValidator = new XsdValidator();

‎app/code/Magento/CatalogImportExport/Model/Import/Product.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class Product extends AbstractEntity
277277
/**
278278
* @var string
279279
*/
280-
private $hashAlgorithm = 'crc32c';
280+
private $hashAlgorithm = 'xxh128';
281281

282282
/**
283283
* @var array
@@ -938,7 +938,6 @@ public function __construct(
938938
$this->linkProcessor = $linkProcessor ?? ObjectManager::getInstance()
939939
->get(LinkProcessor::class);
940940
$this->linkProcessor->addNameToIds($this->_linkNameToId);
941-
$this->hashAlgorithm = (version_compare(PHP_VERSION, '8.1.0') >= 0) ? 'xxh128' : 'crc32c';
942941
parent::__construct(
943942
$jsonHelper,
944943
$importExportData,

‎app/code/Magento/Config/Test/Unit/Model/Config/XsdTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ class XsdTest extends TestCase
2727

2828
protected function setUp(): void
2929
{
30-
if (!function_exists('libxml_set_external_entity_loader')) {
31-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
32-
}
3330
$urnResolver = new UrnResolver();
3431
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Config:etc/system.xsd');
3532
$this->_xsdValidator = new XsdValidator();

‎app/code/Magento/Cron/Test/Unit/Model/Config/XsdTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ class XsdTest extends TestCase
2020

2121
protected function setUp(): void
2222
{
23-
if (!function_exists('libxml_set_external_entity_loader')) {
24-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25-
}
2623
$urnResolver = new UrnResolver();
2724
$this->_xsdFile = $urnResolver->getRealPath('urn:magento:module:Magento_Cron:etc/crontab.xsd');
2825
}

‎app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ class ValidateTest extends TestCase
8888

8989
protected function setUp(): void
9090
{
91-
if (!function_exists('libxml_set_external_entity_loader')) {
92-
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
93-
}
9491
$this->customer = $this->getMockForAbstractClass(
9592
CustomerInterface::class,
9693
[],

0 commit comments

Comments
 (0)