From 36ad18af62f3d434b3a08eb6358217ff43cd1bce Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 1 Feb 2019 13:50:24 +0200
Subject: [PATCH] magento/magento2#15775: [Forwardport] Incorrect return type
 getList() in CustomerRepository.

---
 .../Model/OperationSearchResults.php          | 18 +++++
 .../Magento/AsynchronousOperations/etc/di.xml |  2 +-
 .../Model/CategoryAttributeSearchResults.php  | 18 +++++
 .../Catalog/Model/CategorySearchResults.php   | 18 +++++
 .../Model/ProductAttributeSearchResults.php   | 18 +++++
 .../Catalog/Model/ProductSearchResults.php    | 18 +++++
 app/code/Magento/Catalog/etc/di.xml           |  8 +--
 .../Magento/Cms/Model/BlockSearchResults.php  | 18 +++++
 .../Magento/Cms/Model/PageSearchResults.php   | 18 +++++
 app/code/Magento/Cms/etc/di.xml               |  5 +-
 .../Customer/Model/AddressSearchResults.php   | 18 +++++
 .../Customer/Model/CustomerSearchResults.php  | 18 +++++
 .../Customer/Model/GroupSearchResults.php     | 18 +++++
 app/code/Magento/Customer/etc/di.xml          |  6 +-
 .../Eav/Model/AttributeGroupSearchResults.php | 18 +++++
 .../Eav/Model/AttributeSearchResults.php      | 18 +++++
 .../Eav/Model/AttributeSetSearchResults.php   | 18 +++++
 app/code/Magento/Eav/etc/di.xml               |  6 +-
 .../Api/Data/CartSearchResultsInterface.php   |  2 +
 .../Magento/Quote/Model/CartSearchResults.php | 65 +++++++++++++++++++
 app/code/Magento/Quote/etc/di.xml             |  2 +-
 .../SalesRule/Model/CouponSearchResult.php    | 27 ++++++++
 .../SalesRule/Model/RuleSearchResult.php      | 27 ++++++++
 app/code/Magento/SalesRule/etc/di.xml         |  4 +-
 .../Signifyd/Model/CaseSearchResults.php      | 18 +++++
 app/code/Magento/Signifyd/etc/di.xml          |  2 +-
 .../Tax/Model/TaxClassSearchResults.php       | 18 +++++
 .../Tax/Model/TaxRateSearchResults.php        | 18 +++++
 .../Tax/Model/TaxRuleSearchResults.php        | 18 +++++
 app/code/Magento/Tax/etc/di.xml               |  6 +-
 .../Ui/Model/BookmarkSearchResults.php        | 18 +++++
 app/code/Magento/Ui/etc/di.xml                |  2 +-
 .../Vault/Model/PaymentTokenSearchResults.php | 18 +++++
 app/code/Magento/Vault/etc/di.xml             |  2 +-
 .../Magento/Framework/Api/SearchResults.php   |  3 +
 .../Framework/Api/SearchResultsInterface.php  |  1 +
 36 files changed, 489 insertions(+), 23 deletions(-)
 create mode 100644 app/code/Magento/AsynchronousOperations/Model/OperationSearchResults.php
 create mode 100644 app/code/Magento/Catalog/Model/CategoryAttributeSearchResults.php
 create mode 100644 app/code/Magento/Catalog/Model/CategorySearchResults.php
 create mode 100644 app/code/Magento/Catalog/Model/ProductAttributeSearchResults.php
 create mode 100644 app/code/Magento/Catalog/Model/ProductSearchResults.php
 create mode 100644 app/code/Magento/Cms/Model/BlockSearchResults.php
 create mode 100644 app/code/Magento/Cms/Model/PageSearchResults.php
 create mode 100644 app/code/Magento/Customer/Model/AddressSearchResults.php
 create mode 100644 app/code/Magento/Customer/Model/CustomerSearchResults.php
 create mode 100644 app/code/Magento/Customer/Model/GroupSearchResults.php
 create mode 100644 app/code/Magento/Eav/Model/AttributeGroupSearchResults.php
 create mode 100644 app/code/Magento/Eav/Model/AttributeSearchResults.php
 create mode 100644 app/code/Magento/Eav/Model/AttributeSetSearchResults.php
 create mode 100644 app/code/Magento/Quote/Model/CartSearchResults.php
 create mode 100644 app/code/Magento/SalesRule/Model/CouponSearchResult.php
 create mode 100644 app/code/Magento/SalesRule/Model/RuleSearchResult.php
 create mode 100644 app/code/Magento/Signifyd/Model/CaseSearchResults.php
 create mode 100644 app/code/Magento/Tax/Model/TaxClassSearchResults.php
 create mode 100644 app/code/Magento/Tax/Model/TaxRateSearchResults.php
 create mode 100644 app/code/Magento/Tax/Model/TaxRuleSearchResults.php
 create mode 100644 app/code/Magento/Ui/Model/BookmarkSearchResults.php
 create mode 100644 app/code/Magento/Vault/Model/PaymentTokenSearchResults.php

diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationSearchResults.php b/app/code/Magento/AsynchronousOperations/Model/OperationSearchResults.php
new file mode 100644
index 0000000000000..84f0952a836c2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with bulk Operation search result.
+ */
+class OperationSearchResults extends SearchResults implements OperationSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/AsynchronousOperations/etc/di.xml b/app/code/Magento/AsynchronousOperations/etc/di.xml
index 42b62ff8ea374..94a4c56c19cea 100644
--- a/app/code/Magento/AsynchronousOperations/etc/di.xml
+++ b/app/code/Magento/AsynchronousOperations/etc/di.xml
@@ -16,7 +16,7 @@
     <preference for="Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface" type="Magento\AsynchronousOperations\Model\OperationStatus" />
     <preference for="Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Detailed" />
     <preference for="Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Short" />
-    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\AsynchronousOperations\Model\OperationSearchResults" />
     <preference for="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\OperationRepository" />
     <type name="Magento\Framework\EntityManager\MetadataPool">
         <arguments>
diff --git a/app/code/Magento/Catalog/Model/CategoryAttributeSearchResults.php b/app/code/Magento/Catalog/Model/CategoryAttributeSearchResults.php
new file mode 100644
index 0000000000000..db1b84ed27772
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/CategoryAttributeSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Category Attribute search results.
+ */
+class CategoryAttributeSearchResults extends SearchResults implements CategoryAttributeSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Catalog/Model/CategorySearchResults.php b/app/code/Magento/Catalog/Model/CategorySearchResults.php
new file mode 100644
index 0000000000000..7590ee4a23eda
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/CategorySearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Category search results.
+ */
+class CategorySearchResults extends SearchResults implements CategorySearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Catalog/Model/ProductAttributeSearchResults.php b/app/code/Magento/Catalog/Model/ProductAttributeSearchResults.php
new file mode 100644
index 0000000000000..776009089b9aa
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductAttributeSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Product Attribute search results.
+ */
+class ProductAttributeSearchResults extends SearchResults implements ProductAttributeSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Catalog/Model/ProductSearchResults.php b/app/code/Magento/Catalog/Model/ProductSearchResults.php
new file mode 100644
index 0000000000000..7aa3b4d961c23
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Product search results.
+ */
+class ProductSearchResults extends SearchResults implements ProductSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 7d2c3699ee2c2..5df28f11d185e 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -36,16 +36,16 @@
     <preference for="Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface" type="Magento\Catalog\Model\ProductAttributeGroupRepository" />
     <preference for="Magento\Catalog\Api\ProductAttributeOptionManagementInterface" type="Magento\Catalog\Model\Product\Attribute\OptionManagement" />
     <preference for="Magento\Catalog\Api\ProductLinkRepositoryInterface" type="Magento\Catalog\Model\ProductLink\Repository" />
-    <preference for="Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
-    <preference for="Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
-    <preference for="Magento\Catalog\Api\Data\ProductSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface" type="Magento\Catalog\Model\ProductAttributeSearchResults" />
+    <preference for="Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface" type="Magento\Catalog\Model\CategoryAttributeSearchResults" />
+    <preference for="Magento\Catalog\Api\Data\ProductSearchResultsInterface" type="Magento\Catalog\Model\ProductSearchResults" />
     <preference for="Magento\Catalog\Api\ProductAttributeManagementInterface" type="Magento\Catalog\Model\Product\Attribute\Management" />
     <preference for="Magento\Catalog\Api\AttributeSetManagementInterface" type="Magento\Catalog\Model\Product\Attribute\SetManagement" />
     <preference for="Magento\Catalog\Api\AttributeSetRepositoryInterface" type="Magento\Catalog\Model\Product\Attribute\SetRepository" />
     <preference for="Magento\Catalog\Api\ProductManagementInterface" type="Magento\Catalog\Model\ProductManagement" />
     <preference for="Magento\Catalog\Api\AttributeSetFinderInterface" type="Magento\Catalog\Model\Product\Attribute\AttributeSetFinder" />
     <preference for="Magento\Catalog\Api\CategoryListInterface" type="Magento\Catalog\Model\CategoryList" />
