Merge pull request #110 from codebar-ag/feature-upgrade

Feature upgrade
codebar-ag · Oct 14, 2023 · 0b10751 · 0b10751
2 parents fb51b6f + 99135bf
commit 0b10751
Show file tree

Hide file tree

Showing 62 changed files with 624 additions and 364 deletions.
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
   ],
   "require": {
     "php": "^8.2",
-    "guzzlehttp/guzzle": "^7.5",
+    "guzzlehttp/guzzle": "^7.6",
     "illuminate/contracts": "^9.0|^10.0",
     "nesbot/carbon": "^2.64.0",
-    "saloonphp/cache-plugin": "^2.0",
-    "saloonphp/saloon": "^2.0",
-    "saloonphp/laravel-plugin": "^2.0",
+    "saloonphp/cache-plugin": "^3.0",
+    "saloonphp/saloon": "^3.0",
+    "saloonphp/laravel-plugin": "^3.0",
     "spatie/laravel-package-tools": "^1.14.0"
   },
   "require-dev": {

diff --git a/src/Events/DocuWareResponseLog.php b/src/Events/DocuWareResponseLog.php
@@ -6,7 +6,6 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Http\Client\Response;
 use Illuminate\Queue\SerializesModels;
-use Saloon\Contracts\Response as SaloonContracts;
 use Saloon\Http\Response as SaloonResponse;
 
 class DocuWareResponseLog
@@ -16,7 +15,7 @@ class DocuWareResponseLog
     use SerializesModels;
 
     public function __construct(
-        public Response|SaloonResponse|SaloonContracts $response
+        public Response|SaloonResponse $response
     ) {
     }
 }
diff --git a/src/Requests/Auth/PostLoginRequest.php b/src/Requests/Auth/PostLoginRequest.php
@@ -5,8 +5,8 @@
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
+use Saloon\Http\Response;
 use Saloon\Http\SoloRequest;
 use Saloon\Traits\Body\HasFormBody;
 

