magento-engcom
diff --git a/‎COPYING.txt
Lines changed: 1 addition & 1 deletion b/‎COPYING.txt
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/bootstrap.php
Lines changed: 3 additions & 2 deletions b/‎app/bootstrap.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎app/code/Magento/Backup/Model/Db.php
Lines changed: 1 addition & 0 deletions b/‎app/code/Magento/Backup/Model/Db.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/code/Magento/Backup/Model/ResourceModel/Db.php
Lines changed: 25 additions & 0 deletions b/‎app/code/Magento/Backup/Model/ResourceModel/Db.php
Lines changed: 25 additions & 0 deletions
diff --git a/‎app/code/Magento/Backup/Model/ResourceModel/Helper.php
Lines changed: 36 additions & 0 deletions b/‎app/code/Magento/Backup/Model/ResourceModel/Helper.php
Lines changed: 36 additions & 0 deletions
diff --git a/‎app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
Lines changed: 15 additions & 1 deletion b/‎app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
Lines changed: 15 additions & 1 deletion
diff --git a/‎app/code/Magento/Catalog/Model/Product/Option/Value.php
Lines changed: 2 additions & 1 deletion b/‎app/code/Magento/Catalog/Model/Product/Option/Value.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
Lines changed: 20 additions & 6 deletions b/‎app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
Lines changed: 20 additions & 6 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php
Lines changed: 2 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
Lines changed: 10 additions & 1 deletion b/‎app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
Lines changed: 10 additions & 1 deletion
diff --git a/‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
Lines changed: 2 additions & 1 deletion b/‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
Lines changed: 3 additions & 1 deletion b/‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
Lines changed: 3 additions & 1 deletion
diff --git a/‎app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
Lines changed: 2 additions & 2 deletions b/‎app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/code/Magento/CatalogImportExport/Model/Import/Product.php
Lines changed: 14 additions & 10 deletions b/‎app/code/Magento/CatalogImportExport/Model/Import/Product.php
Lines changed: 14 additions & 10 deletions
diff --git a/‎app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
Lines changed: 6 additions & 2 deletions b/‎app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
Lines changed: 6 additions & 2 deletions
@@ -1,4 +1,4 @@
-Copyright © 2013-2017 Magento, Inc.
+Copyright © 2013-2018 Magento, Inc.
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
 
 
@@ -49,12 +49,13 @@
     unset($_SERVER['ORIG_PATH_INFO']);
 }
 
-if (!empty($_SERVER['MAGE_PROFILER'])
+if (
+    (!empty($_SERVER['MAGE_PROFILER']) || file_exists(BP . '/var/profiler.flag'))
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
 ) {
     \Magento\Framework\Profiler::applyConfig(
-        $_SERVER['MAGE_PROFILER'],
+        (isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')),
         BP,
         !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
     );
 
@@ -173,6 +173,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
             }
         }
         $backup->write($this->getResource()->getTableForeignKeysSql());
+        $backup->write($this->getResource()->getTableTriggersSql());
         $backup->write($this->getResource()->getFooter());
 
         $this->getResource()->commitTransaction();
 
@@ -114,6 +114,31 @@ public function getTableForeignKeysSql($tableName = null)
         return $fkScript;
     }
 
+    /**
+     * Return triggers for table(s).
+     *
+     * @param string|null $tableName
+     * @param bool $addDropIfExists
+     * @return string
+     */
+    public function getTableTriggersSql($tableName = null, $addDropIfExists = true)
+    {
+        $triggerScript = '';
+        if (!$tableName) {
+            $tables = $this->getTables();
+            foreach ($tables as $table) {
+                $tableTriggerScript = $this->_resourceHelper->getTableTriggersSql($table, $addDropIfExists);
+                if (!empty($tableTriggerScript)) {
+                    $triggerScript .= "\n" . $tableTriggerScript;
+                }
+            }
+        } else {
+            $triggerScript = $this->getTableTriggersSql($tableName, $addDropIfExists);
+        }
+
+        return $triggerScript;
+    }
+
     /**
      * Retrieve table status
      *
 
@@ -337,4 +337,40 @@ public function restoreTransactionIsolationLevel()
     {
         $this->getConnection()->query('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
     }
+
+    /**
+     * Get create script for triggers.
+     *
+     * @param string $tableName
+     * @param boolean $addDropIfExists
+     * @param boolean $stripDefiner
+     * @return string
+     */
+    public function getTableTriggersSql($tableName, $addDropIfExists = false, $stripDefiner = true)
+    {
+        $script = "--\n-- Triggers structure for table `{$tableName}`\n--\n";
+        $triggers = $this->getConnection()->query('SHOW TRIGGERS LIKE \''. $tableName . '\'')->fetchAll();
+
+        if (!$triggers) {
+            return '';
+        }
+        foreach ($triggers as $trigger) {
+            if ($addDropIfExists) {
+                $script .= 'DROP TRIGGER IF EXISTS ' . $trigger['Trigger'] . ";\n";
+            }
+            $script .= "delimiter ;;\n";
+
+            $triggerData = $this->getConnection()->query('SHOW CREATE TRIGGER '. $trigger['Trigger'])->fetch();
+            if ($stripDefiner) {
+                $cleanedScript = preg_replace('/DEFINER=[^\s]*/', '', $triggerData['SQL Original Statement']);
+                $script .= $cleanedScript . "\n";
+            } else {
+                $script .= $triggerData['SQL Original Statement'] . "\n";
+            }
+            $script .= ";;\n";
+            $script .= "delimiter ;\n";
+        }
+
+        return $script;
+    }
 }
