MAGETWO-98202: Additional Permissions for Design settings

Author: OlgaVasyltsun

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

@@ -319,8 +319,8 @@ public function __construct(
             $resourceCollection,
             $data
         );
-        $this->userContext = $userContext ?? ObjectManager::getInstance()->get(UserContextInterface::class);
-        $this->authorization = $authorization ?? ObjectManager::getInstance()->get(AuthorizationInterface::class);
+        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
     }
 
     /**

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -159,7 +159,7 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->request = $request;
         $this->categoryFactory = $categoryFactory;
-        $this->auth = $auth ?? \Magento\Framework\App\ObjectManager::getInstance()->get(AuthorizationInterface::class);
+        $this->auth = $auth ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AuthorizationInterface::class);
 
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->meta = $this->prepareMeta($this->meta);

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

@@ -479,8 +479,8 @@ public function __construct(
             $resourceCollection,
             $data
         );
-        $this->userContext = $userContext ?? ObjectManager::getInstance()->get(UserContextInterface::class);
-        $this->authorization = $authorization ?? ObjectManager::getInstance()->get(AuthorizationInterface::class);
+        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
     }
 
     /**