DX-104 : Adding tests + refactor

Author: gwendalaubert

phpunit.xml.dist

@@ -8,7 +8,8 @@
      convertNoticesToExceptions="true"
      convertWarningsToExceptions="true"
      processIsolation="false"
-     stopOnFailure="false">
+     stopOnFailure="false"
+     cacheResult ="false">
 
     <testsuite name="Integration">
         <directory>tests/</directory>

src/AkeneoPimClientBuilder.php

@@ -44,9 +44,9 @@
 use Akeneo\Pim\ApiClient\Cache\LRUCache;
 use Akeneo\Pim\ApiClient\Client\AuthenticatedHttpClient;
 use Akeneo\Pim\ApiClient\Client\CachedResourceClient;
+use Akeneo\Pim\ApiClient\Client\ClientInterface;
 use Akeneo\Pim\ApiClient\Client\HttpClient;
 use Akeneo\Pim\ApiClient\Client\Options;
-use Akeneo\Pim\ApiClient\Client\ClientInterface;
 use Akeneo\Pim\ApiClient\Client\ResourceClient;
 use Akeneo\Pim\ApiClient\FileSystem\FileSystemInterface;
 use Akeneo\Pim\ApiClient\FileSystem\LocalFileSystem;

src/Api/AppCatalog/AppCatalogApi.php

@@ -11,6 +11,7 @@
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorFactoryInterface;
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 
 /**
  * @copyright 2022 Akeneo SAS (https://www.akeneo.com)
@@ -62,7 +63,7 @@ public function delete(string $code): int
         return $this->resourceClient->deleteResource(static::APP_CATALOG_URI, [$code]);
     }
 
-    public function upsertAsync(string $code, array $data = []): PromiseInterface
+    public function upsertAsync(string $code, array $data = []): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncAndReturnPromise(static::APP_CATALOG_URI, [$code], $data);
     }

src/Api/AppCatalog/AppCatalogApiInterface.php

@@ -8,6 +8,7 @@
 use Akeneo\Pim\ApiClient\Api\Operation\GettableResourceInterface;
 use Akeneo\Pim\ApiClient\Api\Operation\ListableResourceInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 
 /**
  * @copyright 2022 Akeneo SAS (https://www.akeneo.com)
@@ -21,5 +22,5 @@ interface AppCatalogApiInterface extends
     public function create(array $data): array;
 
     public function upsert(string $code, array $data = []): array;
-    public function upsertAsync(string $code, array $data = []): PromiseInterface;
+    public function upsertAsync(string $code, array $data = []): PromiseInterface|Promise;
 }

src/Api/AssetApi.php

@@ -11,6 +11,7 @@
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorFactoryInterface;
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -91,7 +92,7 @@ public function upsert(string $code, array $data = []): int
         return $this->resourceClient->upsertResource(static::ASSET_URI, [$code], $data);
     }
 
-    public function upsertAsync(string $code, array $data = []): PromiseInterface
+    public function upsertAsync(string $code, array $data = []): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncResource(static::ASSET_URI, [$code], $data);
     }
@@ -104,7 +105,7 @@ public function upsertList($resources): \Traversable
         return $this->resourceClient->upsertStreamResourceList(static::ASSETS_URI, [], $resources);
     }
 
-    public function upsertAsyncList(StreamInterface|array $resources): PromiseInterface
+    public function upsertAsyncList(StreamInterface|array $resources): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncStreamResourceList(self::ASSETS_URI, [], $resources);
     }

src/Api/AssetCategoryApi.php

@@ -11,6 +11,7 @@
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorFactoryInterface;
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -76,7 +77,7 @@ public function upsert(string $code, array $data = []): int
         return $this->resourceClient->upsertResource(static::ASSET_CATEGORY_URI, [$code], $data);
     }
 
-    public function upsertAsync(string $code, array $data = []): PromiseInterface
+    public function upsertAsync(string $code, array $data = []): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncResource(static::ASSET_CATEGORY_URI, [$code], $data);
     }
@@ -103,7 +104,7 @@ public function create(string $code, array $data = []): int
         return $this->resourceClient->createResource(static::ASSET_CATEGORIES_URI, [], $data);
     }
 
-    public function upsertAsyncList(StreamInterface|array $resources): PromiseInterface
+    public function upsertAsyncList(StreamInterface|array $resources): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncStreamResourceList(static::ASSET_CATEGORIES_URI, [], $resources);
     }

src/Api/AssetManager/AssetApi.php

@@ -9,6 +9,7 @@
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorFactoryInterface;
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 
 class AssetApi implements AssetApiInterface
 {
@@ -75,15 +76,15 @@ public function delete(string $assetFamilyCode, string $assetCode): int
     /**
      * {@inheritdoc}
      */