@@ -127,7 +127,7 @@ protected function processBundleOptionsData(\Magento\Catalog\Model\Product $prod
         }
         $options = [];
         foreach ($bundleOptionsData as $key => $optionData) {
-            if ((bool)$optionData['delete']) {
+            if (!empty($optionData['delete'])) {
                 continue;
             }
 
 
@@ -57,7 +57,10 @@ protected function setUp()
             'setOptions',
             'setCanSaveBundleSelections',
             '__wakeup',
-            'getOptionsReadonly'
+            'getOptionsReadonly',
+            'getBundleOptionsData',
+            'getExtensionAttributes',
+            'setExtensionAttributes',
         ];
         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, $methods);
         $optionInterfaceFactory = $this->getMockBuilder(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
@@ -127,6 +130,17 @@ public function testAfterInitializeIfBundleAnsCustomOptionsAndBundleSelectionsEx
         );
         $this->productMock->expects($this->once())->method('setOptions')->with(null);
         $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(true);
+        $this->productMock->expects($this->once())
+            ->method('getBundleOptionsData')
+            ->willReturn(['option_1' => ['delete' => 1]]);
+        $extentionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setBundleProductOptions'])
+            ->getMockForAbstractClass();
+        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
     }
 
 
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Pricing\Price\BasePrice;
 use Magento\Framework\Model\AbstractModel;
 
 /**
@@ -222,7 +223,7 @@ public function saveValues()
     public function getPrice($flag = false)
     {
         if ($flag && $this->getPriceType() == self::TYPE_PERCENT) {
-            $basePrice = $this->getOption()->getProduct()->getFinalPrice();
+            $basePrice = $this->getOption()->getProduct()->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getValue();
             $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);
             return $price;
         }
 
@@ -104,8 +104,8 @@ private function getMockedValueCollectionFactory()
 
         $mockBuilder =
             $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor();
+                ->setMethods(['create'])
+                ->disableOriginalConstructor();
         $mock = $mockBuilder->getMock();
 
         $mock->expects($this->any())
@@ -164,13 +164,27 @@ private function getMockedOption()
     private function getMockedProduct()
     {
         $mockBuilder = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->setMethods(['getFinalPrice', '__wakeup'])
+            ->setMethods(['getPriceInfo', '__wakeup'])
             ->disableOriginalConstructor();
         $mock = $mockBuilder->getMock();
 
-        $mock->expects($this->any())
-            ->method('getFinalPrice')
-            ->will($this->returnValue(10));
+        $priceInfoMock = $this->getMockForAbstractClass(
+            \Magento\Framework\Pricing\PriceInfoInterface::class,
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getPrice']
+        );
+
+        $priceMock = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Price\PriceInterface::class);
+
+        $priceInfoMock->expects($this->any())->method('getPrice')->willReturn($priceMock);
+
+        $mock->expects($this->any())->method('getPriceInfo')->willReturn($priceInfoMock);
+
+        $priceMock->expects($this->any())->method('getValue')->willReturn(10);
 
         return $mock;
     }
 
@@ -44,11 +44,13 @@ public function testWalkAttributes()
 
         $code = 'test_attr';
         $set = 10;
+        $storeId = 100;
 
         $object = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['__wakeup']);
 
         $object->setData('test_attr', 'test_attr');
         $object->setData('attribute_set_id', $set);
+        $object->setData('store_id', $storeId);
 
         $entityType = new \Magento\Framework\DataObject();
         $entityType->setEntityTypeCode('test');
 
@@ -154,7 +154,16 @@ public function testModifyMeta()
             ->method('getAll')
             ->willReturn([]);
 
-        $this->assertArrayHasKey(CustomOptions::GROUP_CUSTOM_OPTIONS_NAME, $this->getModel()->modifyMeta([]));
+        $meta = $this->getModel()->modifyMeta([]);
+
+        $this->assertArrayHasKey(CustomOptions::GROUP_CUSTOM_OPTIONS_NAME, $meta);
+
+        $buttonAdd = $meta['custom_options']['children']['container_header']['children']['button_add'];
+        $buttonAddTargetName = $buttonAdd['arguments']['data']['config']['actions'][0]['targetName'];
+        $expectedTargetName = '${ $.ns }.${ $.ns }.' . CustomOptions::GROUP_CUSTOM_OPTIONS_NAME
+            . '.' . CustomOptions::GRID_OPTIONS_NAME;
+
+        $this->assertEquals($expectedTargetName, $buttonAddTargetName);
     }
 
     /**
 
@@ -348,7 +348,8 @@ protected function getHeaderContainerConfig($sortOrder)
                                 'sortOrder' => 20,
                                 'actions' => [
                                     [
-                                        'targetName' => 'ns = ${ $.ns }, index = ' . static::GRID_OPTIONS_NAME,
+                                        'targetName' => '${ $.ns }.${ $.ns }.' . static::GROUP_CUSTOM_OPTIONS_NAME
+                                            . '.' . static::GRID_OPTIONS_NAME,
                                         'actionName' => 'processingAddChild',
                                     ]
                                 ]
 
@@ -88,7 +88,9 @@ $stores = $block->getStoresSortedBySortOrder();
     $values = [];
     foreach($block->getOptionValues() as $value) {
         $value = $value->getData();
-        $values[] = is_array($value) ? array_map("htmlspecialchars_decode", $value) : $value;
+        $values[] = is_array($value) ? array_map(function($str) {
+            return htmlspecialchars_decode($str, ENT_QUOTES);
+        }, $value) : $value;
     }
     ?>
     <script type="text/x-magento-init">
 
@@ -146,8 +146,8 @@ switch ($type = $block->getType()) {
         }
     break;
 
-    case 'other':
-    break;
+    default:
+        $exist = null;
 }
 ?>
 
 
@@ -11,6 +11,8 @@
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
@@ -20,7 +22,6 @@
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\Store\Model\Store;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Import entity product model
@@ -729,7 +730,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface $stockStateProvider
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\ImportExport\Model\Import\Config $importConfig
-     * @param Proxy\Product\ResourceFactory $resourceFactory
+     * @param Proxy\Product\ResourceModelFactory $resourceFactory
      * @param Product\OptionFactory $optionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $setColFactory
      * @param Product\Type\Factory $productTypeFactory
@@ -1121,12 +1122,12 @@ protected function _initTypeModels()
             $params = [$this, $productTypeName];
             if (!($model = $this->_productTypeFactory->create($productTypeConfig['model'], ['params' => $params]))
             ) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('Entity type model \'%1\' is not found', $productTypeConfig['model'])
                 );
             }
             if (!$model instanceof \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __(
                         'Entity type model must be an instance of '
                         . \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::class
@@ -1549,6 +1550,7 @@ public function getImagesFromRow(array $rowData)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @throws LocalizedException
      */
     protected function _saveProducts()
     {
@@ -1609,7 +1611,7 @@ protected function _saveProducts()
 
                         // wrong attribute_set_code was received
                         if (!$attributeSetId) {
-                            throw new \Magento\Framework\Exception\LocalizedException(
+                            throw new LocalizedException(
                                 __(
                                     'Wrong attribute set code "%1", please correct it and try again.',
                                     $rowData['attribute_set_code']
@@ -1822,7 +1824,7 @@ protected function _saveProducts()
                     ) {
                         $attrValue = $this->dateTime->formatDate($attrValue, false);
                     } elseif ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
-                        $attrValue = $this->dateTime->gmDate(
+                        $attrValue = gmdate(
                             'Y-m-d H:i:s',
                             $this->_localeDate->date($attrValue)->getTimestamp()
                         );
@@ -2004,7 +2006,7 @@ protected function _getUploader()
             }
 
             if (!$this->_fileUploader->setTmpDir($tmpPath)) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('File directory \'%1\' is not readable.', $tmpPath)
                 );
             }
@@ -2013,7 +2015,7 @@ protected function _getUploader()
 
             $this->_mediaDirectory->create($destinationPath);
             if (!$this->_fileUploader->setDestDir($destinationPath)) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('File directory \'%1\' is not writable.', $destinationPath)
                 );
             }
