MAGETWO-98202: Additional Permissions for Design settings

Author: OlgaVasyltsun

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

@@ -936,16 +936,14 @@ public function beforeDelete()
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function beforeSave()
     {
         //Validate changing of design.
         $userType = $this->userContext->getUserType();
-        if ((
-                $userType === UserContextInterface::USER_TYPE_ADMIN
-                || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-            )
+        if (($userType === UserContextInterface::USER_TYPE_ADMIN
+                || $userType === UserContextInterface::USER_TYPE_INTEGRATION)
             && !$this->authorization->isAllowed('Magento_Catalog::edit_category_design')
         ) {
             $this->setData('custom_design', $this->getOrigData('custom_design'));

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

@@ -873,10 +873,8 @@ public function beforeSave()
 
         //Validate changing of design.
         $userType = $this->userContext->getUserType();
-        if ((
-                $userType === UserContextInterface::USER_TYPE_ADMIN
-                || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-            )
+        if (($userType === UserContextInterface::USER_TYPE_ADMIN
+                || $userType === UserContextInterface::USER_TYPE_INTEGRATION)
             && !$this->authorization->isAllowed('Magento_Catalog::edit_product_design')
         ) {
             $this->setData('custom_design', $this->getOrigData('custom_design'));

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

@@ -13,7 +13,6 @@
 
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Model\Category as CategoryEntity;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -1077,19 +1076,4 @@ private function getAggregateCount()
         }
         return $this->aggregateCount;
     }
-
-    /**
-     * @inheritdoc
-     *
-     * @param CategoryEntity|\Magento\Framework\DataObject $object
-     */
-    public function validate($object)
-    {
-        $isValid = parent::validate($object);
-        if ($isValid !== true) {
-            return $isValid;
-        }
-
-        return true;
-    }
 }

app/code/Magento/Catalog/composer.json

@@ -27,7 +27,7 @@
         "magento/module-media-storage": "100.1.*",
         "magento/framework": "100.1.*",
         "magento/module-ui": "100.1.*",
-        "magento/module-authorization": "*"
+        "magento/module-authorization": "100.1.*"
     },
     "suggest": {
         "magento/module-cookie": "100.1.*",

app/code/Magento/Cms/Model/Page/DataProvider.php

@@ -101,7 +101,7 @@ public function getData()
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function getMeta()
     {

app/code/Magento/Cms/Model/PageRepository.php

@@ -130,10 +130,8 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
         try {
             //Validate changing of design.
             $userType = $this->userContext->getUserType();
-            if ((
-                    $userType === UserContextInterface::USER_TYPE_ADMIN
-                    || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-                )
+            if (($userType === UserContextInterface::USER_TYPE_ADMIN
+                    || $userType === UserContextInterface::USER_TYPE_INTEGRATION)
                 && !$this->authorization->isAllowed('Magento_Cms::save_design')
             ) {
                 if (!$page->getId()) {

app/code/Magento/Cms/composer.json

@@ -13,7 +13,7 @@
         "magento/module-variable": "100.1.*",
         "magento/module-media-storage": "100.1.*",
         "magento/framework": "100.1.*",
-        "magento/module-authorization": "*"
+        "magento/module-authorization": "100.1.*"
     },
     "suggest": {
         "magento/module-cms-sample-data": "Sample Data version:100.1.*"

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php

@@ -22,7 +22,7 @@ class CategoryRepositoryTest extends \PHPUnit_Framework_TestCase
      *
      * @var CategoryRepositoryInterface
      */
-    private $repo;
+    private $repository;
 
     /**
      * @var Auth
@@ -41,13 +41,13 @@ class CategoryRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->repo = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
+        $this->repository = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
         $this->auth = Bootstrap::getObjectManager()->get(Auth::class);
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     protected function tearDown()
     {
@@ -66,22 +66,22 @@ protected function tearDown()
      */
     public function testSaveDesign()
     {
-        $category = $this->repo->get(333);
+        $category = $this->repository->get(333);
         $this->auth->login(TestBootstrap::ADMIN_NAME, TestBootstrap::ADMIN_PASSWORD);
 
         //Admin doesn't have access to category's design.
         $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
 
         $category->setCustomAttribute('custom_design', 2);
-        $category = $this->repo->save($category);
+        $category = $this->repository->save($category);
         $this->assertEmpty($category->getCustomAttribute('custom_design'));
 
         //Admin has access to category' design.
         $this->aclBuilder->getAcl()
             ->allow(null, ['Magento_Catalog::categories', 'Magento_Catalog::edit_category_design']);
 
         $category->setCustomAttribute('custom_design', 2);
-        $category = $this->repo->save($category);
+        $category = $this->repository->save($category);
         $this->assertNotEmpty($category->getCustomAttribute('custom_design'));
         $this->assertEquals(2, $category->getCustomAttribute('custom_design')->getValue());
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -48,7 +48,7 @@ protected function setUp()
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     protected function tearDown()
     {

dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php

@@ -24,7 +24,7 @@ class PageRepositoryTest extends \PHPUnit_Framework_TestCase
      *
      * @var PageRepositoryInterface
      */
-    private $repo;
+    private $repository;
 
     /**
      * @var Auth
@@ -53,15 +53,15 @@ class PageRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->repo = Bootstrap::getObjectManager()->create(PageRepositoryInterface::class);
+        $this->repository = Bootstrap::getObjectManager()->create(PageRepositoryInterface::class);
         $this->auth = Bootstrap::getObjectManager()->get(Auth::class);
         $this->criteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
         $this->pageCollectionFactory = Bootstrap::getObjectManager()->get(PageCollectionFactory::class);
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     protected function tearDown()
     {
@@ -90,14 +90,14 @@ public function testSaveDesign()
         $this->aclBuilder->getAcl()->deny(null, 'Magento_Cms::save_design');
 
         $page->setCustomTheme('test');
-        $page = $this->repo->save($page);
+        $page = $this->repository->save($page);
         $this->assertNotEquals('test', $page->getCustomTheme());
 
         //Admin has access to page' design.
         $this->aclBuilder->getAcl()->allow(null, ['Magento_Cms::save', 'Magento_Cms::save_design']);
 
         $page->setCustomTheme('test');
-        $page = $this->repo->save($page);
+        $page = $this->repository->save($page);
         $this->assertEquals('test', $page->getCustomTheme());
     }
 }