Skip to content

Commit 9655b41

Browse files
committed
39362: remove old code for PHP versions we no longer support
1 parent 078c387 commit 9655b41

File tree

61 files changed

+8
-258
lines changed

Some content is hidden

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

61 files changed

+8
-258
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/bootstrap.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@
3131
exit(1);
3232
}
3333

34-
// PHP 8 compatibility. Define constants that are not present in PHP < 8.0
35-
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80000) {
36-
if (!defined('T_NAME_QUALIFIED')) {
37-
define('T_NAME_QUALIFIED', 24001);
38-
}
39-
if (!defined('T_NAME_FULLY_QUALIFIED')) {
40-
define('T_NAME_FULLY_QUALIFIED', 24002);
41-
}
42-
}
43-
4434
require_once __DIR__ . '/autoload.php';
4535
// Sets default autoload mappings, may be overridden in Bootstrap::create
4636
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

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
@@ -275,7 +275,7 @@ class Product extends AbstractEntity
275275
/**
276276
* @var string
277277
*/
278-
private $hashAlgorithm = 'crc32c';
278+
private $hashAlgorithm = 'xxh128';
279279

280280
/**
281281
* @var array
@@ -935,7 +935,6 @@ public function __construct(
935935
$this->linkProcessor = $linkProcessor ?? ObjectManager::getInstance()
936936
->get(LinkProcessor::class);
937937
$this->linkProcessor->addNameToIds($this->_linkNameToId);
938-
$this->hashAlgorithm = (version_compare(PHP_VERSION, '8.1.0') >= 0) ? 'xxh128' : 'crc32c';
939938
parent::__construct(
940939
$jsonHelper,
941940
$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
@@ -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_Config:etc/system.xsd');
3431
$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
}

0 commit comments

Comments
 (0)