@@ -2035,6 +2037,8 @@ public function getUploader()
      * Return a new file name if the same file is already exists.
      *
      * @param string $fileName
+     * @param bool $renameFileOff [optional] boolean to pass.
+     * Default is false which will set not to rename the file after import.
      * @return string
      */
     protected function uploadMediaFiles($fileName, $renameFileOff = false)
@@ -2162,7 +2166,7 @@ protected function _saveStockItem()
                         $stockItemDo->setData($row);
                         $row['is_in_stock'] = $this->stockStateProvider->verifyStock($stockItemDo);
                         if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
-                            $row['low_stock_date'] = $this->dateTime->gmDate(
+                            $row['low_stock_date'] = gmdate(
                                 'Y-m-d H:i:s',
                                 (new \DateTime())->getTimestamp()
                             );
@@ -2678,7 +2682,7 @@ private function _customFieldsMapping($rowData)
     /**
      * Validate data rows and save bunches to DB
      *
-     * @return $this
+     * @return $this|AbstractEntity
      */
     protected function _saveValidatedBunches()
     {
 
@@ -119,8 +119,12 @@ protected function createCategory($name, $parentId)
         $category->setIsActive(true);
         $category->setIncludeInMenu(true);
         $category->setAttributeSetId($category->getDefaultAttributeSetId());
-        $category->save();
-        $this->categoriesCache[$category->getId()] = $category;
+        try {
+            $category->save();
+            $this->categoriesCache[$category->getId()] = $category;
+        } catch (\Exception $e) {
+            $this->addFailedCategory($category, $e);
+        }
 
         return $category->getId();
     }
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright © 2013-2017 Magento, Inc.`
	`1`	`+Copyright © 2013-2018 Magento, Inc.`
`2`	`2`
`3`	`3`	`Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`$backup->write($this->getResource()->getTableForeignKeysSql());`
	`176`	`+ $backup->write($this->getResource()->getTableTriggersSql());`
`176`	`177`	`$backup->write($this->getResource()->getFooter());`
`177`	`178`
`178`	`179`	`$this->getResource()->commitTransaction();`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected function processBundleOptionsData(\Magento\Catalog\Model\Product $prod`
`127`	`127`	`}`
`128`	`128`	`$options = [];`
`129`	`129`	`foreach ($bundleOptionsData as $key => $optionData) {`
`130`		`- if ((bool)$optionData['delete']) {`
	`130`	`+ if (!empty($optionData['delete'])) {`
`131`	`131`	`continue;`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`use Magento\Catalog\Model\Product;`
`10`	`10`	`use Magento\Catalog\Model\Product\Option;`
	`11`	`+use Magento\Catalog\Pricing\Price\BasePrice;`
`11`	`12`	`use Magento\Framework\Model\AbstractModel;`
`12`	`13`
`13`	`14`	`/**`
`@@ -222,7 +223,7 @@ public function saveValues()`
`222`	`223`	`public function getPrice($flag = false)`
`223`	`224`	`{`
`224`	`225`	`if ($flag && $this->getPriceType() == self::TYPE_PERCENT) {`
`225`		`- $basePrice = $this->getOption()->getProduct()->getFinalPrice();`
	`226`	`+ $basePrice = $this->getOption()->getProduct()->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getValue();`
`226`	`227`	`$price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);`
`227`	`228`	`return $price;`
`228`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,8 @@ protected function getHeaderContainerConfig($sortOrder)`
`348`	`348`	`'sortOrder' => 20,`
`349`	`349`	`'actions' => [`
`350`	`350`	`[`
`351`		`- 'targetName' => 'ns = ${ $.ns }, index = ' . static::GRID_OPTIONS_NAME,`
	`351`	`+ 'targetName' => '${ $.ns }.${ $.ns }.' . static::GROUP_CUSTOM_OPTIONS_NAME`
	`352`	`+ . '.' . static::GRID_OPTIONS_NAME,`
`352`	`353`	`'actionName' => 'processingAddChild',`
`353`	`354`	`]`
`354`	`355`	`]`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ switch ($type = $block->getType()) {`
`146`	`146`	`}`
`147`	`147`	`break;`
`148`	`148`
`149`		`- case 'other':`
`150`		`- break;`
	`149`	`+ default:`
	`150`	`+ $exist = null;`
`151`	`151`	`}`
`152`	`152`	`?>`
`153`	`153`