Skip to content

Commit f89cd15

Browse files
mslabkomslabko
committed
remove REST endpoints
1 parent 73910f0 commit f89cd15

File tree

73 files changed

+32
-2605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+32
-2605
lines changed

‎_metapackage/composer.json

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
"php": "~7.2.0||~7.3.0||~7.4.0",
1313
"magento/module-bundle-product-data-exporter": "*",
1414
"magento/module-catalog-data-exporter": "*",
15-
"magento/module-catalog-export": "*",
16-
"magento/module-catalog-export-api": "*",
1715
"magento/module-catalog-inventory-data-exporter": "*",
1816
"magento/module-catalog-url-rewrite-data-exporter": "*",
1917
"magento/module-configurable-product-data-exporter": "*",

‎app/code/Magento/CatalogExport/Test/Api/AbstractProductExportTestHelper.php ‎app/code/Magento/CatalogDataExporter/Test/Api/AbstractProductExportTestHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogExport\Test\Api;
8+
namespace Magento\CatalogDataExporter\Test\Api;
99

1010
use Magento\Catalog\Api\ProductRepositoryInterface;
1111
use Magento\DataExporter\Model\FeedInterface;

‎app/code/Magento/CatalogExport/Test/Api/ConfigurableProductExportTest.php ‎app/code/Magento/CatalogDataExporter/Test/Api/ConfigurableProductExportTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogExport\Test\Api;
8+
namespace Magento\CatalogDataExporter\Test\Api;
99

1010
use Magento\Framework\Exception\NoSuchEntityException;
1111

@@ -50,6 +50,7 @@ class ConfigurableProductExportTest extends AbstractProductExportTestHelper
5050
*/
5151
public function testExport(): void
5252
{
53+
self::markTestSkipped('Should be migrated to integration test');
5354
$this->_markTestAsRestOnly('SOAP will be covered in another test');
5455
$this->runIndexer();
5556

@@ -60,7 +61,7 @@ public function testExport(): void
6061
}
6162