-    <preference for="Magento\Catalog\Api\Data\CategorySearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Catalog\Api\Data\CategorySearchResultsInterface" type="Magento\Catalog\Model\CategorySearchResults" />
     <preference for="Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface" type="Magento\Catalog\Model\Config\Source\Product\Options\Price"/>
     <preference for="Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterface" type="Magento\Catalog\Model\Indexer\Product\Flat\Table\Builder"/>
     <preference for="Magento\Catalog\Api\ProductRenderListInterface" type="Magento\Catalog\Model\ProductRenderList"/>
diff --git a/app/code/Magento/Cms/Model/BlockSearchResults.php b/app/code/Magento/Cms/Model/BlockSearchResults.php
new file mode 100644
index 0000000000000..2fa5dbb40139e
--- /dev/null
+++ b/app/code/Magento/Cms/Model/BlockSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model;
+
+use Magento\Cms\Api\Data\BlockSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Block search results.
+ */
+class BlockSearchResults extends SearchResults implements BlockSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Cms/Model/PageSearchResults.php b/app/code/Magento/Cms/Model/PageSearchResults.php
new file mode 100644
index 0000000000000..7985e382be273
--- /dev/null
+++ b/app/code/Magento/Cms/Model/PageSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model;
+
+use Magento\Cms\Api\Data\PageSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Page search results.
+ */
+class PageSearchResults extends SearchResults implements PageSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index b6e13c63302cd..a1578ca98aba0 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -7,9 +7,9 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Cms\Api\Data\PageSearchResultsInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\Cms\Model\PageSearchResults" />
     <preference for="Magento\Cms\Api\Data\BlockSearchResultsInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\Cms\Model\BlockSearchResults" />
     <preference for="Magento\Cms\Api\GetBlockByIdentifierInterface" type="Magento\Cms\Model\GetBlockByIdentifier" />
     <preference for="Magento\Cms\Api\GetPageByIdentifierInterface" type="Magento\Cms\Model\GetPageByIdentifier" />
     <preference for="Magento\Cms\Api\Data\PageInterface" type="Magento\Cms\Model\Page" />
@@ -234,4 +234,3 @@
         </arguments>
     </type>
 </config>
-
diff --git a/app/code/Magento/Customer/Model/AddressSearchResults.php b/app/code/Magento/Customer/Model/AddressSearchResults.php
new file mode 100644
index 0000000000000..7e83aa8f8d8df
--- /dev/null
+++ b/app/code/Magento/Customer/Model/AddressSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model;
+
+use Magento\Customer\Api\Data\AddressSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Address search results.
+ */
+class AddressSearchResults extends SearchResults implements AddressSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Customer/Model/CustomerSearchResults.php b/app/code/Magento/Customer/Model/CustomerSearchResults.php
new file mode 100644
index 0000000000000..1d7f0e265641f
--- /dev/null
+++ b/app/code/Magento/Customer/Model/CustomerSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model;
+
+use Magento\Customer\Api\Data\CustomerSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Customer search results.
+ */
+class CustomerSearchResults extends SearchResults implements CustomerSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Customer/Model/GroupSearchResults.php b/app/code/Magento/Customer/Model/GroupSearchResults.php
new file mode 100644
index 0000000000000..1de4cd078db88
--- /dev/null
+++ b/app/code/Magento/Customer/Model/GroupSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model;
+
+use Magento\Customer\Api\Data\GroupSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Customer Groups search results.
+ */
+class GroupSearchResults extends SearchResults implements GroupSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index a181d6dd217fd..4df9e64ced3e9 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -28,11 +28,11 @@
     <preference for="Magento\Customer\Api\Data\ValidationResultsInterface"
                 type="Magento\Customer\Model\Data\ValidationResults" />
     <preference for="Magento\Customer\Api\Data\GroupSearchResultsInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\Customer\Model\GroupSearchResults" />
     <preference for="Magento\Customer\Api\Data\CustomerSearchResultsInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\Customer\Model\CustomerSearchResults" />
     <preference for="Magento\Customer\Api\Data\AddressSearchResultsInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\Customer\Model\AddressSearchResults" />
     <preference for="Magento\Customer\Api\AccountManagementInterface"
                 type="Magento\Customer\Model\AccountManagement" />
     <preference for="Magento\Customer\Api\CustomerMetadataInterface"
