MAGETWO-54729: Deliver fixed issues

- Fixes after PR review

Author: Valeriy Nayda

app/code/Magento/Catalog/Api/CategoryListInterface.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */

app/code/Magento/Catalog/Api/Data/CategorySearchResultsInterface.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */

app/code/Magento/Catalog/Model/CategoryList.php

@@ -1,10 +1,8 @@
 <?php
 /**
- *
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Model;
 
 use Magento\Catalog\Api\CategoryListInterface;
@@ -24,22 +22,22 @@ class CategoryList implements CategoryListInterface
     /**
      * @var CollectionFactory
      */
-    protected $categoryCollectionFactory;
+    private $categoryCollectionFactory;
 
     /**
      * @var JoinProcessorInterface
      */
-    protected $extensionAttributesJoinProcessor;
+    private $extensionAttributesJoinProcessor;
 
     /**
      * @var CategorySearchResultsInterfaceFactory
      */
-    protected $categorySearchResultsFactory;
+    private $categorySearchResultsFactory;
 
     /**
      * @var CategoryRepositoryInterface
      */
-    protected $categoryRepository;
+    private $categoryRepository;
 
     /**
      * @param CollectionFactory $categoryCollectionFactory
@@ -100,6 +98,8 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     }
 
     /**
+     * Add filter group to collection
+     *
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php

@@ -35,6 +35,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $arguments['conditionFactory'] = $this->conditionFactory;
+        $arguments['excludedAttributes'] = ['excluded_attribute'];
 
         $this->condition = $objectManagerHelper->getObject(
             'Magento\CatalogWidget\Model\Rule\Condition\Combine',
@@ -56,6 +57,7 @@ public function testGetNewChildSelectOptions()
         $attributeOptions = [
             'sku' => 'SKU',
             'category' => 'Category',
+            'excluded_attribute' => 'Excluded attribute',
         ];
         $productCondition = $this->getMockBuilder('\Magento\CatalogWidget\Model\Rule\Condition\Product')
             ->setMethods(['loadAttributeOptions', 'getAttributeOption'])

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryListTest.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */