From 7fe73bc6dbab48ea387cd5ad2b85310cc31d1f9c Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Thu, 29 Dec 2016 12:47:53 +0200
Subject: [PATCH] MAGETWO-62710: Remove Advanced section
---
.../Unit/Block/Product/Widget/NewWidgetTest.php | 2 +-
.../Test/Unit/Block/Info/SubstitutionTest.php | 2 +-
.../Test/Unit/Block/Header/AdditionalTest.php | 3 +--
.../Wishlist/Test/Unit/Model/Rss/WishlistTest.php | 13 -------------
lib/internal/Magento/Framework/Module/Manager.php | 1 -
5 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
index 768d70e8e1f..dabe1345d14 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
@@ -63,7 +63,7 @@ class NewWidgetTest extends \PHPUnit_Framework_TestCase
false,
false
);
- $this->scopeConfig = $this->getMock(\Magento\Framework\App\Config::class, ['getValue'], [], '', false, false);
+ $this->scopeConfig = $this->getMock(\Magento\Framework\App\Config::class, [], [], '', false, false);
$this->cacheState = $this->getMock(
\Magento\Framework\App\Cache\State::class,
['isEnabled'],
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
index fb8865a1d7e..2b4ffdcd5c1 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/SubstitutionTest.php
@@ -76,7 +76,7 @@ class SubstitutionTest extends \PHPUnit_Framework_TestCase
->willReturn($abstractBlock);
$infoMock = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
- ->disableOriginalConstructor()->setMethods([])
+ ->disableOriginalConstructor()
->getMock();
$methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
->getMockForAbstractClass();
diff --git a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
index 50ddfa1be51..8970f57f8bb 100644
--- a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
@@ -149,8 +149,7 @@ class AdditionalTest extends \PHPUnit_Framework_TestCase
'',
false,
true,
- true,
- ['getValue']
+ true
);
$this->cacheStateMock = $this->getMockForAbstractClass(
\Magento\Framework\App\Cache\StateInterface::class,
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
index 06a2e3a2685..97ade66fed1 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
@@ -160,19 +160,6 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
$this->urlBuilderMock->expects($this->once())
->method('getUrl')
->will($this->returnValue($wishlistSharingUrl));
- $this->scopeConfig->expects($this->any())
- ->method('getValue')
- ->will($this->returnValueMap(
- [
- [
- Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- null,
- $locale
- ],
- ]
- )
- );
$staticArgs = [
'productName' => $productName,
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 1a8908bf377..dccefa5212f 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -3,7 +3,6 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
namespace Magento\Framework\Module;
/**
--
GitLab