Merge branch 'PR4' into product-video-PR4

Igor Miniailo · Igor Miniailo · commit 2424d1fb8235 · 2015-11-03T13:58:30.000+02:00
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -332,10 +332,10 @@ public function setSize($size)
         list($width, $height) = explode('x', strtolower($size), 2);
         foreach (['width', 'height'] as $wh) {
             ${$wh}
-            = (int)${$wh};
+                = (int)${$wh};
             if (empty(${$wh})) {
                 ${$wh}
-                = null;
+                    = null;
             }
         }
 
@@ -353,7 +353,8 @@ protected function _checkMemory($file = null)
     {
         return $this->_getMemoryLimit() > $this->_getMemoryUsage() + $this->_getNeedMemoryForFile(
             $file
-        ) || $this->_getMemoryLimit() == -1;
+        )
+        || $this->_getMemoryLimit() == -1;
     }
 
     /**
@@ -710,8 +711,8 @@ public function getUrl()
             );
         } else {
             $url = $this->_storeManager->getStore()->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-            ) . $this->_newFile;
+                    \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+                ) . $this->_newFile;
         }
 
         return $url;
@@ -939,14 +940,17 @@ protected function _fileExists($filename)
      */
     public function getResizedImageInfo()
     {
+        $fileInfo = null;
         if ($this->_newFile === true) {
-            $fileInfo = getimagesize(
-                $this->_assetRepo->createAsset(
-                    "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
-                )->getSourceFile()
+            $asset = $this->_assetRepo->createAsset(
+                "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
             );
+            $img = $asset->getSourceFile();
+            $fileInfo = getimagesize($img);
         } else {
-            $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+            if ($this->_mediaDirectory->isFile($this->_mediaDirectory->getAbsolutePath($this->_newFile))) {
+                $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+            }
         }
         return $fileInfo;
     }
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -549,7 +549,13 @@ define([
                     waitForFroogaloop = setInterval($.proxy(function () {
                         if (window.Froogaloop) {
                             clearInterval(waitForFroogaloop);
+                            fotorama.requestFullScreen();
                             $(this.element).data('fotorama').activeFrame.$stageFrame[0].click();
+                            $('.fotorama__fullscreen-icon').css({
+                                opacity: '1',
+                                visibility: 'visible',
+                                display: 'block'
+                            });
                             this.Base = false;
                         }
                     }, this), 50);
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php
@@ -47,7 +47,6 @@ public function __construct(array $params, $data = [])
      *
      * @param string $filename
      * @return void
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     protected function createTestImage($filename)
     {
@@ -58,8 +57,6 @@ protected function createTestImage($filename)
 
             // Create a color (this first call to imageColorAllocate
             //  also automatically sets the image background color)
-            $colorRed = imageColorAllocate($image, 255, 0, 0);
-            // Create another color
             $colorYellow = imageColorAllocate($image, 255, 255, 0);
 
             // Draw a rectangle
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml
@@ -11,17 +11,33 @@
             <field name="catalog/product_video/youtube_api_key" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">Yes</item>
                 <item name="value" xsi:type="string">AIzaSyDwqDWuw1lra-LnpJL2Mr02DYuFmkuRSns</item>
             </field>
         </dataset>
         <dataset name="youtube_api_key_rollback">
             <field name="catalog/product_video/youtube_api_key" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string"/>
+                <item name="label" xsi:type="string">Yes</item>
                 <item name="value" xsi:type="string"/>
             </field>
         </dataset>
+        <dataset name="play_if_base">
+            <field name="catalog/product_video/play_if_base" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="string">0</item>
+            </field>
+        </dataset>
+        <dataset name="play_if_base_rollback">
+            <field name="catalog/product_video/play_if_base" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="string">1</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
@@ -34,7 +34,7 @@
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 1"</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -46,6 +46,7 @@
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 2"</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -56,7 +57,7 @@
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -66,6 +67,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -75,14 +77,15 @@
             <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation2">
             <data name="description" xsi:type="string">Edit vimeo URL</data>
             <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/16342611</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation3">
@@ -91,6 +94,7 @@
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
             <data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation4">
@@ -100,7 +104,7 @@
             <data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
             <data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
             <data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="GetVideoInfoTestVariation1">
@@ -109,7 +113,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="video/video_title" xsi:type="string">Foo Fighters - Congregation</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
         </variation>
         <variation name="GetVideoInfoTestVariation2">
@@ -118,6 +122,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="video/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
         </variation>
     </testCase>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -9,6 +9,13 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 $obectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$obectManager->get(
+    'Magento\Framework\View\DesignInterface'
+)->setArea(
+    'frontend'
+)->setDefaultDesignTheme();
+
 /** @var \Magento\Catalog\Model\Product\Media\Config $config */
 $config = $obectManager->get('Magento\Catalog\Model\Product\Media\Config');
 /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -174,9 +174,31 @@ public function getFilenameDataProvider()
     public function testGetViewConfig()
     {
         $this->_emulateFixtureTheme();
-        $config = $this->_viewConfig->getViewConfig();
-        $this->assertInstanceOf('Magento\Framework\Config\View', $config);
-        $this->assertEquals(['var1' => 'value1', 'var2' => 'value2'], $config->getVars('Namespace_Module'));
+        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        $theme = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Framework\View\DesignInterface'
+        )->getDesignTheme();
+        $customConfigFile = $theme->getCustomization()->getCustomViewConfigPath();
+        /** @var $filesystem \Magento\Framework\Filesystem */
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create('Magento\Framework\Filesystem');
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $relativePath = $directory->getRelativePath($customConfigFile);
+        try {
+            $directory->writeFile(
+                $relativePath,
+                '<?xml version="1.0" encoding="UTF-8"?>
+                <view><vars  module="Namespace_Module"><var name="var">var value</var></vars></view>'
+            );
+
+            $config = $this->_viewConfig->getViewConfig();
+            $this->assertInstanceOf('Magento\Framework\Config\View', $config);
+            $this->assertEquals('var value', $config->getVarValue('Namespace_Module', 'var'));
+        } catch (\Exception $e) {
+            $directory->delete($relativePath);
+            throw $e;
+        }
+        $directory->delete($relativePath);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -43,23 +43,33 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface
     protected $area;
 
     /**
-     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     * Root directory
+     *
+     * @var ReadInterface
+     */
+    protected $rootDirectory;
+
+    /**
+     * @param Reader $moduleReader
      * @param FileIteratorFactory $iteratorFactory
      * @param DesignInterface $designInterface
      * @param DirectoryList $directoryList
+     * @param Filesystem $filesystem
      */
     public function __construct(
         Reader $moduleReader,
         FileIteratorFactory $iteratorFactory,
         DesignInterface $designInterface,
-        DirectoryList $directoryList
+        DirectoryList $directoryList,
+        Filesystem $filesystem
     ) {
         $this->directoryList = $directoryList;
         $this->iteratorFactory = $iteratorFactory;
         $this->moduleReader = $moduleReader;
         $this->currentTheme = $designInterface->getDesignTheme();
         $this->themePath = $designInterface->getThemePath($this->currentTheme);
         $this->area = $designInterface->getArea();
+        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
     /**
@@ -70,6 +80,16 @@ public function get($filename, $scope)
         switch ($scope) {
             case 'global':
                 $iterator = $this->moduleReader->getConfigurationFiles($filename)->toArray();
+
+                $themeConfigFile = $this->currentTheme->getCustomization()->getCustomViewConfigPath();
+                if ($themeConfigFile
+                    && $this->rootDirectory->isExist($this->rootDirectory->getRelativePath($themeConfigFile))
+                ) {
+                    $iterator[$this->rootDirectory->getRelativePath($themeConfigFile)] = $this->rootDirectory->readFile(
+                        $this->rootDirectory->getRelativePath($themeConfigFile)
+                    );
+                }
+
                 $designPath =
                     $this->directoryList->getPath(DirectoryList::APP)
                     . '/design/'

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ public function __construct(array $params, $data = [])`
`47`	`47`	`*`
`48`	`48`	`* @param string $filename`
`49`	`49`	`* @return void`
`50`		`- * @SuppressWarnings(PHPMD.UnusedLocalVariable)`
`51`	`50`	`*/`
`52`	`51`	`protected function createTestImage($filename)`
`53`	`52`	`{`
`@@ -58,8 +57,6 @@ protected function createTestImage($filename)`
`58`	`57`
`59`	`58`	`// Create a color (this first call to imageColorAllocate`
`60`	`59`	`// also automatically sets the image background color)`
`61`		`- $colorRed = imageColorAllocate($image, 255, 0, 0);`
`62`		`- // Create another color`
`63`	`60`	`$colorYellow = imageColorAllocate($image, 255, 255, 0);`
`64`	`61`
`65`	`62`	`// Draw a rectangle`