-    public function upsertAsync(string $assetFamilyCode, string $assetCode, array $data = []): PromiseInterface
+    public function upsertAsync(string $assetFamilyCode, string $assetCode, array $data = []): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncResource(static::ASSET_URI, [$assetFamilyCode, $assetCode], $data);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function upsertAsyncList(string $assetFamilyCode, array $assets): PromiseInterface
+    public function upsertAsyncList(string $assetFamilyCode, array $assets): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncJsonResourceList(static::ASSETS_URI, [$assetFamilyCode], $assets);
     }

src/Api/AssetManager/AssetApiInterface.php

@@ -7,6 +7,7 @@
 use Akeneo\Pim\ApiClient\Exception\HttpException;
 use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 
 interface AssetApiInterface
 {
@@ -64,7 +65,7 @@ public function upsertList(string $assetFamilyCode, array $assets): array;
      *
      * @return Promise
      */
-    public function upsertAsync(string $assetFamilyCode, string $assetCode, array $data = []): PromiseInterface;
+    public function upsertAsync(string $assetFamilyCode, string $assetCode, array $data = []): PromiseInterface|Promise;
 
     /**
      * Updates or creates several assets.
@@ -76,7 +77,7 @@ public function upsertAsync(string $assetFamilyCode, string $assetCode, array $d
      *
      * @return Promise
      */
-    public function upsertAsyncList(string $assetFamilyCode, array $assets): PromiseInterface;
+    public function upsertAsyncList(string $assetFamilyCode, array $assets): PromiseInterface|Promise;
 
     /**
      * Deletes an asset.

src/Api/AssetManager/AssetAttributeApi.php

@@ -6,6 +6,7 @@
 
 use Akeneo\Pim\ApiClient\Client\ResourceClientInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 
 class AssetAttributeApi implements AssetAttributeApiInterface
 {
@@ -44,7 +45,7 @@ public function upsert(string $assetFamilyCode, string $attributeCode, array $da
     /**
      * {@inheritdoc}
      */
-    public function upsertAsync(string $assetFamilyCode, string $attributeCode, array $data = []): PromiseInterface
+    public function upsertAsync(string $assetFamilyCode, string $attributeCode, array $data = []): PromiseInterface|Promise
     {
         return $this->resourceClient->upsertAsyncResource(static::ASSET_ATTRIBUTE_URI, [$assetFamilyCode, $attributeCode], $data);
     }

src/Api/AssetManager/AssetAttributeApiInterface.php

@@ -6,6 +6,7 @@
 
 use Akeneo\Pim\ApiClient\Exception\HttpException;
 use GuzzleHttp\Promise\PromiseInterface;
+use Http\Promise\Promise;
 
 interface AssetAttributeApiInterface
 {
@@ -40,5 +41,5 @@ public function upsert(string $assetFamilyCode, string $attributeCode, array $da
      *
      * @return Promise
      */
-    public function upsertAsync(string $assetFamilyCode, string $attributeCode, array $data = []): PromiseInterface;
+    public function upsertAsync(string $assetFamilyCode, string $attributeCode, array $data = []): PromiseInterface|Promise;
 }