diff --git a/src/Requests/Dialogs/GetDialogRequest.php b/src/Requests/Dialogs/GetDialogRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDialogRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Dialogs/GetDialogsRequest.php b/src/Requests/Dialogs/GetDialogsRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDialogsRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/DeleteDocumentRequest.php b/src/Requests/Document/DeleteDocumentRequest.php
@@ -3,9 +3,9 @@
 namespace CodebarAg\DocuWare\Requests\Document;
 
 use CodebarAg\DocuWare\Responses\Document\DeleteDocumentResponse;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class DeleteDocumentRequest extends Request
 {

diff --git a/src/Requests/Document/GetDocumentCountRequest.php b/src/Requests/Document/GetDocumentCountRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentCountRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/GetDocumentDownloadRequest.php b/src/Requests/Document/GetDocumentDownloadRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentDownloadRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/GetDocumentPreviewRequest.php b/src/Requests/Document/GetDocumentPreviewRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentPreviewRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/GetDocumentRequest.php b/src/Requests/Document/GetDocumentRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/GetDocumentsDownloadRequest.php b/src/Requests/Document/GetDocumentsDownloadRequest.php
@@ -9,9 +9,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentsDownloadRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/GetDocumentsRequest.php b/src/Requests/Document/GetDocumentsRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentsRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Document/PostDocumentRequest.php b/src/Requests/Document/PostDocumentRequest.php
@@ -6,10 +6,10 @@
 use CodebarAg\DocuWare\Responses\Document\PostDocumentResponse;
 use Illuminate\Support\Collection;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Data\MultipartValue;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasMultipartBody;
 
 class PostDocumentRequest extends Request implements HasBody

diff --git a/src/Requests/Document/PostTransferDocumentRequest.php b/src/Requests/Document/PostTransferDocumentRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\DocuWare\Responses\Document\PostTransferDocumentResponse;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class PostTransferDocumentRequest extends Request implements HasBody

diff --git a/src/Requests/Document/PutDocumentFieldsRequest.php b/src/Requests/Document/PutDocumentFieldsRequest.php
@@ -5,9 +5,9 @@
 use CodebarAg\DocuWare\Exceptions\UnableToUpdateFields;
 use CodebarAg\DocuWare\Responses\Document\PutDocumentFieldsResponse;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class PutDocumentFieldsRequest extends Request implements HasBody

diff --git a/src/Requests/Document/Thumbnail/GetDocumentDownloadThumbnailRequest.php b/src/Requests/Document/Thumbnail/GetDocumentDownloadThumbnailRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetDocumentDownloadThumbnailRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Fields/GetFieldsRequest.php b/src/Requests/Fields/GetFieldsRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetFieldsRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/FileCabinets/GetFileCabinetsRequest.php b/src/Requests/FileCabinets/GetFileCabinetsRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetFileCabinetsRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Organization/GetOrganizationRequest.php b/src/Requests/Organization/GetOrganizationRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetOrganizationRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Organization/GetOrganizationsRequest.php b/src/Requests/Organization/GetOrganizationsRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetOrganizationsRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/Search/GetSearchRequest.php b/src/Requests/Search/GetSearchRequest.php
@@ -8,9 +8,9 @@
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class GetSearchRequest extends Request implements Cacheable, HasBody

diff --git a/src/Requests/Sections/GetSectionsRequest.php b/src/Requests/Sections/GetSectionsRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetSectionsRequest extends Request implements Cacheable
 {

diff --git a/src/Requests/SelectList/GetSelectListRequest.php b/src/Requests/SelectList/GetSelectListRequest.php
@@ -7,9 +7,9 @@
 use Saloon\CachePlugin\Contracts\Cacheable;
 use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
 use Saloon\CachePlugin\Traits\HasCaching;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetSelectListRequest extends Request implements Cacheable
 {

diff --git a/src/Responses/Dialogs/GetDialogResponse.php b/src/Responses/Dialogs/GetDialogResponse.php
@@ -5,7 +5,7 @@
 use CodebarAg\DocuWare\DTO\Dialog;
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDialogResponse
 {

diff --git a/src/Responses/Dialogs/GetDialogsResponse.php b/src/Responses/Dialogs/GetDialogsResponse.php
@@ -7,7 +7,7 @@
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Enumerable;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDialogsResponse
 {

diff --git a/src/Responses/Document/DeleteDocumentResponse.php b/src/Responses/Document/DeleteDocumentResponse.php
@@ -4,7 +4,7 @@
 
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class DeleteDocumentResponse
 {

diff --git a/src/Responses/Document/GetDocumentCountResponse.php b/src/Responses/Document/GetDocumentCountResponse.php
@@ -6,7 +6,7 @@
 use CodebarAg\DocuWare\Exceptions\UnableToGetDocumentCount;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use Illuminate\Support\Arr;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentCountResponse
 {

diff --git a/src/Responses/Document/GetDocumentDownloadResponse.php b/src/Responses/Document/GetDocumentDownloadResponse.php
@@ -4,7 +4,7 @@
 
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentDownloadResponse
 {

diff --git a/src/Responses/Document/GetDocumentPreviewResponse.php b/src/Responses/Document/GetDocumentPreviewResponse.php
@@ -4,7 +4,7 @@
 
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentPreviewResponse
 {

diff --git a/src/Responses/Document/GetDocumentResponse.php b/src/Responses/Document/GetDocumentResponse.php
@@ -5,7 +5,7 @@
 use CodebarAg\DocuWare\DTO\Document;
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentResponse
 {

diff --git a/src/Responses/Document/GetDocumentsDownloadResponse.php b/src/Responses/Document/GetDocumentsDownloadResponse.php
@@ -4,7 +4,7 @@
 
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentsDownloadResponse
 {

diff --git a/src/Responses/Document/GetDocumentsResponse.php b/src/Responses/Document/GetDocumentsResponse.php
@@ -6,7 +6,7 @@
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use Illuminate\Support\Collection;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentsResponse
 {

diff --git a/src/Responses/Document/PostDocumentResponse.php b/src/Responses/Document/PostDocumentResponse.php
@@ -5,7 +5,7 @@
 use CodebarAg\DocuWare\DTO\Document;
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class PostDocumentResponse
 {

diff --git a/src/Responses/Document/PostTransferDocumentResponse.php b/src/Responses/Document/PostTransferDocumentResponse.php
@@ -4,7 +4,7 @@
 
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class PostTransferDocumentResponse
 {

diff --git a/src/Responses/Document/PutDocumentFieldsResponse.php b/src/Responses/Document/PutDocumentFieldsResponse.php
@@ -6,7 +6,7 @@
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use CodebarAg\DocuWare\Support\ParseValue;
 use Illuminate\Support\Collection;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class PutDocumentFieldsResponse
 {

diff --git a/src/Responses/Document/Thumbnail/GetDocumentDownloadThumbnailResponse.php b/src/Responses/Document/Thumbnail/GetDocumentDownloadThumbnailResponse.php
@@ -5,7 +5,7 @@
 use CodebarAg\DocuWare\DTO\DocumentThumbnail;
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetDocumentDownloadThumbnailResponse
 {

diff --git a/src/Responses/Fields/GetFieldsResponse.php b/src/Responses/Fields/GetFieldsResponse.php
@@ -7,7 +7,7 @@
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Enumerable;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetFieldsResponse
 {

diff --git a/src/Responses/FileCabinets/GetFileCabinetsResponse.php b/src/Responses/FileCabinets/GetFileCabinetsResponse.php
@@ -7,7 +7,7 @@
 use CodebarAg\DocuWare\Support\EnsureValidResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Enumerable;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 final class GetFileCabinetsResponse
 {