From 9ba83d1d5b713e2741e78ec7d2c217d6c307620b Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Wed, 6 May 2015 15:34:22 -0400
Subject: [PATCH] MAGETWO-34787: Process pull request
---
.../Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php | 1 -
app/code/Magento/Ui/etc/di.xml | 5 -----
.../Magento/Framework/Data/Collection/Filesystem.php | 1 +
.../ObjectManager/Test/Unit/_files/logger_classes.php | 5 +++++
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
index 1eb9f230505..9fede0b0238 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
@@ -9,7 +9,6 @@ namespace Magento\Tax\Controller\Adminhtml\Tax;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Controller\ResultFactory;
-
class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax
{
/**
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
index 6042d3eaa23..b5684f5734d 100644
--- a/app/code/Magento/Ui/etc/di.xml
+++ b/app/code/Magento/Ui/etc/di.xml
@@ -252,9 +252,4 @@
<argument name="subject" xsi:type="object">uiComponentAggregatedSourceOverrideThemeFiltered</argument>
</arguments>
</virtualType>
- <type name="Magento\Ui\DataProvider\Manager">
- <arguments>
- <argument name="config" xsi:type="object">Magento\Ui\DataProvider\Config\Data\Proxy</argument>
- </arguments>
- </type>
</config>
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index e637f4e4b89..dc0e3cf501f 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -284,6 +284,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
* @param bool $printQuery
* @param bool $logQuery
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
* @throws \Exception
*/
public function loadData($printQuery = false, $logQuery = false)
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php
index e55641a0a27..da593225f20 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php
@@ -4,7 +4,9 @@
* See COPYING.txt for license details.
*/
+//@codingStandardsIgnoreStart
namespace Magento\Test\Di {
+
/**
* Test classes used for \Magento\Framework\ObjectManager\Test\Unit\Profiler\FactoryDecoratorTest
*/
@@ -13,9 +15,12 @@ namespace Magento\Test\Di {
}
}
+
namespace Magento\Test\Di\WrappedClass {
+
class Logger
{
}
}
+//@codingStandardsIgnoreEnd
--
GitLab