diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php index 1eb9f230505826dd576fb232ab7abffd6f9f4f00..9fede0b0238787abcc72a691b7473f588a90434b 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 6042d3eaa23e53fa82c9f73f48f212fdfef86dba..b5684f5734d9b6e641b01f26aaee55b92befa5ea 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 e637f4e4b89da6989c1504aff67a1c4ad68ead40..dc0e3cf501f6ef33dd63d013b1b8dc277f2cf2df 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 e55641a0a272aec4eb42cf90468a14891c1db04a..da593225f2079af53a730190a56afc0cb7715400 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