Skip to content

Commit 1ac0e64

Browse files
author
Ivan Gavryshko
committed
Merge remote-tracking branch 'origin/MAGETWO-44931-hhvm-builds' into PR_Branch
2 parents a333a03 + 89de069 commit 1ac0e64

File tree

36 files changed

+128
-2
lines changed

36 files changed

+128
-2
lines changed

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

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

2121
protected function setUp()
2222
{
23+
if (!function_exists('libxml_set_external_entity_loader')) {
24+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25+
}
2326
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2427
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Backend:etc/menu.xsd');
2528
$this->_xsdValidator = new \Magento\Framework\TestFramework\Unit\Utility\XsdValidator();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class XsdTest extends \PHPUnit_Framework_TestCase
1616

1717
protected function setUp()
1818
{
19+
if (!function_exists('libxml_set_external_entity_loader')) {
20+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
21+
}
1922
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2023
$this->_schemaFile = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd');
2124
}

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

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

2121
protected function setUp()
2222
{
23+
if (!function_exists('libxml_set_external_entity_loader')) {
24+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25+
}
2326
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2427
$this->_xsdSchemaPath = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/');
2528
$this->_xsdValidator = new \Magento\Framework\TestFramework\Unit\Utility\XsdValidator();

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

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

2121
protected function setUp()
2222
{
23+
if (!function_exists('libxml_set_external_entity_loader')) {
24+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25+
}
2326
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2427
$this->_xsdSchema = $urnResolver->getRealPath(
2528
'urn:magento:module:Magento_Catalog:etc/product_types_merged.xsd'

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

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

2121
protected function setUp()
2222
{
23+
if (!function_exists('libxml_set_external_entity_loader')) {
24+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25+
}
2326
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2427
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/product_types.xsd');
2528
$this->_xsdValidator = new \Magento\Framework\TestFramework\Unit\Utility\XsdValidator();

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

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

2121
protected function setUp()
2222
{
23+
if (!function_exists('libxml_set_external_entity_loader')) {
24+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25+
}
2326
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2427
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Config:etc/system.xsd');
2528
$this->_xsdValidator = new \Magento\Framework\TestFramework\Unit\Utility\XsdValidator();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ class XsdTest extends \PHPUnit_Framework_TestCase
1414

1515
public function setUp()
1616
{
17+
if (!function_exists('libxml_set_external_entity_loader')) {
18+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
19+
}
1720
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
1821
$this->_xsdFile = $urnResolver->getRealPath('urn:magento:module:Magento_Cron:etc/crontab.xsd');
1922
}

app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class XsdTest extends \PHPUnit_Framework_TestCase
1616

1717
protected function setUp()
1818
{
19+
if (!function_exists('libxml_set_external_entity_loader')) {
20+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
21+
}
1922
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2023
$this->_schemaFile = $urnResolver->getRealPath('urn:magento:module:Magento_Customer:etc/address_formats.xsd');
2124
}

app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ class XmlConverterCommandTest extends \PHPUnit_Framework_TestCase
3636

3737
public function setUp()
3838
{
39+
if (!function_exists('libxml_set_external_entity_loader')) {
40+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
41+
}
3942
$this->formatter = $this->getMock('Magento\Developer\Model\Tools\Formatter', [], [], '', false);
4043
$this->domFactory = $this->getMock('Magento\Framework\DomDocument\DomDocumentFactory', [], [], '', false);
4144
$this->xsltProcessorFactory = $this->getMock(

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Config/XsdTest.php

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

2121
protected function setUp()
2222
{
23+
if (!function_exists('libxml_set_external_entity_loader')) {
24+
$this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
25+
}
2326
$urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
2427
$this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Eav:etc/eav_attributes.xsd');
2528
$this->_xsdValidator = new \Magento\Framework\TestFramework\Unit\Utility\XsdValidator();

0 commit comments

Comments
 (0)