From a5f9eaae36e5f45fc2277b6ce42c858976dd3c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Mart=C3=ADnez?= Date: Tue, 24 Oct 2017 00:55:41 +0200 Subject: [PATCH] Remove Undefined Fields under lib folder --- .../App/Test/Unit/Cache/Type/GenericTest.php | 2 ++ .../App/Test/Unit/Response/HttpTest.php | 21 +++++++++++++------ .../Backup/Test/Unit/FilesystemTest.php | 9 ++++++-- .../Magento/Framework/Config/FileResolver.php | 17 +++++++++------ .../Framework/DB/Query/BatchRangeIterator.php | 5 +++++ .../Test/Unit/Select/ColumnsRendererTest.php | 5 +++++ .../Magento/Framework/DB/Tree/NodeSet.php | 11 +++++++--- .../Magento/Framework/DataObject/Cache.php | 10 --------- .../Framework/Encryption/Encryptor.php | 5 +++++ .../Magento/Framework/Filesystem/Io/File.php | 8 ++++--- .../Test/Unit/Directory/WriteTest.php | 1 + lib/internal/Magento/Framework/Image.php | 1 + .../Magento/Framework/Locale/Resolver.php | 5 +++++ .../Module/Test/Unit/DbVersionInfoTest.php | 7 ++++++- .../Module/Test/Unit/PackageInfoTest.php | 8 +++++-- .../ObjectManager/Definition/Runtime.php | 5 +++++ .../Test/Unit/ObjectManagerTest.php | 4 ++-- .../Session/SaveHandler/Redis/Config.php | 7 ++++++- .../Framework/Test/Unit/DataObjectTest.php | 6 +++++- .../Unit/Matcher/MethodInvokedAtIndex.php | 4 ++++ .../Element/UiComponent/Config/DomMerger.php | 5 +++++ .../View/Element/UiComponent/Context.php | 5 +++++ .../Framework/View/File/Collector/Theme.php | 21 ++++++++++++++++++- .../View/Layout/Generator/UiComponent.php | 15 ++++++++----- .../View/Page/Config/Generator/Body.php | 5 +++++ .../Unit/Rest/Response/FieldsFilterTest.php | 11 ++++++++-- 26 files changed, 158 insertions(+), 45 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/GenericTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/GenericTest.php index e96e5ae3f90e4..309b6f38d6817 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/GenericTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/GenericTest.php @@ -20,6 +20,7 @@ public function testConstructor($className) $frontendMock = $this->createMock(\Magento\Framework\Cache\FrontendInterface::class); $poolMock = $this->createMock(\Magento\Framework\App\Cache\Type\FrontendPool::class); + /** @noinspection PhpUndefinedFieldInspection */ $poolMock->expects( $this->atLeastOnce() )->method( @@ -33,6 +34,7 @@ public function testConstructor($className) $model = new $className($poolMock); // Test initialization was done right + /** @noinspection PhpUndefinedFieldInspection */ $this->assertEquals($className::CACHE_TAG, $model->getTag(), 'The tag is wrong'); // Test that frontend is now engaged in operations diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php index 3215a82ffad5f..fc139ba2dd9c3 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php @@ -6,7 +6,7 @@ namespace Magento\Framework\App\Test\Unit\Response; -use \Magento\Framework\App\Response\Http; +use Magento\Framework\App\Response\Http; use Magento\Framework\ObjectManagerInterface; /** @@ -20,24 +20,33 @@ class HttpTest extends \PHPUnit\Framework\TestCase protected $model; /** - * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Stdlib\CookieManagerInterface + * @var \Magento\Framework\Stdlib\CookieManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $cookieManagerMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory + * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $cookieMetadataFactoryMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Http\Context + * @var \Magento\Framework\App\Http\Context|\PHPUnit_Framework_MockObject_MockObject */ protected $contextMock; - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Http\Context */ + /** + * @var \Magento\Framework\App\Http\Context|\PHPUnit_Framework_MockObject_MockObject + */ protected $dateTimeMock; - /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */ + /** + * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject + */ + protected $requestMock; + + /** + * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager + */ protected $objectManager; protected function setUp() diff --git a/lib/internal/Magento/Framework/Backup/Test/Unit/FilesystemTest.php b/lib/internal/Magento/Framework/Backup/Test/Unit/FilesystemTest.php index 40a0632b42087..ea723eb74ab22 100644 --- a/lib/internal/Magento/Framework/Backup/Test/Unit/FilesystemTest.php +++ b/lib/internal/Magento/Framework/Backup/Test/Unit/FilesystemTest.php @@ -15,15 +15,20 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase private $objectManager; /** - * @var \Magento\Framework\Backup\Filesystem\Rollback\Fs + * @var \Magento\Framework\Backup\Filesystem\Rollback\Fs|\PHPUnit_Framework_MockObject_MockObject */ private $fsMock; /** - * @var \Magento\Framework\Backup\Filesystem\Rollback\Ftp + * @var \Magento\Framework\Backup\Filesystem\Rollback\Ftp|\PHPUnit_Framework_MockObject_MockObject */ private $ftpMock; + /** + * @var \Magento\Framework\Backup\Filesystem|\PHPUnit_Framework_MockObject_MockObject + */ + private $snapshotMock; + /** * @var \Magento\Framework\Backup\Filesystem */ diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php index 25171d9cb0b9f..10a39274eab8b 100644 --- a/lib/internal/Magento/Framework/Config/FileResolver.php +++ b/lib/internal/Magento/Framework/Config/FileResolver.php @@ -7,13 +7,13 @@ */ namespace Magento\Framework\Config; -use Magento\Framework\Module\Dir\Reader as DirReader; +use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\Filesystem; +use Magento\Framework\Module\Dir\Reader as DirReader; +use Magento\Framework\View\Design\Fallback\RulePool; +use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface; use Magento\Framework\View\Design\ThemeInterface; use Magento\Framework\View\DesignInterface; -use Magento\Framework\App\Filesystem\DirectoryList; -use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface; -use Magento\Framework\View\Design\Fallback\RulePool; /** * Class FileResolver @@ -53,6 +53,11 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface, D */ protected $resolver; + /** + * @var DirectoryList + */ + protected $directoryList; + /** * @param DirReader $moduleReader * @param FileIteratorFactory $iteratorFactory @@ -105,7 +110,7 @@ public function get($filename, $scope) ); if (file_exists($designPath)) { try { - $designDom = new \DOMDocument; + $designDom = new \DOMDocument(); $designDom->load($designPath); $iterator[$designPath] = $designDom->saveXML(); } catch (\Exception $e) { @@ -174,7 +179,7 @@ private function getParentConfigs(ThemeInterface $theme, array $iterator, $index $theme->getParentTheme() ); - $parentDom = new \DOMDocument; + $parentDom = new \DOMDocument(); $parentDom->load($parentDesignPath); $iterator[$index] = $parentDom->saveXML(); diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php index a818d1a91f1e0..e08a6721af989 100644 --- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php +++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php @@ -33,6 +33,11 @@ class BatchRangeIterator implements BatchIteratorInterface */ private $rangeField; + /** + * @var string + */ + private $rangeFieldAlias; + /** * @var int */ diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php index 143ee42ebfa51..fd8bacaf6a940 100644 --- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php +++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php @@ -28,6 +28,11 @@ class ColumnsRendererTest extends \PHPUnit\Framework\TestCase */ protected $selectMock; + /** + * @var \Zend_Db_Expr + */ + protected $sqlWildcard; + /** * Set up * diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php index 525651577f289..52d67398303bd 100644 --- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php +++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php @@ -14,17 +14,22 @@ class NodeSet implements \Iterator /** * @var Node[] */ - private $_nodes = []; + private $_nodes; /** * @var int */ - private $_currentNode = 0; + private $_current; /** * @var int */ - private $_current = 0; + private $_currentNode; + + /** + * @var int + */ + private $count; /** * Constructor diff --git a/lib/internal/Magento/Framework/DataObject/Cache.php b/lib/internal/Magento/Framework/DataObject/Cache.php index 06f6cd0bb0ff6..01e3a972eb94d 100644 --- a/lib/internal/Magento/Framework/DataObject/Cache.php +++ b/lib/internal/Magento/Framework/DataObject/Cache.php @@ -463,14 +463,4 @@ public function getAllReferences() { return $this->_references; } - - /** - * Get all references by object - * - * @return array - */ - public function getAllReferencesByObject() - { - return $this->_referencesByObject; - } } diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php index c79233b62fb61..7aa0e4eea6eac 100644 --- a/lib/internal/Magento/Framework/Encryption/Encryptor.php +++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php @@ -102,6 +102,11 @@ class Encryptor implements EncryptorInterface */ protected $keys = []; + /** + * @var Random + */ + protected $random; + /** * @param Random $random * @param DeploymentConfig $deploymentConfig diff --git a/lib/internal/Magento/Framework/Filesystem/Io/File.php b/lib/internal/Magento/Framework/Filesystem/Io/File.php index 565aaf8664328..ccd3b324ff088 100644 --- a/lib/internal/Magento/Framework/Filesystem/Io/File.php +++ b/lib/internal/Magento/Framework/Filesystem/Io/File.php @@ -5,9 +5,6 @@ */ namespace Magento\Framework\Filesystem\Io; -use Magento\Framework\Filesystem\DriverInterface; -use Symfony\Component\Finder\Tests\Iterator\DateRangeFilterIteratorTest; - /** * Filesystem client * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) @@ -79,6 +76,11 @@ class File extends AbstractIo */ protected $_streamLocked = false; + /** + * @var \Exception + */ + protected $_streamException; + /** * Destruct * diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Directory/WriteTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Directory/WriteTest.php index 4327b043f7b8f..6840a88b97ba6 100644 --- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Directory/WriteTest.php +++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Directory/WriteTest.php @@ -165,6 +165,7 @@ private function getAbsolutePath($path) public function testRenameFile($sourcePath, $targetPath, $targetDir) { if ($targetDir !== null) { + /** @noinspection PhpUndefinedFieldInspection */ $targetDir->driver = $this->getMockBuilder(DriverInterface::class)->getMockForAbstractClass(); $targetDirPath = 'TARGET_PATH/'; $targetDir->expects($this->once()) diff --git a/lib/internal/Magento/Framework/Image.php b/lib/internal/Magento/Framework/Image.php index fa5a8268e3756..183f57ca26f69 100644 --- a/lib/internal/Magento/Framework/Image.php +++ b/lib/internal/Magento/Framework/Image.php @@ -261,6 +261,7 @@ public function instruction() */ public function setImageBackgroundColor($color) { + /** @noinspection PhpUndefinedFieldInspection */ $this->_adapter->imageBackgroundColor = intval($color); } diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php index 8372908a380ff..df57033108104 100644 --- a/lib/internal/Magento/Framework/Locale/Resolver.php +++ b/lib/internal/Magento/Framework/Locale/Resolver.php @@ -47,6 +47,11 @@ class Resolver implements ResolverInterface */ protected $emulatedLocales = []; + /** + * @var string + */ + protected $defaultLocalePath; + /** * @param ScopeConfigInterface $scopeConfig * @param string $defaultLocalePath diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php index f8fa1c0b93506..f6c978c3cef96 100644 --- a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php +++ b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php @@ -5,7 +5,7 @@ */ namespace Magento\Framework\Module\Test\Unit; -use \Magento\Framework\Module\DbVersionInfo; +use Magento\Framework\Module\DbVersionInfo; class DbVersionInfoTest extends \PHPUnit\Framework\TestCase { @@ -24,6 +24,11 @@ class DbVersionInfoTest extends \PHPUnit\Framework\TestCase */ private $moduleResource; + /** + * @var \Magento\Framework\Module\Output\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $_outputConfig; + protected function setUp() { $this->moduleList = $this->getMockForAbstractClass(\Magento\Framework\Module\ModuleListInterface::class); diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php index f477d8fca39d8..a6acc3cc37578 100644 --- a/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php +++ b/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php @@ -5,8 +5,7 @@ */ namespace Magento\Framework\Module\Test\Unit; -use Magento\Framework\Module\ModuleList; -use \Magento\Framework\Module\PackageInfo; +use Magento\Framework\Module\PackageInfo; class PackageInfoTest extends \PHPUnit\Framework\TestCase { @@ -25,6 +24,11 @@ class PackageInfoTest extends \PHPUnit\Framework\TestCase */ private $packageInfo; + /** + * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject + */ + private $serializerMock; + protected function setUp() { $this->componentRegistrar = $this->createMock(\Magento\Framework\Component\ComponentRegistrar::class); diff --git a/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php b/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php index 357a67160238d..30e229c48fcca 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php +++ b/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php @@ -14,6 +14,11 @@ class Runtime implements \Magento\Framework\ObjectManager\DefinitionInterface */ protected $_definitions = []; + /** + * @var \Magento\Framework\Code\Reader\ClassReaderInterface + */ + protected $_reader; + /** * @param \Magento\Framework\Code\Reader\ClassReaderInterface $reader */ diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/ObjectManagerTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/ObjectManagerTest.php index 091b44f74003a..2243a963de396 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/ObjectManagerTest.php +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/ObjectManagerTest.php @@ -358,7 +358,7 @@ public function testConfiguredArgumentsAreInherited() ] ); - /** @var $result \Magento\Test\Di\Aggregate\AggregateParent */ + /** @var $result \Magento\Test\Di\Aggregate\Child */ $result = $this->_object->create(\Magento\Test\Di\Aggregate\Child::class); $this->assertInstanceOf(\Magento\Test\Di\DiParent::class, $result->interface); $this->assertEquals('first_param_value', $result->scalar); @@ -388,7 +388,7 @@ public function testConfiguredArgumentsOverrideInheritedArguments() ] ); - /** @var $result \Magento\Test\Di\Aggregate\AggregateParent */ + /** @var $result \Magento\Test\Di\Aggregate\Child */ $result = $this->_object->create(\Magento\Test\Di\Aggregate\Child::class); $this->assertInstanceOf(\Magento\Test\Di\Child::class, $result->interface); $this->assertEquals('second_param_value', $result->scalar); diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php index 6b7ab238c30ca..724f949ca5b23 100644 --- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php +++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php @@ -6,9 +6,9 @@ namespace Magento\Framework\Session\SaveHandler\Redis; use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Store\Model\ScopeInterface as StoreScopeInterface; use Magento\Framework\App\DeploymentConfig; use Magento\Framework\App\State; +use Magento\Store\Model\ScopeInterface as StoreScopeInterface; /** * Redis session save handler @@ -127,6 +127,11 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface */ private $scopeConfig; + /** + * @var State + */ + private $appState; + /** * @param DeploymentConfig $deploymentConfig * @param State $appState diff --git a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php index d937dc10e4d4c..a064535590f32 100644 --- a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php +++ b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php @@ -110,7 +110,7 @@ public function testGetData() 'key1' => 'value1', 'key2' => [ 'subkey2.1' => 'value2.1', - 'subkey2.2' => 'multiline'. PHP_EOL .'string', + 'subkey2.2' => 'multiline' . PHP_EOL . 'string', 'subkey2.3' => new \Magento\Framework\DataObject(['test_key' => 'test_value']), ], 'key3' => 5, @@ -305,10 +305,14 @@ public function testCall() */ public function testGetSet() { + /** @noinspection PhpUndefinedFieldInspection */ $this->dataObject->test = 'test'; + /** @noinspection PhpUndefinedFieldInspection */ $this->assertEquals('test', $this->dataObject->test); + /** @noinspection PhpUndefinedFieldInspection */ $this->dataObject->testTest = 'test'; + /** @noinspection PhpUndefinedFieldInspection */ $this->assertEquals('test', $this->dataObject->testTest); } diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php index 4041d5633df81..cd116521dbea5 100644 --- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php +++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php @@ -31,13 +31,17 @@ class MethodInvokedAtIndex extends \PHPUnit_Framework_MockObject_Matcher_Invoked */ public function matches(\PHPUnit_Framework_MockObject_Invocation $invocation) { + /** @noinspection PhpUndefinedFieldInspection */ if (!isset($this->indexes[$invocation->methodName])) { + /** @noinspection PhpUndefinedFieldInspection */ $this->indexes[$invocation->methodName] = 0; } else { + /** @noinspection PhpUndefinedFieldInspection */ $this->indexes[$invocation->methodName]++; } $this->currentIndex++; + /** @noinspection PhpUndefinedFieldInspection */ return $this->indexes[$invocation->methodName] == $this->sequenceIndex; } } diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php index 6fdfad49ed468..8fa36a4b5820d 100644 --- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php +++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php @@ -58,6 +58,11 @@ class DomMerger implements DomMergerInterface */ protected $isMergeSimpleXMLElement; + /** + * @var string + */ + protected $schema; + /** * Build DOM with initial XML contents and specifying identifier attributes for merging * diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php index 4430d18db1e70..73f125be77c79 100644 --- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php +++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php @@ -89,6 +89,11 @@ class Context implements ContextInterface */ protected $processor; + /** + * @var UiComponentFactory + */ + protected $uiComponentFactory; + /** * @param PageLayoutInterface $pageLayout * @param RequestInterface $request diff --git a/lib/internal/Magento/Framework/View/File/Collector/Theme.php b/lib/internal/Magento/Framework/View/File/Collector/Theme.php index 000142ea1ebe3..361abd4b542eb 100644 --- a/lib/internal/Magento/Framework/View/File/Collector/Theme.php +++ b/lib/internal/Magento/Framework/View/File/Collector/Theme.php @@ -7,7 +7,6 @@ use Magento\Framework\Component\ComponentRegistrar; use Magento\Framework\Component\ComponentRegistrarInterface; -use Magento\Framework\Filesystem; use Magento\Framework\Filesystem\Directory\ReadFactory; use Magento\Framework\View\Design\ThemeInterface; use Magento\Framework\View\File\CollectorInterface; @@ -18,6 +17,26 @@ */ class Theme implements CollectorInterface { + /** + * @var FileFactory + */ + private $fileFactory; + + /** + * @var ReadFactory + */ + private $readDirFactory; + + /** + * @var ComponentRegistrarInterface + */ + private $componentRegistrar; + + /** + * @var string + */ + private $subDir; + /** * Constructor * diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php index b82e79806acf9..4790d2691533b 100644 --- a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php +++ b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php @@ -6,15 +6,15 @@ namespace Magento\Framework\View\Layout\Generator; use Magento\Framework\View\Element\BlockFactory; +use Magento\Framework\View\Element\UiComponent\ContainerInterface; +use Magento\Framework\View\Element\UiComponent\ContextFactory as UiComponentContextFactory; +use Magento\Framework\View\Element\UiComponentFactory; +use Magento\Framework\View\Element\UiComponentInterface; use Magento\Framework\View\Layout\Data\Structure as DataStructure; use Magento\Framework\View\Layout\Element; +use Magento\Framework\View\Layout\Generator\Context as GeneratorContext; use Magento\Framework\View\Layout\GeneratorInterface; -use Magento\Framework\View\Element\UiComponentFactory; -use Magento\Framework\View\Element\UiComponentInterface; -use Magento\Framework\View\Element\UiComponent\ContainerInterface; use Magento\Framework\View\Layout\Reader\Context as ReaderContext; -use Magento\Framework\View\Layout\Generator\Context as GeneratorContext; -use Magento\Framework\View\Element\UiComponent\ContextFactory as UiComponentContextFactory; use Magento\Framework\View\LayoutInterface; /** @@ -42,6 +42,11 @@ class UiComponent implements GeneratorInterface */ protected $contextFactory; + /** + * @var BlockFactory + */ + protected $blockFactory; + /** * Constructor * diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php index 7df8079150921..cbfcbac7e44ba 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Body.php @@ -15,6 +15,11 @@ class Body implements Layout\GeneratorInterface */ const TYPE = 'body'; + /** + * @var \Magento\Framework\View\Page\Config + */ + private $pageConfig; + /** * Constructor * diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php index 95906ba75e335..295914f2c3e6c 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php @@ -6,7 +6,7 @@ namespace Magento\Framework\Webapi\Test\Unit\Rest\Response; -use \Magento\Framework\Webapi\Rest\Response\FieldsFilter; +use Magento\Framework\Webapi\Rest\Response\FieldsFilter; /** * Unit test for FieldsFilter @@ -23,9 +23,16 @@ class FieldsFilterTest extends \PHPUnit\Framework\TestCase */ protected $sampleResponseValue; - /** @var \Magento\Framework\Webapi\Rest\Request|\PHPUnit_Framework_MockObject_MockObject */ + /** + * @var \Magento\Framework\Webapi\Rest\Request|\PHPUnit_Framework_MockObject_MockObject + */ protected $requestMock; + /** + * @var FieldsFilter + */ + protected $processor; + /** * Setup SUT */