Merge remote-tracking branch 'mainline/2.4-develop' into adobe-ims

Author: andimov

app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php

@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\AdvancedSearch\Block;
 
 /**
  * Interface \Magento\AdvancedSearch\Block\SearchDataInterface
  *
+ * @api
  */
 interface SearchDataInterface
 {

app/code/Magento/Analytics/Api/Data/LinkInterface.php

@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Api\Data;
 
 /**
  * Represents link with collected data and initialized vector for decryption.
+ *
+ * @api
  */
 interface LinkInterface
 {

app/code/Magento/Analytics/Api/LinkProviderInterface.php

@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Api;
 
 /**
  * Provides link to file with collected report data.
+ *
+ * @api
  */
 interface LinkProviderInterface
 {

app/code/Magento/Analytics/Model/Connector/CommandInterface.php

@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Model\Connector;
 
 /**
  * Introduces family of integration calls.
  * Each implementation represents call to external service.
+ *
+ * @api
  */
 interface CommandInterface
 {

app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php

@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Model;
 
 /**
  * The interface represents the type of classes that handling of a new data collection for MBI.
+ *
+ * @api
  */
 interface ExportDataHandlerInterface
 {

app/code/Magento/Analytics/Model/ReportWriterInterface.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Model;
 
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -14,6 +16,8 @@
  * Executes export of collected data
  * Iterates registered providers @see etc/analytics.xml
  * Collects data (to TMP folder)
+ *
+ * @api
  */
 interface ReportWriterInterface
 {

app/code/Magento/Analytics/ReportXml/DB/Assembler/AssemblerInterface.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\ReportXml\DB\Assembler;
 
 use Magento\Analytics\ReportXml\DB\SelectBuilder;
@@ -13,6 +15,8 @@
  * Introduces family of SQL assemblers
  * Each assembler populates SelectBuilder with config information
  * @see usage examples at \Magento\Analytics\ReportXml\QueryFactory
+ *
+ * @api
  */
 interface AssemblerInterface
 {

app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php

@@ -13,6 +13,8 @@
  * Responsible for Select object creation, works as a builder. Returns Select as result;
  *
  * Used in SQL assemblers.
+ *
+ * @api
  */
 class SelectBuilder
 {

app/code/Magento/Authorization/Test/Fixture/Role.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Authorization\Test\Fixture;
+
+use Magento\Authorization\Model\Acl\Role\Group;
+use Magento\Authorization\Model\ResourceModel\Role as RoleResource;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\DataObject;
+use Magento\SharedCatalog\Model\SharedCatalogFactory;
+use Magento\TestFramework\Fixture\Data\ProcessorInterface;
+use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\User\Model\UserFactory;
+
+/**
+ * Creating a new admin role
+ */
+class Role implements RevertibleDataFixtureInterface
+{
+    private const DEFAULT_DATA = [
+        'role_name' => 'Role Name %uniqid%',
+        'role_type' => Group::ROLE_TYPE,
+        'user_id' => 0,
+        'user_type' => UserContextInterface::USER_TYPE_ADMIN
+    ];
+
+    private const DEFAULT_DATA_RULES = [
+        'id' => null,
+        'role_id' => null,
+        'resources' => ['Magento_Backend::all']
+    ];
+
+    /**
+     * @var RoleFactory
+     */
+    private $roleFactory;
+
+    /**
+     * @var ProcessorInterface
+     */
+    private $dataProcessor;
+
+    /**
+     * @var RoleResource
+     */
+    private $roleResourceModel;
+
+    /**
+     * @var RulesFactory
+     */
+    private $rulesFactory;
+
+    /**
+     * @param RoleFactory $roleFactory
+     * @param RoleResource $roleResourceModel
+     * @param RulesFactory $rulesFactory
+     * @param ProcessorInterface $dataProcessor
+     */
+    public function __construct(
+        RoleFactory        $roleFactory,
+        RoleResource       $roleResourceModel,
+        RulesFactory       $rulesFactory,
+        ProcessorInterface $dataProcessor
+    ) {
+        $this->roleFactory = $roleFactory;
+        $this->roleResourceModel = $roleResourceModel;
+        $this->rulesFactory = $rulesFactory;
+        $this->dataProcessor = $dataProcessor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        $role = $this->roleFactory->create();
+        $role->setData($this->prepareData(array_diff_key($data, self::DEFAULT_DATA_RULES)));
+        $this->roleResourceModel->save($role);
+
+        $rules = $this->rulesFactory->create();
+        $rules->setRoleId($role->getId() ?? null);
+        $rules->setResources($data['resources'] ?? self::DEFAULT_DATA_RULES['resources']);
+        $rules->saveRel();
+
+        return $role;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function revert(DataObject $data): void
+    {
+        $role = $this->roleFactory->create();
+        $role->load($data->getId());
+
+        if ($role->getId() !== null) {
+            $role->delete();
+        }
+    }
+
+    /**
+     * Prepare admin role data
+     *
+     * @param array $data
+     * @return array
+     */
+    private function prepareData(array $data): array
+    {
+        $data = array_merge(self::DEFAULT_DATA, $data);
+        return $this->dataProcessor->process($this, $data);
+    }
+}

app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php

@@ -11,6 +11,8 @@
  * Interface UploadResizeConfigInterface
  *
  * Used to retrieve configuration for frontend image uploader
+ *
+ * @api
  */
 interface UploadResizeConfigInterface
 {