diff --git a/app/code/Magento/Eav/Model/AttributeGroupSearchResults.php b/app/code/Magento/Eav/Model/AttributeGroupSearchResults.php
new file mode 100644
index 0000000000000..100d5638a96da
--- /dev/null
+++ b/app/code/Magento/Eav/Model/AttributeGroupSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Model;
+
+use Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Attribute Group search results.
+ */
+class AttributeGroupSearchResults extends SearchResults implements AttributeGroupSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Eav/Model/AttributeSearchResults.php b/app/code/Magento/Eav/Model/AttributeSearchResults.php
new file mode 100644
index 0000000000000..b82a27bbfea1a
--- /dev/null
+++ b/app/code/Magento/Eav/Model/AttributeSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Model;
+
+use Magento\Eav\Api\Data\AttributeSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Eav Attribute search results.
+ */
+class AttributeSearchResults extends SearchResults implements AttributeSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Eav/Model/AttributeSetSearchResults.php b/app/code/Magento/Eav/Model/AttributeSetSearchResults.php
new file mode 100644
index 0000000000000..46592efda5a17
--- /dev/null
+++ b/app/code/Magento/Eav/Model/AttributeSetSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Model;
+
+use Magento\Eav\Api\Data\AttributeSetSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Attribute Set search results.
+ */
+class AttributeSetSearchResults extends SearchResults implements AttributeSetSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index 8e897b979d2f0..f9e3915392b8e 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -21,9 +21,9 @@
     <preference for="Magento\Eav\Api\AttributeOptionManagementInterface" type="Magento\Eav\Model\Entity\Attribute\OptionManagement" />
     <preference for="Magento\Eav\Api\Data\AttributeOptionLabelInterface" type="Magento\Eav\Model\Entity\Attribute\OptionLabel" />
     <preference for="Magento\Eav\Api\Data\AttributeValidationRuleInterface" type="Magento\Eav\Model\Entity\Attribute\ValidationRule" />
-    <preference for="Magento\Eav\Api\Data\AttributeSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
-    <preference for="Magento\Eav\Api\Data\AttributeSetSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
-    <preference for="Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Eav\Api\Data\AttributeSearchResultsInterface" type="Magento\Eav\Model\AttributeSearchResults" />
+    <preference for="Magento\Eav\Api\Data\AttributeSetSearchResultsInterface" type="Magento\Eav\Model\AttributeSetSearchResults" />
+    <preference for="Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface" type="Magento\Eav\Model\AttributeGroupSearchResults" />
     <preference for="Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface" type="Magento\Eav\Model\TypeLocator" />
 
     <type name="Magento\Eav\Model\Entity\Attribute\Config">
