From 18e7cbf6662c70219d0bafcd871f88db82bca008 Mon Sep 17 00:00:00 2001 From: nevvermind Date: Thu, 28 Apr 2016 23:37:50 +0100 Subject: [PATCH 1/3] Fix syntax error --- .../Magento/Framework/Search/Adapter/Mysql/AdapterTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index c3cbc57c7fe6f..b2c5714a650dc 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -36,7 +36,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase /** * @var string */ - protected $requestConfig = __DIR__ . '/../../_files/requests.xml'; + protected $requestConfig; /** * @var string @@ -45,6 +45,8 @@ class AdapterTest extends \PHPUnit_Framework_TestCase protected function setUp() { + $this->requestConfig = __DIR__ . '/../../_files/requests.xml'; + $this->objectManager = Bootstrap::getObjectManager(); /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ From 1f441657ebc4fc87ac903e9e55f1557e305fb7dd Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 20:46:10 -0500 Subject: [PATCH 2/3] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- .../Magento/Framework/Search/Adapter/Mysql/AdapterTest.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index b2c5714a650dc..0606a1ad073ab 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -36,7 +36,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase /** * @var string */ - protected $requestConfig; + protected $requestConfig = '/../../_files/requests.xml'; /** * @var string @@ -45,15 +45,13 @@ class AdapterTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->requestConfig = __DIR__ . '/../../_files/requests.xml'; - $this->objectManager = Bootstrap::getObjectManager(); /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter'); $document = new \DOMDocument(); - $document->load($this->requestConfig); + $document->load(__DIR__ . $this->requestConfig); $requestConfig = $converter->convert($document); /** @var \Magento\Framework\Search\Request\Config $config */ From 1ad204149905241433e53af755ab9c9a7643ad61 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 21:57:34 -0500 Subject: [PATCH 3/3] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- .../Search/Adapter/Mysql/AdapterTest.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index 0606a1ad073ab..6390f1d3c995c 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -33,11 +33,6 @@ class AdapterTest extends \PHPUnit_Framework_TestCase */ protected $objectManager; - /** - * @var string - */ - protected $requestConfig = '/../../_files/requests.xml'; - /** * @var string */ @@ -51,7 +46,7 @@ protected function setUp() $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter'); $document = new \DOMDocument(); - $document->load(__DIR__ . $this->requestConfig); + $document->load($this->getRequestConfigPath()); $requestConfig = $converter->convert($document); /** @var \Magento\Framework\Search\Request\Config $config */ @@ -66,6 +61,16 @@ protected function setUp() $this->adapter = $this->createAdapter(); } + /** + * Get request config path + * + * @return string + */ + protected function getRequestConfigPath() + { + return __DIR__ . '/../../_files/requests.xml'; + } + /** * Make sure that correct engine is set */