From fa7ffcad545986f173f2a39f8763faf63d1b8c2d Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Wed, 19 Oct 2016 11:57:08 -0500
Subject: [PATCH] MAGETWO-58643: Refactor ObjectManager, Interception,
Reflection Framework
- fix build failures
---
.../Review/Product/CollectionTest.php | 36 +++++++++++++------
.../Magento/Setup/Model/ConfigGenerator.php | 1 +
.../Di/Compiler/Config/Writer/Filesystem.php | 2 +-
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/Product/CollectionTest.php b/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/Product/CollectionTest.php
index b1a1b9a69c7..4a61406e8a1 100644
--- a/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/Product/CollectionTest.php
+++ b/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/Product/CollectionTest.php
@@ -10,6 +10,11 @@ namespace Magento\Review\Test\Unit\Model\ResourceModel\Review\Product;
*/
class CollectionTest extends \PHPUnit_Framework_TestCase
{
+ /**
+ * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ */
+ private $objectManager;
+
/**
* @var \Magento\Review\Model\ResourceModel\Review\Product\Collection
*/
@@ -74,16 +79,27 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
false
);
$fetchStrategy->expects($this->any())->method('fetchAll')->will($this->returnValue([]));
- $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
- ->getObject(
- \Magento\Review\Model\ResourceModel\Review\Product\Collection::class,
- [
- 'universalFactory' => $universalFactory,
- 'storeManager' => $storeManager,
- 'eavConfig' => $eavConfig,
- 'fetchStrategy' => $fetchStrategy
- ]
- );
+ $productLimitationMock = $this->getMock(
+ \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation::class
+ );
+ $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->objectManager->mockObjectManager([
+ \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation::class => $productLimitationMock
+ ]);
+ $this->model = $this->objectManager->getObject(
+ \Magento\Review\Model\ResourceModel\Review\Product\Collection::class,
+ [
+ 'universalFactory' => $universalFactory,
+ 'storeManager' => $storeManager,
+ 'eavConfig' => $eavConfig,
+ 'fetchStrategy' => $fetchStrategy
+ ]
+ );
+ }
+
+ protected function tearDown()
+ {
+ $this->objectManager->restoreObjectManager();
}
/**
diff --git a/setup/src/Magento/Setup/Model/ConfigGenerator.php b/setup/src/Magento/Setup/Model/ConfigGenerator.php
index 27b39999857..ce86ce4dd47 100644
--- a/setup/src/Magento/Setup/Model/ConfigGenerator.php
+++ b/setup/src/Magento/Setup/Model/ConfigGenerator.php
@@ -117,6 +117,7 @@ class ConfigGenerator
* @param array $data
* @return ConfigData
* @deprecated
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function createDefinitionsConfig(array $data)
{
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
index add2b0adc8a..3207e590adf 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
@@ -45,7 +45,7 @@ class Filesystem implements WriterInterface
$this->initialize();
file_put_contents(
- \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::getFilePath($key),
+ $this->directoryList->getPath(DirectoryList::DI) . '/' . $key . '.json',
$this->getSerializer()->serialize($config)
);
}
--
GitLab