MAGETWO-43109: Prepare Pull Request

Michail Slabko · Michail Slabko · commit 824d4e4db9a6 · 2015-09-21T18:32:33.000+03:00
- fix tests
diff --git a/app/code/Magento/Ui/Component/Filters/FilterModifier.php b/app/code/Magento/Ui/Component/Filters/FilterModifier.php
@@ -38,7 +38,8 @@ public function __construct(RequestInterface $request, FilterBuilder $filterBuil
         $this->request = $request;
         $this->filterBuilder = $filterBuilder;
         $this->allowedConditionTypes = array_merge(
-            ['eq', 'neq', 'in', 'nin', 'null', 'notnull'], $allowedConditionTypes
+            ['eq', 'neq', 'in', 'nin', 'null', 'notnull'],
+            $allowedConditionTypes
         );
     }
 
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Select.php b/app/code/Magento/Ui/Component/Filters/Type/Select.php
@@ -10,6 +10,7 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Form\Element\Select as ElementSelect;
 use Magento\Ui\Component\Filters\FilterModifier;
+
 /**
  * Class Select
  */

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public function __construct(RequestInterface $request, FilterBuilder $filterBuil`
`38`	`38`	`$this->request = $request;`
`39`	`39`	`$this->filterBuilder = $filterBuilder;`
`40`	`40`	`$this->allowedConditionTypes = array_merge(`
`41`		`- ['eq', 'neq', 'in', 'nin', 'null', 'notnull'], $allowedConditionTypes`
	`41`	`+ ['eq', 'neq', 'in', 'nin', 'null', 'notnull'],`
	`42`	`+ $allowedConditionTypes`
`42`	`43`	`);`
`43`	`44`	`}`
`44`	`45`