Add version 2.2.3

Author: imsamthomas

composer.json

@@ -2,20 +2,20 @@
     "name": "magento/project-community-edition",
     "description": "eCommerce Platform for Growth (Community Edition)",
     "type": "project",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/product-community-edition": "2.2.2",
+        "magento/product-community-edition": "2.2.3",
         "composer/composer": "@alpha"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.2.0",
-        "squizlabs/php_codesniffer": "3.1.1",
+        "squizlabs/php_codesniffer": "3.2.2",
         "phpmd/phpmd": "@stable",
-        "pdepend/pdepend": "2.5.0",
+        "pdepend/pdepend": "2.5.2",
         "friendsofphp/php-cs-fixer": "~2.2.0",
         "lusitanian/oauth": "~0.8.10",
         "sebastian/phpcpd": "2.0.4"

composer.lock

@@ -82,6 +82,13 @@ class Options extends Section
      */
     protected $sortRowsData = [];
 
+    /**
+     * Locator for file_extension field.
+     *
+     * @var string
+     */
+    private $hintMessage = "div[data-index='file_extension'] div[id^='notice']";
+
     /**
      * Fill custom options form on tab.
      *
@@ -385,4 +392,14 @@ public function getValuesDataForOption(array $options, string $optionType, strin
 
         return $formDataItem;
     }
+
+    /**
+     * Returns notice-message elements for 'file_extension' fields.
+     *
+     * @return ElementInterface[]
+     */
+    public function getFileOptionElements()
+    {
+        return $this->_rootElement->getElements($this->hintMessage);
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php

@@ -650,6 +650,7 @@ function () {
      */
     public function isVideoVisible()
     {
+        $this->waitForElementNotVisible($this->galleryLoader);
         return $this->_rootElement->find($this->videoContainer)->isVisible();
     }
 

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Mtf\Fixture\FixtureInterface;
+
+/**
+ * Asserts what custom option values are same as expected.
+ */
+class AssertCustomOptions extends AssertProductForm
+{
+    /**
+     * Assert form data equals fixture data
+     *
+     * @param FixtureInterface $product
+     * @param CatalogProductIndex $productGrid
+     * @param CatalogProductEdit $productPage
+     * @return void
+     */
+    public function processAssert(
+        FixtureInterface $product,
+        CatalogProductIndex $productGrid,
+        CatalogProductEdit $productPage
+    ) {
+        $expectedCustomOptions = $this->arguments['expectedCustomOptions'];
+        $filter = ['sku' => $product->getSku()];
+        $productGrid->open();
+        $productGrid->getProductGrid()->searchAndOpen($filter);
+        $productData = [];
+        if ($product->hasData('custom_options')) {
+            $productData = $this->addExpectedOptionValues($product, $expectedCustomOptions);
+        }
+        $fixtureData = $this->prepareFixtureData($productData, $this->sortFields);
+        $formData = $this->prepareFormData($productPage->getProductForm()->getData($product), $this->sortFields);
+        $error = $this->verifyData($fixtureData, $formData);
+        \PHPUnit_Framework_Assert::assertTrue(empty($error), $error);
+    }
+
+    /**
+     * Adds expected value of Custom Options.
+     *
+     * @param FixtureInterface $product
+     * @param array $expectedCustomOptions
+     * @return array
+     */
+    private function addExpectedOptionValues(FixtureInterface $product, array $expectedCustomOptions)
+    {
+        /** @var array $customOptionsSource */
+        $customOptionsSource = $product->getDataFieldConfig('custom_options')['source']->getCustomOptions();
+        foreach (array_keys($customOptionsSource) as $optionKey) {
+            foreach ($expectedCustomOptions as $expectedCustomOption) {
+                if ($customOptionsSource[$optionKey]['type'] === $expectedCustomOption['optionType']) {
+                    $options = array_keys($customOptionsSource[$optionKey]['options']);
+                    $optionField = $expectedCustomOption['optionField'];
+                    $optionValue = $expectedCustomOption['optionValue'];
+                    foreach ($options as $optionsKey) {
+                        $customOptionsSource[$optionKey]['options'][$optionsKey][$optionField] = $optionValue;
+                    }
+                }
+            }
+        }
+
+        return ['custom_options' => $customOptionsSource];
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Custom option values are same as expected.';
+    }
+}

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCustomOptions.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+
+/**
+ * Checks file_extension field hint on the product page custom options section.
+ */
+class AssertFileExtensionHints extends AbstractAssertForm
+{
+    /**
+     * Expected file_extension field hint.
+     *
+     * @var string
+     */
+    const EXPECTED_MESSAGE = 'Enter separated extensions, like: png, jpg, gif.';
+
+    /**
+     * Assert that file extension message is showed.
+     *
+     * @param CatalogProductEdit $productPage
+     * @return void
+     */
+    public function processAssert(CatalogProductEdit $productPage)
+    {
+        /** @var  ProductForm $productForm */
+        $productForm = $productPage->getProductForm();
+        $productForm->openSection('customer-options');
+        /** @var \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\Options $options */
+        $options = $productForm->getSection('customer-options');
+        $fileOptionElements = $options->getFileOptionElements();
+        foreach ($fileOptionElements as $fileOptionElement) {
+            \PHPUnit_Framework_Assert::assertEquals(
+                self::EXPECTED_MESSAGE,
+                $fileOptionElement->getText(),
+                'Actual message differ from expected.'
+            );
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Assert correct file extensions hint is showed.';
+    }
+}

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertFileExtensionHints.php

@@ -726,5 +726,21 @@
                 </item>
             </field>
         </dataset>
+
+        <dataset name="file_option_type">
+            <field name="0" xsi:type="array">
+                <item name="title" xsi:type="string">custom option file %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">File/File</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">40</item>
+                        <item name="price_type" xsi:type="string">Percent</item>
+                        <item name="sku" xsi:type="string">file_option</item>
+                        <item name="file_extension" xsi:type="string">jpg, jpg gif .png</item>
+                    </item>
+                </item>
+            </field>
+        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml

@@ -219,5 +219,24 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
         </variation>
+        <variation name="CreateSimpleProductWithFileOption" summary="Check that Compatible File Extensions are parsed correctly" ticketId="MAGETWO-85866">
+            <data name="description" xsi:type="string">Create product with file option</data>
+            <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
+            <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
+            <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
+            <data name="product/data/price/value" xsi:type="string">1000</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">100</data>
+            <data name="product/data/custom_options/dataset" xsi:type="string">file_option_type</data>
+            <data name="expectedCustomOptions" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="optionType" xsi:type="string">File/File</item>
+                    <item name="optionField" xsi:type="string">file_extension</item>
+                    <item name="optionValue" xsi:type="string">jpg, gif, png</item>
+                </item>
+            </data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCustomOptions" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertFileExtensionHints" />
+        </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles class.
+ */
+class DeleteFilesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles
+     */
+    private $model;
+
+    /**
+     * @var  \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $imagesHelper;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
+    /**
+     * @var string
+     */
+    private $fileName = 'magento_small_image.jpg';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $directoryName = 'directory1';
+        $filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper */
+        $this->imagesHelper = $objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->fullDirectoryPath = $this->imagesHelper->getStorageRoot() . '/' . $directoryName;
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $filePath =  $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
+        $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
+        copy($fixtureDir . '/' . $this->fileName, $filePath);
+        $this->model = $objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::class);
+    }
+
+    /**
+     * Execute method with correct directory path and file name to check that files under WYSIWYG media directory
+     * can be removed.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('files', [$this->imagesHelper->idEncode($this->fileName)]);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+        $this->assertFalse(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . $this->fileName)
+            )
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        if ($directory->isExist('wysiwyg')) {
+            $directory->delete('wysiwyg');
+        }
+    }
+}