diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
index 4573f15b016fa47bab5cc0fa7c7010644c4ada6e..8cd04f7d1e4c54804ba32c3c8b5235f9da3dd1db 100644
--- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
+++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
@@ -74,10 +74,6 @@ class FrontendCompilation implements PreProcessorInterface
*/
public function process(PreProcessor\Chain $chain)
{
- $content = $chain->getContent();
- if (trim($content) !== '') {
- return;
- }
try {
$this->lockerProcess->lockProcess($this->lockName);
@@ -88,7 +84,7 @@ class FrontendCompilation implements PreProcessorInterface
/** @var FallbackContext $context */
$context = $chain->getAsset()->getContext();
- $result = $this->processContent($path, $content, $module, $context);
+ $result = $this->processContent($path, $chain->getContent(), $module, $context);
$chain->setContent($result['content']);
$chain->setContentType($result['sourceType']);
} finally {
@@ -107,14 +103,14 @@ class FrontendCompilation implements PreProcessorInterface
*/
private function processContent($path, $content, $module, FallbackContext $context)
{
- $sourceType = '#\.' . preg_quote(pathinfo($path, PATHINFO_EXTENSION), '#') . '$#';
+ $sourceTypePattern = '#\.' . preg_quote(pathinfo($path, PATHINFO_EXTENSION), '#') . '$#';
foreach ($this->alternativeSource->getAlternativesExtensionsNames() as $name) {
$asset = $this->assetBuilder->setArea($context->getAreaCode())
->setTheme($context->getThemePath())
->setLocale($context->getLocale())
->setModule($module)
- ->setPath(preg_replace($sourceType, '.' . $name, $path))
+ ->setPath(preg_replace($sourceTypePattern, '.' . $name, $path))
->build();
$processedContent = $this->assetSource->getContent($asset);
@@ -129,7 +125,7 @@ class FrontendCompilation implements PreProcessorInterface
return [
'content' => $content,
- 'sourceType' => $sourceType
+ 'sourceType' => pathinfo($path, PATHINFO_EXTENSION)
];
}
}
diff --git a/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php b/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php
index 97f0b1d5a6bdb081a47f22884f6dac93b3a743f1..b43d91c5e4dc6bc7768c47b1f8599c73b5855932 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php
@@ -189,38 +189,6 @@ class FrontendCompilationTest extends \PHPUnit_Framework_TestCase
$frontendCompilation->process($this->getChainMockExpects('', 1, 1, $newContentType));
}
- /**
- * Run test for process method (content not empty)
- */
- public function testProcessContentNotEmpty()
- {
- $chainMock = $this->getChainMock();
- $assetMock = $this->getAssetMock();
-
- $chainMock->expects(self::once())
- ->method('getContent')
- ->willReturn('test-content');
-
- $chainMock->expects(self::never())
- ->method('getAsset')
- ->willReturn($assetMock);
-
- $this->lockerProcessMock->expects(self::never())
- ->method('lockProcess');
- $this->lockerProcessMock->expects(self::never())
- ->method('unlockProcess');
-
- $frontendCompilation = new FrontendCompilation(
- $this->assetSourceMock,
- $this->assetBuilderMock,
- $this->alternativeSourceMock,
- $this->lockerProcessMock,
- 'lock'
- );
-
- $frontendCompilation->process($chainMock);
- }
-
/**
* @return Chain|\PHPUnit_Framework_MockObject_MockObject
*/
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
index 678e9306cbadb3bc22dafd9bca089a8b7f304ba7..211e09861995f27e22a446b93e465a7197936965 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
@@ -195,8 +195,8 @@
<data name="product/data/price_type" xsi:type="string">Yes</data>
<data name="product/data/price/dataset" xsi:type="string">dynamic-8</data>
<data name="product/data/special_price" xsi:type="string">20</data>
- <data name="product/data/special_from_date/pattern" xsi:type="string">M j, Y -1 day</data>
- <data name="product/data/special_to_date/pattern" xsi:type="string">M j, Y +3 days</data>
+ <data name="product/data/special_from_date/pattern" xsi:type="string">m/d/y -1 day</data>
+ <data name="product/data/special_to_date/pattern" xsi:type="string">m/d/y +3 days</data>
<data name="product/data/bundle_selections/dataset" xsi:type="string">default_dynamic</data>
<data name="product/data/bundle_selections/products" xsi:type="string">catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar</data>
<data name="product/data/checkout_data/dataset" xsi:type="string">bundle_default</data>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php
index 7a20762bbe9d4493131bb0f2acb8e432a0a9ddbf..607ee4c919a62437cdfaf0d2219248dfc77f7a27 100755
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php
@@ -198,6 +198,18 @@ class LayoutDirectivesTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($layout->isBlock('child_block2'));
}
+ /**
+ * @magentoAppIsolation enabled
+ */
+ public function testRemoveCancellation()
+ {
+ $layout = $this->_getLayoutModel('remove_cancellation.xml');
+ $this->assertTrue($layout->isContainer('container1'));
+ $this->assertTrue($layout->isBlock('child_block1'));
+ $this->assertTrue($layout->isBlock('no_name2'));
+ $this->assertFalse($layout->getBlock('not_exist'));
+ }
+
/**
* @magentoAppIsolation enabled
*/
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_cancellation.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_cancellation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff086b19fd1b02d80ffc849d9563bdb9419ae75e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/remove_cancellation.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout>
+ <container name="container1" label="Container 1">
+ <block class="Magento\Framework\View\Element\Text" name="no_name2"/>
+ </container>
+ <referenceContainer name="container1" remove="true"/>
+ <referenceBlock name="child_block1" remove="true"/>
+ <block class="Magento\Framework\View\Element\Text" name="block_container" as="block.container">
+ <block class="Magento\Framework\View\Element\Text" name="child_block1"/>
+ <block class="Magento\Framework\View\Element\Text" name="child_block2"/>
+ </block>
+ <referenceContainer name="not_exist" remove="false"/>
+ <referenceContainer name="container1" remove="false"/>
+ <referenceBlock name="child_block1" remove="false"/>
+</layout>
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
index 9831c52a4656310e99c424ce7cc7dd8cd17f68fe..ff5ade125521acff54a182cea51e7f34985292d0 100755
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
@@ -207,13 +207,15 @@ class Block implements Layout\ReaderInterface
$elementRemove = filter_var($currentElement->getAttribute('remove'), FILTER_VALIDATE_BOOLEAN);
if ($elementRemove) {
$scheduledStructure->setElementToRemoveList($elementName);
- } else {
- $data = $scheduledStructure->getStructureElementData($elementName, []);
- $data['attributes'] = $this->mergeBlockAttributes($data, $currentElement);
- $this->updateScheduledData($currentElement, $data);
- $this->evaluateArguments($currentElement, $data);
- $scheduledStructure->setStructureElementData($elementName, $data);
+ return;
+ } elseif ($currentElement->getAttribute('remove')) {
+ $scheduledStructure->unsetElementFromListToRemove($elementName);
}
+ $data = $scheduledStructure->getStructureElementData($elementName, []);
+ $data['attributes'] = $this->mergeBlockAttributes($data, $currentElement);
+ $this->updateScheduledData($currentElement, $data);
+ $this->evaluateArguments($currentElement, $data);
+ $scheduledStructure->setStructureElementData($elementName, $data);
}
/**
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php
index c4111a13c33b37fe7e5fcc202ec0773928a1844d..cd4956447a3b14a305e0ca90614633def896a6c7 100755
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php
@@ -141,11 +141,12 @@ class Container implements Layout\ReaderInterface
) {
$containerName = $currentElement->getAttribute('name');
$containerRemove = filter_var($currentElement->getAttribute('remove'), FILTER_VALIDATE_BOOLEAN);
-
if ($containerRemove) {
$scheduledStructure->setElementToRemoveList($containerName);
- } else {
- $this->mergeContainerAttributes($scheduledStructure, $currentElement);
+ return;
+ } elseif ($currentElement->getAttribute('remove')) {
+ $scheduledStructure->unsetElementFromListToRemove($containerName);
}
+ $this->mergeContainerAttributes($scheduledStructure, $currentElement);
}
}
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
index 24bbd9391807463226bbe5c276df9aca4c31fd59..8cf049f56f1743484f0d559e4f8abf0caaa6b5f3 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
@@ -188,6 +188,12 @@ class BlockTest extends \PHPUnit_Framework_TestCase
$setCondition,
$setRemoveCondition
) {
+ if ($literal == 'referenceBlock' && $remove == 'false') {
+ $this->scheduledStructure->expects($this->once())
+ ->method('unsetElementFromListToRemove')
+ ->with($literal);
+ }
+
$this->context->expects($this->once())->method('getScheduledStructure')
->will($this->returnValue($this->scheduledStructure));
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
index 4e10a5a6a08415ca9d06cb95f5e10fa3a9361c2e..198a70d2121f16962471d3e5f5587a1e89130c3f 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
@@ -102,6 +102,12 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
->with($contextMock, $elementCurrent)
->willReturnSelf();
+ if ($elementCurrent->getAttribute('remove') == 'false') {
+ $scheduledStructureMock->expects($this->once())
+ ->method('unsetElementFromListToRemove')
+ ->with($elementCurrent->getAttribute('name'));
+ }
+
$this->container->interpret($contextMock, $elementCurrent);
}