integrated laravel/pint as dev requirement for PHP style fixing

dropped PHP 8.0 support

Author: onlime

.gitignore

@@ -1,6 +1,5 @@
-~*
-vendor
+/vendor
+/samples/client_tokens.json
+/playground/*
 composer.lock
-
-samples/client_tokens.json
-playground/*
+.pint.cache.json

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## [0.4.x (Unreleased)](https://github.com/onlime/bexio-api-client/compare/0.3.1...main)
 
 - Added Bexio company profile endpoint request methods to `Other` resource.
+- Drop PHP 8.0 support
+- Integrated laravel/pint as dev requirement for PHP style fixing
 
 ## [0.4.1 (2022-03-24)](https://github.com/onlime/bexio-api-client/compare/0.4.0...0.4.1)
 

composer.json

@@ -20,10 +20,13 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "jumbojett/openid-connect-php": "^0.9.5",
-        "guzzlehttp/guzzle": "^7.4"
+        "jumbojett/openid-connect-php": "^0.9.10",
+        "guzzlehttp/guzzle": "^7.5"
+    },
+    "require-dev": {
+        "laravel/pint": "^1.2"
     },
     "suggest": {
         "onlime/laravel-bexio-api-client": "To use Laravel HTTP Client instead of Guzzle"

pint.json

@@ -0,0 +1,18 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "braces": false,
+        "blank_line_before_statement": false,
+        "class_definition": false,
+        "binary_operator_spaces": false,
+        "concat_space": false,
+        "no_unused_imports": false,
+        "Laravel/laravel_phpdoc_alignment": false,
+        "Laravel/laravel_phpdoc_separation": false,
+        "modernize_strpos": true
+    },
+    "exclude": [
+        "node_modules"
+    ],
+    "cache-file": ".pint.cache.json"
+}

samples/sample.php

@@ -1,4 +1,5 @@
 <?php
+
 require_once '../vendor/autoload.php';
 
 use Bexio\Client;

src/Bexio/AbstractClient.php

@@ -1,27 +1,36 @@
 <?php
+
 namespace Bexio;
 
 use Jumbojett\OpenIDConnectClient;
 
 abstract class AbstractClient
 {
     const PROVIDER_URL = 'https://idp.bexio.com';
+
     const API_URL = 'https://api.bexio.com';
+
     const API_DEFAULT_VERSION = '2.0';
 
     const METHOD_GET = 'GET';
+
     const METHOD_POST = 'POST';
+
     const METHOD_PUT = 'PUT';
+
     const METHOD_DELETE = 'DELETE';
+
     const METHOD_PATCH = 'PATCH';
 
     private ?string $accessToken = null;
+
     private ?string $refreshToken = null;
 
     public function __construct(
         public string $clientId,
         public string $clientSecret
-    ) {}
+    ) {
+    }
 
     public function setAccessToken(string $accessToken)
     {
@@ -47,13 +56,13 @@ public function persistTokens(string $tokensFile): bool
     {
         return false !== file_put_contents($tokensFile, json_encode([
             'accessToken' => $this->getAccessToken(),
-            'refreshToken' => $this->getRefreshToken()
+            'refreshToken' => $this->getRefreshToken(),
         ]));
     }
 
     public function loadTokens(string $tokensFile)
     {
-        if (!file_exists($tokensFile)) {
+        if (! file_exists($tokensFile)) {
             throw new \Exception('Tokens file not found: ' . $tokensFile);
         }
         $tokens = json_decode(file_get_contents($tokensFile));
@@ -81,7 +90,7 @@ public function getOpenIDConnectClient(): OpenIDConnectClient
 
     public function authenticate(string|array $scopes, string $redirectUrl)
     {
-        if (!is_array($scopes)) {
+        if (! is_array($scopes)) {
             $scopes = explode(' ', $scopes);
         }
 
@@ -96,7 +105,7 @@ public function authenticate(string|array $scopes, string $redirectUrl)
 
     public function isAccessTokenExpired($gracePeriod = 30): bool
     {
-        if (!$this->accessToken) {
+        if (! $this->accessToken) {
             return true;
         }
         $payload = $this->getOpenIDConnectClient()->getAccessTokenPayload();
@@ -118,13 +127,17 @@ public function getFullApiUrl(string $path = '', array $query = []): string
         return implode('/', array_filter([
             self::API_URL,
             1 === preg_match('/\d\.\d\//', $path) ? '' : self::API_DEFAULT_VERSION,
-            empty($query) ? $path : $path . '?' . http_build_query($query)
+            empty($query) ? $path : $path . '?' . http_build_query($query),
         ]));
     }
 
     abstract public function get(string $path, array $queryParams = []);
+
     abstract public function post(string $path, array $data = [], array $queryParams = []);
+
     abstract public function put(string $path, array $data = [], array $queryParams = []);
+
     abstract public function delete(string $path, array $data = [], array $queryParams = []);
+
     abstract public function patch(string $path, array $data = [], array $queryParams = []);
 }

src/Bexio/Bexio.php

@@ -1,9 +1,11 @@
 <?php
+
 namespace Bexio;
 
 class Bexio
 {
     public function __construct(
         protected AbstractClient $client
-    ) {}
-}
+    ) {
+    }
+}

src/Bexio/Client.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace Bexio;
 
 use Bexio\Exception\BexioClientException;
-use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Client as GuzzleClient;
+use GuzzleHttp\Exception\ClientException;
 
 class Client extends AbstractClient
 {
@@ -46,11 +47,11 @@ protected function request(
             'allow_redirects' => false,
         ];
 
-        if (!empty($queryParams)) {
+        if (! empty($queryParams)) {
             $options['query'] = $queryParams;
         }
 
-        if (!empty($data) && self::METHOD_GET !== $method) {
+        if (! empty($data) && self::METHOD_GET !== $method) {
             $options['json'] = $data;
         }
 

src/Bexio/Exception/BexioClientException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Bexio\Exception;
 
 use Exception;

src/Bexio/Resource/AbstractDocumentPositions.php

@@ -1,11 +1,11 @@
 <?php
+
 namespace Bexio\Resource;
 
 use Bexio\Bexio;
 
 /**
  * Class Invoice
- * @package Bexio\Resource
  */
 abstract class AbstractDocumentPositions extends Bexio
 {
@@ -73,7 +73,6 @@ public function deleteDefaultPosition(int $documentId, int $itemId)
         return $this->client->delete($this->documentType . "/$documentId/kb_position_custom/$itemId");
     }
 
-
     /**
      * @param int   $documentId
      * @param array $params
@@ -136,7 +135,6 @@ public function deleteItemPosition(int $documentId, int $itemId)
         return $this->client->delete($this->documentType . "/$documentId/kb_position_article/$itemId");
     }
 
-
     /**
      * @param int   $documentId
      * @param array $params
@@ -198,4 +196,4 @@ public function deleteDiscountPosition(int $documentId, int $itemId)
     {
         return $this->client->delete($this->documentType . "/$documentId/kb_position_discount/$itemId");
     }
-}
+}