Merge branch 'PR4' into product-video-PR4

Author: Igor Miniailo

app/code/Magento/ProductVideo/Test/Unit/Helper/MediaTest.php

@@ -99,5 +99,4 @@ public function testGetYouTubeApiKey()
             $this->helper->getYouTubeApiKey()
         );
     }
-
 }

lib/internal/Magento/Framework/Config/Converter.php

@@ -48,7 +48,7 @@ public function convert($source)
     /**
      * Parse node values from xml nodes
      *
-     * @param $childNode
+     * @param \DOMElement $childNode
      * @return array
      */
     protected function parseNodes($childNode)

lib/internal/Magento/Framework/Config/FileResolver.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\View\DesignInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Symfony\Component\Config\Definition\Exception\Exception;
 
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
@@ -45,14 +46,12 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
      * @param FileIteratorFactory $iteratorFactory
      * @param DesignInterface $designInterface
-     * @param \Magento\Framework\Filesystem $filesystem
      * @param DirectoryList $directoryList
      */
     public function __construct(
         Reader $moduleReader,
         FileIteratorFactory $iteratorFactory,
         DesignInterface $designInterface,
-        Filesystem $filesystem,
         DirectoryList $directoryList
     ) {
         $this->directoryList = $directoryList;
@@ -78,9 +77,14 @@ public function get($filename, $scope)
                     . '/'
                     . $this->themePath
                     . '/etc/view.xml';
-                $designDom = new \DOMDocument;
-                $designDom->load($designPath);
-                $iterator[$designPath] = $designDom->saveXML();
+                if (file_exists($designPath)) {
+                    try {
+                        $designDom = new \DOMDocument;
+                        $designDom->load($designPath);
+                        $iterator[$designPath] = $designDom->saveXML();
+                    } catch (Exception $e) {
+                    }
+                }
                 break;
             default:
                 $iterator = $this->iteratorFactory->create([]);

lib/internal/Magento/Framework/Config/View.php

@@ -13,9 +13,6 @@
 
 class View extends \Magento\Framework\Config\Reader\Filesystem
 {
-    /** @var UrnResolver */
-    protected $urnResolver;
-
     /**
      * @var array
      */
@@ -27,7 +24,6 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
      * @param SchemaLocatorInterface $schemaLocator
      * @param ValidationStateInterface $validationState
      * @param string $fileName
-     * @param UrnResolver $urnResolver
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
@@ -39,15 +35,13 @@ public function __construct(
         SchemaLocatorInterface $schemaLocator,
         ValidationStateInterface $validationState,
         $fileName,
-        UrnResolver $urnResolver,
         $idAttributes = [],
         $domDocumentClass = 'Magento\Framework\Config\Dom',
         $defaultScope = 'global',
         $xpath = []
     ) {
         $this->xpath = $xpath;
-        $this->urnResolver = $urnResolver;
-        $idAttributes = $this->_getIdAttributes();
+        $idAttributes = $this->getIdAttributes();
         parent::__construct(
             $fileResolver,
             $converter,
@@ -61,16 +55,6 @@ public function __construct(
         $this->data = $this->read();
     }
 
-    /**
-     * Path to view.xsd
-     *
-     * @return string
-     */
-    public function getSchemaFile()
-    {
-        return $this->urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd');
-    }
-
     /**
      * Get a list of variables in scope of specified module
      *
@@ -151,26 +135,14 @@ public function getDomConfigCopy()
      *
      * @return array
      */
-    protected function _getIdAttributes()
-    {
-        $idAttributes = $this->addIdAttributes($this->xpath);
-        return $idAttributes;
-    }
-
-    /**
-     * Add attributes for module identification
-     *
-     * @param array $xpath
-     * @return array
-     */
-    protected function addIdAttributes($xpath)
+    protected function getIdAttributes()
     {
         $idAttributes = [
             '/view/vars' => 'module',
             '/view/vars/var' => 'name',
             '/view/exclude/item' => ['type', 'item'],
         ];
-        foreach ($xpath as $attribute) {
+        foreach ($this->xpath as $attribute) {
             if (is_array($attribute)) {
                 foreach ($attribute as $key => $id) {
                     if (count($id) > 1) {

lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php

@@ -17,49 +17,24 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     /** @var ObjectManagerHelper */
     protected $objectManagerHelper;
 
-    /** @var \Magento\Framework\Module\Dir\Reader | \PHPUnit_Framework_MockObject_MockObject */
-    protected $readerMock;
-
-    /** @var \Magento\Framework\Filesystem | \PHPUnit_Framework_MockObject_MockObject */
-    protected $filesystemMock;
-
     /** @var \Magento\Framework\View\Asset\Repository | \PHPUnit_Framework_MockObject_MockObject */
     protected $repositoryMock;
 
-    /** @var \Magento\Framework\View\FileSystem | \PHPUnit_Framework_MockObject_MockObject */
-    protected $fileSystemMock;
-
-    /** @var \Magento\Framework\Config\FileIteratorFactory | \PHPUnit_Framework_MockObject_MockObject */
-    protected $fileIteratorFactoryMock;
-
-    /** @var \Magento\Framework\Filesystem\Directory\ReadInterface | \PHPUnit_Framework_MockObject_MockObject */
-    protected $directoryReadMock;
-
     /**
      * @var \Magento\Framework\Config\ViewFactory | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $viewConfigFactoryMock;
 
     protected function setUp()
     {
-        $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
-        $this->directoryReadMock = $this->getMock('Magento\Framework\Filesystem\Directory\ReadInterface');
         $this->repositoryMock = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
-        $this->fileIteratorFactoryMock = $this->getMock(
-            'Magento\Framework\Config\FileIteratorFactory',
-            [],
-            [],
-            '',
-            false
-        );
         $this->viewConfigFactoryMock = $this->getMock('Magento\Framework\Config\ViewFactory', [], [], '', false);
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->config = $this->objectManagerHelper->getObject(
             'Magento\Framework\View\Config',
             [
                 'assetRepo' => $this->repositoryMock,
-                'fileIteratorFactory' => $this->fileIteratorFactoryMock,
-                'viewFactory' => $this->viewConfigFactoryMock
+                'viewConfigFactory' => $this->viewConfigFactoryMock
             ]
         );
     }
@@ -68,12 +43,19 @@ public function testGetViewConfig()
     {
         $themeMock = $this->getMock(
             'Magento\Theme\Model\Theme',
-            ['getCustomViewConfigPath'],
+            ['getCode'],
             [],
             '',
             false
         );
+        $themeMock->expects($this->atLeastOnce())
+            ->method('getCode')
+            ->will($this->returnValue(2));
         $params = ['themeModel' => $themeMock];
+        $this->repositoryMock->expects($this->atLeastOnce())
+            ->method('updateDesignParams')
+            ->with($this->equalTo($params))
+            ->will($this->returnSelf());
         $configViewMock = $this->getMock('Magento\Framework\Config\View', [], [], '', false);
         $this->viewConfigFactoryMock->expects($this->once())
             ->method('create')