Merge remote-tracking branch 'origin/development' into delivery-notes

Author: Sysix

.github/PULL_REQUEST_TEMPLATE/FEATURE.md

@@ -0,0 +1,18 @@
+---
+name: New Feature
+labels: enhancement
+---
+
+## Requirements
+
+- [ ] Updated README.md
+- [ ] Add PHPUnit test
+- [ ] Added related lexoffice documentation
+
+## Description
+
+Tell us about the new feature
+
+## Related lexoffice documentation
+
+<insert related lexoffice documentation link here>

.php-cs-fixer.dist.php

@@ -14,6 +14,7 @@
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => true,
         'native_type_declaration_casing' => true,
+        'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
         'no_alias_functions' => true,
         'no_alias_language_construct_call' => true,
         'no_alternative_syntax' => true,

README.md

@@ -95,6 +95,8 @@ $response = $api->invoice()->get($entityId);
 $response = $api->invoice()->create($data);
 $response = $api->invoice()->document($entityId); // get document ID
 $response = $api->invoice()->document($entityId, true); // get file content
+$response = $api->invoice()->document($entityId, true, 'image/*'); // accept only images
+$response = $api->invoice()->document($entityId, true, 'application/xml'); // get XRechung XML File (if possible)
 ```
 
 ### Down Payment Invoices Endpoint
@@ -104,6 +106,8 @@ $response = $api->downPaymentInvoice()->get($entityId);
 $response = $api->downPaymentInvoice()->create($data);
 $response = $api->downPaymentInvoice()->document($entityId); // get document ID
 $response = $api->downPaymentInvoice()->document($entityId, true); // get file content
+$response = $api->downPaymentInvoice()->document($entityId, true, 'image/*'); // accept only images
+$response = $api->downPaymentInvoice()->document($entityId, true, 'application/xml'); // get XRechung XML File (if possible)
 ```
 
 ### Order Confirmation Endpoint
@@ -113,6 +117,8 @@ $response = $api->orderConfirmation()->get($entityId);
 $response = $api->orderConfirmation()->create($data);
 $response = $api->orderConfirmation()->document($entityId); // get document ID
 $response = $api->orderConfirmation()->document($entityId, true); // get file content
+$response = $api->orderConfirmation()->document($entityId, true, 'image/*'); // accept only images
+$response = $api->orderConfirmation()->document($entityId, true, 'application/xml'); // get XRechung XML File (if possible)
 ```
 
 ### Quotation Endpoint
@@ -122,6 +128,8 @@ $response = $api->quotation()->get($entityId);
 $response = $api->quotation()->create($data);
 $response = $api->quotation()->document($entityId); // get document ID
 $response = $api->quotation()->document($entityId, true); // get file content
+$response = $api->quotation()->document($entityId, true, 'image/*'); // accept only images
+$response = $api->quotation()->document($entityId, true, 'application/xml'); // get XRechung XML File (if possible)
 ```
 
 ### Voucher Endpoint
@@ -131,6 +139,8 @@ $response = $api->voucher()->create($data);
 $response = $api->voucher()->update($entityId, $data);
 $response = $api->voucher()->document($entityId); // get document ID
 $response = $api->voucher()->document($entityId, true); // get file content
+$response = $api->voucher()->document($entityId, true, 'image/*'); // accept only images
+$response = $api->voucher()->document($entityId, true, 'application/xml'); // get XRechung XML File (if possible)
 $response = $api->voucher()->upload($entitiyId, $filepath);
 ```
 
@@ -142,6 +152,8 @@ $response = $api->creditNote()->get($entityId);
 $response = $api->creditNote()->create($data);
 $response = $api->creditNote()->document($entityId); // get document ID
 $response = $api->creditNote()->document($entityId, true); // get file content
+$response = $api->creditNote()->document($entityId, true, 'image/*'); // accept only images
+$response = $api->creditNote()->document($entityId, true, 'application/xml'); // get XRechung XML File (if possible)
 ```
 
 ### Payment  Endpoint
@@ -230,7 +242,9 @@ $response = $client->getPage(0);
 ### File Endpoint
 ```php
 $response = $api->file()->upload($filePath, $voucherType);
-$response = $api->file()->get($entityId);
+$response = $api->file()->get($entityId); // accept every file
+$response = $api->file()->get($entityId, 'image/*'); // accept only images
+$response = $api->file()->get($entityId, 'application/xml'); // get XRechung XML File (if possible)
 ```
 
 

src/Api.php

@@ -4,10 +4,17 @@
 
 namespace Sysix\LexOffice;
 
+use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Uri;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
+use SensitiveParameter;
 use Sysix\LexOffice\Clients\Contact;
 use Sysix\LexOffice\Clients\Country;
 use Sysix\LexOffice\Clients\CreditNote;
+use Sysix\LexOffice\Clients\DeliveryNote;
 use Sysix\LexOffice\Clients\DownPaymentInvoice;
 use Sysix\LexOffice\Clients\Event;
 use Sysix\LexOffice\Clients\File;
@@ -21,31 +28,23 @@
 use Sysix\LexOffice\Clients\RecurringTemplate;
 use Sysix\LexOffice\Clients\Voucher;
 use Sysix\LexOffice\Clients\VoucherList;