diff --git a/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php b/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
index 5da776091f7f1..48818e5d253e6 100644
--- a/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Api\Data;
 
 /**
diff --git a/app/code/Magento/Quote/Model/CartSearchResults.php b/app/code/Magento/Quote/Model/CartSearchResults.php
new file mode 100644
index 0000000000000..5c505bec121f2
--- /dev/null
+++ b/app/code/Magento/Quote/Model/CartSearchResults.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Framework\Api\AbstractSimpleObject;
+use Magento\Quote\Api\Data\CartSearchResultsInterface;
+
+/**
+ * Service Data Object with Cart search results.
+ */
+class CartSearchResults extends AbstractSimpleObject implements CartSearchResultsInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function setItems(array $items = null)
+    {
+        return $this->setData(self::KEY_ITEMS, $items);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems()
+    {
+        return $this->_get(self::KEY_ITEMS) === null ? [] : $this->_get(self::KEY_ITEMS);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSearchCriteria()
+    {
+        return $this->_get(self::KEY_SEARCH_CRITERIA);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        return $this->setData(self::KEY_SEARCH_CRITERIA, $searchCriteria);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTotalCount()
+    {
+        return $this->_get(self::KEY_TOTAL_COUNT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setTotalCount($count)
+    {
+        return $this->setData(self::KEY_TOTAL_COUNT, $count);
+    }
+}
diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml
index cd5e62307fdca..f66001e7789cf 100644
--- a/app/code/Magento/Quote/etc/di.xml
+++ b/app/code/Magento/Quote/etc/di.xml
@@ -18,7 +18,7 @@
     <preference for="Magento\Quote\Api\Data\CartInterface" type="Magento\Quote\Model\Quote" />
     <preference for="Magento\Quote\Api\CartItemRepositoryInterface" type="Magento\Quote\Model\Quote\Item\Repository" />
     <preference for="Magento\Quote\Api\CartRepositoryInterface" type="Magento\Quote\Model\QuoteRepository" />
-    <preference for="Magento\Quote\Api\Data\CartSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Quote\Api\Data\CartSearchResultsInterface" type="Magento\Quote\Model\CartSearchResults" />
     <preference for="Magento\Quote\Api\PaymentMethodManagementInterface" type="Magento\Quote\Model\PaymentMethodManagement" />
     <preference for="Magento\Quote\Api\Data\PaymentInterface" type="Magento\Quote\Model\Quote\Payment" />
     <preference for="Magento\Quote\Api\CouponManagementInterface" type="Magento\Quote\Model\CouponManagement" />
diff --git a/app/code/Magento/SalesRule/Model/CouponSearchResult.php b/app/code/Magento/SalesRule/Model/CouponSearchResult.php
new file mode 100644
index 0000000000000..cba57900cf605
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/CouponSearchResult.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\SalesRule\Api\Data\CouponSearchResultInterface;
+
+/**
+ * Service Data Object with Coupon search results.
+ *
+ * @phpcs:ignoreFile
+ */
+class CouponSearchResult extends SearchResults implements CouponSearchResultInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function setItems(array $items = null)
+    {
+        return parent::setItems($items);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/RuleSearchResult.php b/app/code/Magento/SalesRule/Model/RuleSearchResult.php
new file mode 100644
index 0000000000000..834b2b575ec2d
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/RuleSearchResult.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\SalesRule\Api\Data\RuleSearchResultInterface;
+
+/**
+ * Service Data Object with Sales Rule search results.
+ *
+ * @phpcs:ignoreFile
+ */
+class RuleSearchResult extends SearchResults implements RuleSearchResultInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function setItems(array $items = null)
+    {
+        return parent::setItems($items);
+    }
+}
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index a8c350457a5a6..30482d7f37ff7 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -13,7 +13,7 @@
     <preference for="Magento\SalesRule\Api\Data\ConditionInterface"
                 type="Magento\SalesRule\Model\Data\Condition" />
     <preference for="Magento\SalesRule\Api\Data\RuleSearchResultInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\SalesRule\Model\RuleSearchResult" />
     <preference for="Magento\SalesRule\Api\Data\RuleLabelInterface"
                 type="Magento\SalesRule\Model\Data\RuleLabel" />
     <preference for="Magento\SalesRule\Api\Data\CouponInterface"
@@ -23,7 +23,7 @@
     <preference for="Magento\SalesRule\Model\Spi\CouponResourceInterface"
                 type="Magento\SalesRule\Model\ResourceModel\Coupon" />
     <preference for="Magento\SalesRule\Api\Data\CouponSearchResultInterface"
-                type="Magento\Framework\Api\SearchResults" />
+                type="Magento\SalesRule\Model\CouponSearchResult" />
     <preference for="Magento\SalesRule\Api\Data\CouponGenerationSpecInterface"
                 type="Magento\SalesRule\Model\Data\CouponGenerationSpec" />
     <preference for="Magento\SalesRule\Api\Data\CouponMassDeleteResultInterface"
diff --git a/app/code/Magento/Signifyd/Model/CaseSearchResults.php b/app/code/Magento/Signifyd/Model/CaseSearchResults.php
new file mode 100644
index 0000000000000..ff1ab8839f6cd
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\Signifyd\Api\Data\CaseSearchResultsInterface;
+
+/**
+ * Service Data Object with Case entities search results.
+ */
+class CaseSearchResults extends SearchResults implements CaseSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Signifyd/etc/di.xml b/app/code/Magento/Signifyd/etc/di.xml
index fd78fff27f619..8e9ea8e4cff9a 100644
--- a/app/code/Magento/Signifyd/etc/di.xml
+++ b/app/code/Magento/Signifyd/etc/di.xml
@@ -9,7 +9,7 @@
     <preference for="Magento\Signifyd\Api\Data\CaseInterface" type="Magento\Signifyd\Model\CaseEntity" />
     <preference for="Magento\Signifyd\Api\CaseRepositoryInterface" type="Magento\Signifyd\Model\CaseRepository" />
     <preference for="Magento\Signifyd\Api\CaseManagementInterface" type="Magento\Signifyd\Model\CaseManagement" />
-    <preference for="Magento\Signifyd\Api\Data\CaseSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Signifyd\Api\Data\CaseSearchResultsInterface" type="Magento\Signifyd\Model\CaseSearchResults" />
     <preference for="Magento\Signifyd\Api\CaseCreationServiceInterface" type="Magento\Signifyd\Model\CaseServices\CreationService" />
     <preference for="Magento\Signifyd\Api\GuaranteeCreationServiceInterface" type="Magento\Signifyd\Model\Guarantee\CreationService" />
     <preference for="Magento\Signifyd\Api\GuaranteeCancelingServiceInterface" type="Magento\Signifyd\Model\Guarantee\CancelingService" />
diff --git a/app/code/Magento/Tax/Model/TaxClassSearchResults.php b/app/code/Magento/Tax/Model/TaxClassSearchResults.php
new file mode 100644
index 0000000000000..4e92fd10a3dec
--- /dev/null
+++ b/app/code/Magento/Tax/Model/TaxClassSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tax\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\Tax\Api\Data\TaxClassSearchResultsInterface;
+
+/**
+ * Service Data Object with Tax Class search results.
+ */
+class TaxClassSearchResults extends SearchResults implements TaxClassSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Tax/Model/TaxRateSearchResults.php b/app/code/Magento/Tax/Model/TaxRateSearchResults.php
new file mode 100644
index 0000000000000..80e9b5eaa72fa
--- /dev/null
+++ b/app/code/Magento/Tax/Model/TaxRateSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tax\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\Tax\Api\Data\TaxRateSearchResultsInterface;
+
+/**
+ * Service Data Object with Tax Rate search results.
+ */
+class TaxRateSearchResults extends SearchResults implements TaxRateSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Tax/Model/TaxRuleSearchResults.php b/app/code/Magento/Tax/Model/TaxRuleSearchResults.php
new file mode 100644
index 0000000000000..aa70b31ab22aa
--- /dev/null
+++ b/app/code/Magento/Tax/Model/TaxRuleSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tax\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\Tax\Api\Data\TaxRuleSearchResultsInterface;
+
+/**
+ * Service Data Object with Tax Rule search results.
+ */
+class TaxRuleSearchResults extends SearchResults implements TaxRuleSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 096f8359fadd3..a848e32e0f7c2 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -37,8 +37,8 @@
             </argument>
         </arguments>
     </type>
-    <preference for="Magento\Tax\Api\Data\TaxRateSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
-    <preference for="Magento\Tax\Api\Data\TaxClassSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Tax\Api\Data\TaxRateSearchResultsInterface" type="Magento\Tax\Model\TaxRateSearchResults" />
+    <preference for="Magento\Tax\Api\Data\TaxClassSearchResultsInterface" type="Magento\Tax\Model\TaxClassSearchResults" />
     <preference for="Magento\Tax\Api\OrderTaxManagementInterface" type="Magento\Tax\Model\Sales\Order\TaxManagement" />
     <preference for="Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface" type="Magento\Tax\Model\Sales\Order\Tax" />
     <preference for="Magento\Tax\Api\Data\OrderTaxDetailsInterface" type="Magento\Tax\Model\Sales\Order\Details" />
@@ -47,7 +47,7 @@
     <preference for="Magento\Tax\Api\TaxClassRepositoryInterface" type="Magento\Tax\Model\TaxClass\Repository" />
     <preference for="Magento\Tax\Api\Data\TaxClassInterface" type="Magento\Tax\Model\ClassModel" />
     <preference for="Magento\Tax\Api\Data\TaxRuleInterface" type="Magento\Tax\Model\Calculation\Rule" />
-    <preference for="Magento\Tax\Api\Data\TaxRuleSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Tax\Api\Data\TaxRuleSearchResultsInterface" type="Magento\Tax\Model\TaxRuleSearchResults" />
     <preference for="Magento\Tax\Api\TaxRateManagementInterface" type="Magento\Tax\Model\TaxRateManagement" />
     <preference for="Magento\Tax\Api\TaxRateRepositoryInterface" type="Magento\Tax\Model\Calculation\RateRepository" />
     <preference for="Magento\Tax\Api\Data\TaxRateTitleInterface" type="Magento\Tax\Model\Calculation\Rate\Title" />
diff --git a/app/code/Magento/Ui/Model/BookmarkSearchResults.php b/app/code/Magento/Ui/Model/BookmarkSearchResults.php
new file mode 100644
index 0000000000000..2171a5c0084e2
--- /dev/null
+++ b/app/code/Magento/Ui/Model/BookmarkSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\Ui\Api\Data\BookmarkSearchResultsInterface;
+
+/**
+ * Service Data Object with Bookmark search results.
+ */
+class BookmarkSearchResults extends SearchResults implements BookmarkSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
index c029e18addf73..05ace9d556fa0 100644
--- a/app/code/Magento/Ui/etc/di.xml
+++ b/app/code/Magento/Ui/etc/di.xml
@@ -14,7 +14,7 @@
     <preference for="Magento\Framework\View\Element\UiComponent\ContextInterface" type="Magento\Framework\View\Element\UiComponent\Context" />
     <preference for="Magento\Framework\View\Element\UiComponent\LayoutInterface" type="Magento\Framework\View\Layout\Generic"/>
     <preference for="Magento\Authorization\Model\UserContextInterface" type="Magento\Authorization\Model\CompositeUserContext"/>
-    <preference for="Magento\Ui\Api\Data\BookmarkSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Ui\Api\Data\BookmarkSearchResultsInterface" type="Magento\Ui\Model\BookmarkSearchResults" />
     <preference for="Magento\Ui\Api\BookmarkRepositoryInterface" type="Magento\Ui\Model\ResourceModel\BookmarkRepository"/>
     <preference for="Magento\Ui\Api\Data\BookmarkInterface" type="Magento\Ui\Model\Bookmark"/>
     <preference for="Magento\Ui\Component\Wysiwyg\ConfigInterface" type="Magento\Ui\Component\Wysiwyg\Config"/>
diff --git a/app/code/Magento/Vault/Model/PaymentTokenSearchResults.php b/app/code/Magento/Vault/Model/PaymentTokenSearchResults.php
new file mode 100644
index 0000000000000..39dcf503779b9
--- /dev/null
+++ b/app/code/Magento/Vault/Model/PaymentTokenSearchResults.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Vault\Model;
+
+use Magento\Framework\Api\SearchResults;
+use Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface;
+
+/**
+ * Service Data Object with Payment Token search results.
+ */
+class PaymentTokenSearchResults extends SearchResults implements PaymentTokenSearchResultsInterface
+{
+}
diff --git a/app/code/Magento/Vault/etc/di.xml b/app/code/Magento/Vault/etc/di.xml
index 95191e4417576..0192a783bd5a8 100644
--- a/app/code/Magento/Vault/etc/di.xml
+++ b/app/code/Magento/Vault/etc/di.xml
@@ -13,7 +13,7 @@
     <preference for="Magento\Vault\Api\PaymentTokenRepositoryInterface" type="Magento\Vault\Model\PaymentTokenRepository" />
     <preference for="Magento\Vault\Api\PaymentTokenManagementInterface" type="Magento\Vault\Model\PaymentTokenManagement" />
     <preference for="Magento\Vault\Api\PaymentMethodListInterface" type="Magento\Vault\Model\PaymentMethodList" />
-    <preference for="Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface" type="Magento\Vault\Model\PaymentTokenSearchResults" />
     <preference for="Magento\Vault\Model\Ui\TokenUiComponentInterface" type="Magento\Vault\Model\Ui\TokenUiComponent" />
 
     <type name="Magento\Sales\Api\Data\OrderPaymentInterface">
diff --git a/lib/internal/Magento/Framework/Api/SearchResults.php b/lib/internal/Magento/Framework/Api/SearchResults.php
index ad58d0a752653..cf1f11463f6ad 100644
--- a/lib/internal/Magento/Framework/Api/SearchResults.php
+++ b/lib/internal/Magento/Framework/Api/SearchResults.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Api;
 
 /**
  * SearchResults Service Data Object used for the search service requests
+ *
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
 class SearchResults extends AbstractSimpleObject implements SearchResultsInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
index d2bc3053b8d6e..ba72685a80f49 100644
--- a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Api;