MAGETWO-65470: The visibility conditions improvements

Static fixes.

Author: valdislav

dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php

@@ -67,7 +67,8 @@ public function testInterpretBlockDirective()
                 Block::ATTRIBUTE_TEMPLATE => 'test.phtml',
                 Block::ATTRIBUTE_TTL => 3,
                 Block::ATTRIBUTE_DISPLAY => '',
-                Block::ATTRIBUTE_ACL => ''
+                Block::ATTRIBUTE_ACL => '',
+                'visibilityConditions' => [],
             ],
             $resultElementData['attributes']
         );

lib/internal/Magento/Framework/View/Layout/Reader/Visibility/Condition.php

@@ -7,7 +7,9 @@
 
 use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Framework\Simplexml\Element;
+use Magento\Framework\View\Layout\AclCondition;
 use Magento\Framework\View\Layout\Argument\Parser;
+use Magento\Framework\View\Layout\ConfigCondition;
 
 /**
  * Parse conditions from element.
@@ -41,7 +43,6 @@ public function __construct(
         $this->argumentInterpreter = $argumentInterpreter;
     }
 
-
     /**
      * @param Element $element
      *
@@ -53,7 +54,7 @@ public function parseConditions(Element $element)
         $configPath = (string)$element->getAttribute('ifconfig');
         if (!empty($configPath)) {
             $visibilityConditions['ifconfig'] = [
-                'name' => 'Magento\Framework\View\Layout\ConfigCondition',
+                'name' => ConfigCondition::class,
                 'arguments' => [
                     'configPath' => $configPath
                 ],
@@ -63,7 +64,7 @@ public function parseConditions(Element $element)
         $aclResource = (string)$element->getAttribute('aclResource');
         if (!empty($aclResource)) {
             $visibilityConditions['acl'] = [
-                'name' => 'Magento\Framework\View\Layout\AclCondition',
+                'name' => AclCondition::class,
                 'arguments' => [
                     'acl' => $aclResource
                 ],

lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php

@@ -10,6 +10,8 @@
 namespace Magento\Framework\View\Test\Unit\Layout\Reader;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Layout\AclCondition;
+use Magento\Framework\View\Layout\ConfigCondition;
 use Magento\Framework\View\Layout\Reader\Block;
 use Magento\Framework\View\Layout\Reader\Visibility\Condition;
 
@@ -179,7 +181,7 @@ public function processBlockDataProvider()
                 '',
                 [
                     'acl' => [
-                        'name' => 'Magento\Framework\View\Layout\AclCondition',
+                        'name' => AclCondition::class,
                         'arguments' => [
                             'acl' => 'test'
                         ],
@@ -196,13 +198,13 @@ public function processBlockDataProvider()
                 'config_path',
                 [
                     'acl' => [
-                        'name' => 'Magento\Framework\View\Layout\AclCondition',
+                        'name' => AclCondition::class,
                         'arguments' => [
                             'acl' => 'test'
                         ],
                     ],
                     'ifconfig' => [
-                        'name' => 'Magento\Framework\View\Layout\ConfigCondition',
+                        'name' => ConfigCondition::class,
                         'arguments' => [
                             'configPath' => 'config_path'
                         ],
@@ -219,13 +221,13 @@ public function processBlockDataProvider()
                 '',
                 [
                     'acl' => [
-                        'name' => 'Magento\Framework\View\Layout\AclCondition',
+                        'name' => AclCondition::class,
                         'arguments' => [
                             'acl' => 'test'
                         ],
                     ],
                     'ifconfig' => [
-                        'name' => 'Magento\Framework\View\Layout\ConfigCondition',
+                        'name' => ConfigCondition::class,
                         'arguments' => [
                             'configPath' => 'config_path'
                         ],

lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php

@@ -10,6 +10,8 @@
 namespace Magento\Framework\View\Test\Unit\Layout\Reader;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Layout\AclCondition;
+use Magento\Framework\View\Layout\ConfigCondition;
 use Magento\Framework\View\Layout\Reader\Context;
 use Magento\Framework\View\Layout\Reader\UiComponent;
 use Magento\Framework\View\Layout\Reader\Visibility\Condition;
@@ -86,13 +88,13 @@ public function testInterpret($element)
                     'aclResource' => 'test_acl',
                     'visibilityConditions' => [
                         'ifconfig' => [
-                            'name' => 'Magento\Framework\View\Layout\ConfigCondition',
+                            'name' => ConfigCondition::class,
                             'arguments' => [
                                 'configPath' => 'config_path'
                             ],
                         ],
                         'acl' => [
-                            'name' => 'Magento\Framework\View\Layout\AclCondition',
+                            'name' => AclCondition::class,
                             'arguments' => [
                                 'acl' => 'test_acl'
                             ],