-use GuzzleHttp\Psr7\Request;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
-use SensitiveParameter;
-use Sysix\LexOffice\Clients\DeliveryNote;
+use Sysix\LexOffice\Interfaces\ApiInterface;
+
 
-class Api
+class Api implements ApiInterface
 {
     public string $apiUrl = 'https://api.lexoffice.io';
 
     protected string $apiVersion = 'v1';
 
-    public RequestInterface $request;
+    protected RequestInterface $request;
 
     public function __construct(
         #[SensitiveParameter] protected string $apiKey,
         protected ClientInterface $client
     ) {
     }
 
-    /**
-     * @param string[] $headers
-     */
     public function newRequest(string $method, string $resource, array $headers = []): self
     {
         $this->setRequest(
@@ -57,9 +56,11 @@ public function newRequest(string $method, string $resource, array $headers = []
 
     public function setRequest(RequestInterface $request): self
     {
-        $request = $request
-            ->withHeader('Authorization', 'Bearer ' . $this->apiKey)
-            ->withHeader('Accept', 'application/json');
+        $request = $request->withHeader('Authorization', 'Bearer ' . $this->apiKey);
+
+        if (!$request->hasHeader('Accept')) {
+            $request = $request->withHeader('Accept', 'application/json');
+        }
 
         if (!$request->hasHeader('Content-Type') && in_array($request->getMethod(), ['POST', 'PUT'], true)) {
             $request = $request->withHeader('Content-Type', 'application/json');
@@ -70,16 +71,21 @@ public function setRequest(RequestInterface $request): self
         return $this;
     }
 
-    protected function createApiUri(string $resource): UriInterface
+    public function getRequest(): RequestInterface
     {
-        return new Uri($this->apiUrl . '/' . $this->apiVersion . '/' . $resource);
+        return $this->request;
     }
 
     public function getResponse(): ResponseInterface
     {
         return $this->client->sendRequest($this->request);
     }
 
+    protected function createApiUri(string $resource): UriInterface
+    {
+        return new Uri($this->apiUrl . '/' . $this->apiVersion . '/' . $resource);
+    }
+
     public function contact(): Contact
     {
         return new Contact($this);

src/BaseClient.php

@@ -5,13 +5,15 @@
 namespace Sysix\LexOffice;
 
 use Psr\Http\Message\ResponseInterface;
+use Sysix\LexOffice\Interfaces\ApiInterface;
+use Sysix\LexOffice\Interfaces\ClientInterface;
 
 abstract class BaseClient implements ClientInterface
 {
     protected string $resource;
 
     public function __construct(
-        protected Api $api
+        protected ApiInterface $api
     ) {
     }
 

src/ClientInterface.php

@@ -4,8 +4,8 @@
 
 namespace Sysix\LexOffice\Clients;
 
-use Sysix\LexOffice\BaseClient;
 use Psr\Http\Message\ResponseInterface;
+use Sysix\LexOffice\BaseClient;
 
 class Country extends BaseClient
 {

src/Clients/Country.php

@@ -4,10 +4,10 @@
 
 namespace Sysix\LexOffice\Clients;
 
+use Psr\Http\Message\ResponseInterface;
 use Sysix\LexOffice\BaseClient;
 use Sysix\LexOffice\Clients\Traits\CreateTrait;
 use Sysix\LexOffice\Clients\Traits\DeleteTrait;
-use Psr\Http\Message\ResponseInterface;
 
 class Event extends BaseClient
 {

src/Clients/Event.php

@@ -4,19 +4,25 @@
 
 namespace Sysix\LexOffice\Clients;
 
-use Sysix\LexOffice\BaseClient;
-use Sysix\LexOffice\Clients\Traits\GetTrait;
-use Sysix\LexOffice\Exceptions\LexOfficeApiException;
 use Psr\Http\Message\ResponseInterface;
+use Sysix\LexOffice\BaseClient;
 use Sysix\LexOffice\Config\FileClientConfig;
+use Sysix\LexOffice\Exceptions\LexOfficeApiException;
 use Sysix\LexOffice\Utils;
 
 class File extends BaseClient
 {
-    use GetTrait;
-
     protected string $resource = 'files';
 
+    public function get(string $id, string $acceptHeader = '*/*'): ResponseInterface
+    {
+        $this->api->newRequest('GET', $this->resource . '/' . rawurlencode($id));
+
+        $this->api->setRequest($this->api->getRequest()->withHeader('Accept', $acceptHeader));
+
+        return $this->api->getResponse();
+    }
+
     /**
      * @throws LexOfficeApiException
      */
@@ -38,7 +44,7 @@ public function upload(string $filepath, string $type): ResponseInterface
             'Content-Type' => 'multipart/form-data; boundary=' . $body->getBoundary()
         ]);
 
-        $api->request = $api->request->withBody($body);
+        $api->setRequest($api->getRequest()->withBody($body));
 
         return $api->getResponse();
     }

src/Clients/File.php

@@ -4,8 +4,8 @@
 
 namespace Sysix\LexOffice\Clients;
 
-use Sysix\LexOffice\BaseClient;
 use Psr\Http\Message\ResponseInterface;
+use Sysix\LexOffice\BaseClient;
 
 class PaymentCondition extends BaseClient
 {