From f1d7757ccd325f84dc74bbeff1ecd27f8496485e Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Wed, 6 Jul 2016 11:55:53 +0300
Subject: [PATCH] MAGETWO-54935: [Github#1931] Cancellation of element removal
in layouts doesn't work
---
.../Magento/Framework/View/Layout/Reader/Block.php | 14 ++++++++------
.../Framework/View/Layout/Reader/Container.php | 7 ++++---
.../View/Test/Unit/Layout/Reader/BlockTest.php | 6 ++++++
.../View/Test/Unit/Layout/Reader/ContainerTest.php | 6 ++++++
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
index 9831c52a465..ff5ade12552 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 c4111a13c33..cd4956447a3 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 24bbd939180..8cf049f56f1 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 4e10a5a6a08..198a70d2121 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);
}
--
GitLab