MAGETWO-65470: The visibility conditions improvements

Rename andcondition to general condition.

Author: valdislav

lib/internal/Magento/Framework/View/Layout/Condition/AndCondition.php renamed to lib/internal/Magento/Framework/View/Layout/Condition/Condition.php

@@ -8,7 +8,7 @@
 /**
  * Composite condition which iterate over included conditions.
  */
-class AndCondition
+class Condition
 {
     /**
      * @var VisibilityConditionInterface[]

lib/internal/Magento/Framework/View/Layout/Condition/AndConditionFactory.php renamed to lib/internal/Magento/Framework/View/Layout/Condition/ConditionFactory.php

@@ -10,7 +10,7 @@
 /**
  * Factory for composite.
  */
-class AndConditionFactory
+class ConditionFactory
 {
     /**
      * @var ObjectManagerInterface
@@ -28,14 +28,14 @@ public function __construct(ObjectManagerInterface $objectManager)
     /**
      * @param array $elementVisibilityConditions
      *
-     * @return AndCondition
+     * @return Condition
      */
     public function create(array $elementVisibilityConditions)
     {
         $conditions = [];
         foreach ($elementVisibilityConditions as $condition) {
             $conditions[] = $this->objectManager->create($condition['name']);
         }
-        return $this->objectManager->create(AndCondition::class, ['conditions' => $conditions]);
+        return $this->objectManager->create(Condition::class, ['conditions' => $conditions]);
     }
 }

lib/internal/Magento/Framework/View/Layout/GeneratorPool.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Layout;
 
-use Magento\Framework\View\Layout\Condition\AndConditionFactory;
+use Magento\Framework\View\Layout\Condition\ConditionFactory;
 
 /**
  * Pool of generators for structural elements
@@ -28,24 +28,24 @@ class GeneratorPool
     protected $logger;
 
     /**
-     * @var \Magento\Framework\View\Layout\Condition\AndConditionFactory
+     * @var \Magento\Framework\View\Layout\Condition\ConditionFactory
      */
-    private $andConditionFactory;
+    private $conditionFactory;
 
     /**
      * @param ScheduledStructure\Helper $helper
-     * @param AndConditionFactory $andConditionFactory
+     * @param ConditionFactory $conditionFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param array $generators
      */
     public function __construct(
         ScheduledStructure\Helper $helper,
-        AndConditionFactory $andConditionFactory,
+        ConditionFactory $conditionFactory,
         \Psr\Log\LoggerInterface $logger,
         array $generators = null
     ) {
         $this->helper = $helper;
-        $this->andConditionFactory = $andConditionFactory;
+        $this->conditionFactory = $conditionFactory;
         $this->logger = $logger;
         $this->addGenerators($generators);
     }
@@ -123,8 +123,8 @@ protected function buildStructure(ScheduledStructure $scheduledStructure, Data\S
                 array_key_exists('visibilityConditions', $data['attributes']) &&
                 !empty($data['attributes']['visibilityConditions'])
             ) {
-                $andCondition = $this->andConditionFactory->create($data['attributes']['visibilityConditions']);
-                if (!$andCondition->isVisible($data['attributes']['visibilityConditions'])) {
+                $condition = $this->conditionFactory->create($data['attributes']['visibilityConditions']);
+                if (!$condition->isVisible($data['attributes']['visibilityConditions'])) {
                     $this->removeElement($scheduledStructure, $structure, $name);
                 }
             }