6263
if (isset($product)) {
63-
/** @see \Magento\CatalogExportApi\Api\EntityRequest and \Magento\CatalogExportApi\Api\EntityRequest\Item */
64+
/** @see \Magento\CatalogDataExporterApi\Api\EntityRequest and \Magento\CatalogDataExporterApi\Api\EntityRequest\Item */
6465
$request = [
6566
'request' => [
6667
'entities' => [

‎app/code/Magento/CatalogExport/Test/Api/DynamicAttributesTest.php ‎app/code/Magento/CatalogDataExporter/Test/Api/DynamicAttributesTest.php

+16-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogExport\Test\Api;
8+
namespace Magento\CatalogDataExporter\Test\Api;
99

1010
use Magento\DataExporter\Model\FeedInterface;
1111
use Magento\DataExporter\Model\FeedPool;
@@ -78,13 +78,14 @@ protected function setUp(): void
7878
*/
7979
public function testExport()
8080
{
81+
self::markTestSkipped('Should be migrated to integration test');
8182
$this->_markTestAsRestOnly('SOAP will be covered in another test');
8283

8384
/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
8485
$productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
8586
$product = $productRepository->get('simple');
8687

87-
/** @see \Magento\CatalogExportApi\Api\EntityRequest and \Magento\CatalogExportApi\Api\EntityRequest\Item */
88+
/** @see \Magento\CatalogDataExporterApi\Api\EntityRequest and \Magento\CatalogDataExporterApi\Api\EntityRequest\Item */
8889
$request = [
8990
'request' => [
9091
'entities' => [
@@ -161,10 +162,11 @@ private function camelToSnakeCase($string)
161162
/**
162163
* Test boolean attribute
163164
*
164-
* @magentoApiDataFixture Magento_CatalogExport::Test/Api/_files/one_product_simple_with_boolean_attribute.php
165+
* @magentoApiDataFixture Magento_CatalogDataExporter::Test/Api/_files/one_product_simple_with_boolean_attribute.php
165166
*/
166167
public function testBooleanAttribute()
167168
{
169+
self::markTestSkipped('Should be migrated to integration test');
168170
$result = $this->getProductApiResult('simple_with_boolean');
169171
if ($this->hasAttributeData($result)) {
170172
$value = $result[0]['attributes'][0]['value'][0];
@@ -190,10 +192,11 @@ public function testBooleanAttribute()
190192
/**
191193
* Test Multiselect attribute
192194
*
193-
* @magentoApiDataFixture Magento_CatalogExport::Test/Api/_files/one_product_simple_with_multiselect_attribute.php
195+
* @magentoApiDataFixture Magento_CatalogDataExporter::Test/Api/_files/one_product_simple_with_multiselect_attribute.php
194196
*/
195197
public function testMultiselectAttribute()
196198
{
199+
self::markTestSkipped('Should be migrated to integration test');
197200
$result = $this->getProductApiResult('simple_with_multiselect');
198201
if ($this->hasAttributeData($result)) {
199202
$value = $result[0]['attributes'][0]['value'][0];
@@ -218,10 +221,11 @@ public function testMultiselectAttribute()
218221
/**
219222
* Test image attribute
220223
*
221-
* @magentoApiDataFixture Magento_CatalogExport::Test/Api/_files/one_product_simple_with_image_attribute.php
224+
* @magentoApiDataFixture Magento_CatalogDataExporter::Test/Api/_files/one_product_simple_with_image_attribute.php
222225
*/
223226
public function testImageAttribute()
224227
{
228+
self::markTestSkipped('Should be migrated to integration test');
225229
$result = $this->getProductApiResult('simple_with_image');
226230
if ($this->hasAttributeData($result)) {
227231
$value = $result[0]['attributes'][0]['value'][0];
@@ -243,10 +247,11 @@ public function testImageAttribute()
243247
/**
244248
* Test decimal attribute
245249
*
246-
* @magentoApiDataFixture Magento_CatalogExport::Test/Api/_files/one_product_simple_with_decimal_attribute.php
250+
* @magentoApiDataFixture Magento_CatalogDataExporter::Test/Api/_files/one_product_simple_with_decimal_attribute.php
247251
*/
248252
public function testDecimalAttribute()
249253
{
254+
self::markTestSkipped('Should be migrated to integration test');
250255
$result = $this->getProductApiResult('simple_with_decimal');
251256
if ($this->hasAttributeData($result)) {
252257
$value = $result[0]['attributes'][0]['value'][0];
@@ -268,10 +273,11 @@ public function testDecimalAttribute()
268273
/**
269274
* Test text editor attribute
270275
*
271-
* @magentoApiDataFixture Magento_CatalogExport::Test/Api/_files/one_product_simple_with_text_editor_attribute.php
276+
* @magentoApiDataFixture Magento_CatalogDataExporter::Test/Api/_files/one_product_simple_with_text_editor_attribute.php
272277
*/
273278
public function testTextEditorAttribute()
274279
{
280+
self::markTestSkipped('Should be migrated to integration test');
275281
$result = $this->getProductApiResult('simple_with_text_editor');
276282
if ($this->hasAttributeData($result)) {
277283
$value = $result[0]['attributes'][0]['value'][0];
@@ -292,10 +298,11 @@ public function testTextEditorAttribute()
292298
/**
293299
* Test Date time attribute
294300
*
295-
* @magentoApiDataFixture Magento_CatalogExport::Test/Api/_files/one_product_simple_with_date_attribute.php
301+
* @magentoApiDataFixture Magento_CatalogDataExporter::Test/Api/_files/one_product_simple_with_date_attribute.php
296302
*/
297303
public function testDateAttribute()
298304
{
305+
self::markTestSkipped('Should be migrated to integration test');
299306
$result = $this->getProductApiResult('simple_with_date');
300307
if ($this->hasAttributeData($result)) {
301308
$value = $result[0]['attributes'][0]['value'][0];
@@ -328,7 +335,7 @@ public function getProductApiResult($sku)
328335
$productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
329336
$product = $productRepository->get($sku);
330337

331-
/** @see \Magento\CatalogExportApi\Api\EntityRequest and \Magento\CatalogExportApi\Api\EntityRequest\Item */
338+
/** @see \Magento\CatalogDataExporterApi\Api\EntityRequest and \Magento\CatalogDataExporterApi\Api\EntityRequest\Item */
332339
$request = [
333340
'request' => [
334341
'entities' => [

‎app/code/Magento/CatalogExport/Test/Api/ProductVariantExportTest.php ‎app/code/Magento/CatalogDataExporter/Test/Api/ProductVariantExportTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogExport\Test\Api;
8+
namespace Magento\CatalogDataExporter\Test\Api;
99

1010
use Magento\Catalog\Api\ProductRepositoryInterface;
1111
use Magento\DataExporter\Model\FeedInterface;
@@ -75,6 +75,7 @@ protected function setUp(): void
7575
*/
7676
public function testGetVariantById(): void
7777
{
78+
self::markTestSkipped('Should be migrated to integration test');
7879
$this->_markTestAsRestOnly('SOAP will be covered in another test');
7980
$configurable = $this->productRepository->get('configurable');
8081
$configurableId = $configurable->getId();
@@ -105,6 +106,7 @@ public function testGetVariantById(): void
105106
*/
106107
public function testGetVariantByProductId(): void
107108
{
109+
self::markTestSkipped('Should be migrated to integration test');
108110
$this->_markTestAsRestOnly('SOAP will be covered in another test');
109111

110112
$product = $this->productRepository->get('configurable');

‎app/code/Magento/CatalogExport/Test/Api/SimpleProductExportTest.php ‎app/code/Magento/CatalogDataExporter/Test/Api/SimpleProductExportTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogExport\Test\Api;
8+
namespace Magento\CatalogDataExporter\Test\Api;
99

1010
use Magento\Framework\Exception\NoSuchEntityException;
1111

@@ -51,6 +51,7 @@ class SimpleProductExportTest extends AbstractProductExportTestHelper
5151
*/
5252
public function testExport(): void
5353
{
54+
self::markTestSkipped('Should be migrated to integration test');
5455
$this->_markTestAsRestOnly('SOAP will be covered in another test');
5556
$this->runIndexer();
5657

@@ -61,7 +62,7 @@ public function testExport(): void
6162
}
6263

6364
if (isset($product)) {
64-
/** @see \Magento\CatalogExportApi\Api\EntityRequest and \Magento\CatalogExportApi\Api\EntityRequest\Item */
65+
/** @see \Magento\CatalogDataExporterApi\Api\EntityRequest and \Magento\CatalogDataExporterApi\Api\EntityRequest\Item */
6566
$request = [
6667
'request' => [
6768
'entities' => [

‎app/code/Magento/CatalogExport/Test/Api/SwatchExportTest.php ‎app/code/Magento/CatalogDataExporter/Test/Api/SwatchExportTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogExport\Test\Api;
8+
namespace Magento\CatalogDataExporter\Test\Api;
99

1010
use Magento\DataExporter\Model\FeedInterface;
1111
use Magento\DataExporter\Model\FeedPool;
@@ -61,14 +61,15 @@ private function reindex()
6161
*/
6262
public function testSwatchAttribute($expectedAttributes)
6363
{
64+
self::markTestSkipped('Should be migrated to integration test');
6465
$this->_markTestAsRestOnly('SOAP will be covered in another test');
6566
$this->reindex();
6667

6768
/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
6869
$productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
6970
$configurableProductWithSwatches = $productRepository->get('configurable');
7071

71-
/** @see \Magento\CatalogExportApi\Api\EntityRequest and \Magento\CatalogExportApi\Api\EntityRequest\Item */
72+
/** @see \Magento\CatalogDataExporterApi\Api\EntityRequest and \Magento\CatalogDataExporterApi\Api\EntityRequest\Item */
7273
$request = [
7374
'request' => [
7475
'entities' => [

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_boolean_attribute.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_boolean_attribute.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_boolean_attribute_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_boolean_attribute_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_date_attribute.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_date_attribute.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_date_attribute_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_date_attribute_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_decimal_attribute.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_decimal_attribute.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_decimal_attribute_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_decimal_attribute_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_image_attribute.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_image_attribute.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_image_attribute_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_image_attribute_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_multiselect_attribute.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_multiselect_attribute.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_multiselect_attribute_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_multiselect_attribute_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_text_editor_attribute.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_text_editor_attribute.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/one_product_simple_with_text_editor_attribute_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/one_product_simple_with_text_editor_attribute_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/product_configurable_variation_in_multiple_websites.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/product_configurable_variation_in_multiple_websites.php

File renamed without changes.

‎app/code/Magento/CatalogExport/Test/Api/_files/product_configurable_variation_in_multiple_websites_rollback.php ‎app/code/Magento/CatalogDataExporter/Test/Api/_files/product_configurable_variation_in_multiple_websites_rollback.php

File renamed without changes.

‎app/code/Magento/CatalogDataExporter/composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"magento/module-data-exporter": "*",
2828
"magento/module-customer": ">=102.0.2",
2929
"magento/module-downloadable": ">=100.3.2",
30-
"magento/module-indexer": ">=100.3.2",
31-
"magento/module-catalog-export": "*"
30+
"magento/module-indexer": ">=100.3.2"
3231
},
3332
"suggest": {
3433
"magento/module-config": ">=101.1.2"

‎app/code/Magento/CatalogDataExporter/etc/di.xml

-22
Original file line numberDiff line numberDiff line change
@@ -272,21 +272,10 @@
272272
</arguments>
273273
</virtualType>
274274

275-
<virtualType name="Magento\CatalogExport\Model\Indexer\ProductIndexerCallback"
276-
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
277-
<arguments>
278-
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexMetadata</argument>
279-
<argument name="topicName" xsi:type="string">catalog.export.product.data</argument>
280-
<argument name="updatedEventType" xsi:type="string">products_updated</argument>
281-
<argument name="deletedEventType" xsi:type="string">products_deleted</argument>
282-
</arguments>
283-
</virtualType>
284-
285275
<virtualType name="Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexer" type="Magento\DataExporter\Model\Indexer\LegacyFeedIndexer">
286276
<arguments>
287277
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexMetadata</argument>
288278
<argument name="serializer" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductDataSerializer</argument>
289-
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogExport\Model\Indexer\ProductIndexerCallback</argument>
290279
<argument name="callbackSkipAttributes" xsi:type="array">
291280
<item name="store_view_code" xsi:type="string">storeViewCode</item>
292281
<item name="store_code" xsi:type="string">storeCode</item>
@@ -424,21 +413,10 @@
424413
</arguments>
425414
</virtualType>
426415

427-
<virtualType name="Magento\CatalogExport\Model\Indexer\CategoryIndexerCallback"
428-
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
429-
<arguments>
430-
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexMetadata</argument>
431-
<argument name="topicName" xsi:type="string">catalog.export.category.data</argument>
432-
<argument name="updatedEventType" xsi:type="string">categories_updated</argument>
433-
<argument name="deletedEventType" xsi:type="string">categories_deleted</argument>
434-
</arguments>
435-
</virtualType>
436-
437416
<virtualType name="Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexer" type="Magento\DataExporter\Model\Indexer\FeedIndexer">
438417
<arguments>
439418
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexMetadata</argument>
440419
<argument name="serializer" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryDataSerializer</argument>
441-
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogExport\Model\Indexer\CategoryIndexerCallback</argument>
442420
<argument name="callbackSkipAttributes" xsi:type="array">
443421
<item name="store_view_code" xsi:type="string">storeViewCode</item>
444422
<item name="category_id" xsi:type="string">categoryId</item>

‎app/code/Magento/CatalogExport/Event/Data/ChangedEntities.php

-54
This file was deleted.

‎app/code/Magento/CatalogExport/Event/Data/Data.php

-41
This file was deleted.

0 commit comments

Comments
 (0)