Feature laravel13

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -29,17 +29,17 @@ We're sorry to hear you have a problem. Can you help us solve it by providing th
     attributes:
       label: PHP Version
       description: What version of PHP are you running? Please be as specific as possible
-      placeholder: "8.4.0"
-      value: "8.4.0"
+      placeholder: "8.5.0"
+      value: "8.5.0"
     validations:
       required: true
   - type: input
     id: laravel-version
     attributes:
       label: Laravel Version
       description: What version of Laravel are you running? Please be as specific as possible
-      placeholder: "12.0.0"
-      value: "12.0.0"
+      placeholder: "13.0.0"
+      value: "13.0.0"
     validations:
       required: true
   - type: dropdown

.github/workflows/composer-audit.yml

@@ -0,0 +1,37 @@
+name: Composer audit
+
+on:
+  push:
+    paths:
+      - 'composer.json'
+      - 'composer.lock'
+  pull_request:
+    paths:
+      - 'composer.json'
+      - 'composer.lock'
+  schedule:
+    - cron: '0 6 * * 1'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  composer-audit:
+    name: composer audit
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v6.0.2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@2.37.0
+        with:
+          php-version: '8.5'
+          coverage: none
+
+      - name: Resolve dependencies and audit
+        run: |
+          composer update --no-interaction --no-ansi
+          composer audit

.github/workflows/dependabot-auto-merge.yml

@@ -9,11 +9,13 @@ jobs:
   dependabot:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' }}
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
     steps:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.5.0
+        uses: dependabot/fetch-metadata@v3.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/fix-php-code-style-issues.yml

@@ -13,8 +13,17 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6.0.2
 
-      - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.6
+      - name: Setup PHP
+        uses: shivammathur/setup-php@2.37.0
+        with:
+          php-version: '8.5'
+          coverage: none
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@4.0.0
+
+      - name: Run Laravel Pint
+        run: vendor/bin/pint
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v7.1.0

.github/workflows/phpstan.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@2.37.0
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -14,22 +14,22 @@ jobs:
       max-parallel: 1
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.2, 8.3, 8.4 ]
-        laravel: [ 12.* ]
+        php: [ 8.3, 8.4, 8.5 ]
+        laravel: [ 13.* ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: pcov
 
       - name: Setup problem matchers
         run: |
@@ -41,10 +41,10 @@ jobs:
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
-      - name: Execute tests
+      - name: Copy PHPUnit configuration
         run: cp phpunit.xml.dist phpunit.xml
 
-      - name: Execute tests
+      - name: Run Pest tests
         run: vendor/bin/pest
         env:
           DOCUWARE_URL: ${{ secrets.DOCUWARE_URL }}
@@ -54,7 +54,7 @@ jobs:
 
       - name: Store Log Artifacts
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: Store report artifacts
           path: ./vendor/orchestra/testbench-core/laravel/storage/logs

composer.json

@@ -21,24 +21,27 @@
         }
     ],
     "require": {
-        "php": "8.2.*|8.3.*|8.4.*",
-        "guzzlehttp/guzzle": "^7.8",
-        "illuminate/contracts": "^12.0",
-        "nesbot/carbon": "^3.8",
+        "php": "8.3.*|8.4.*|8.5.*",
+        "guzzlehttp/guzzle": "^7.9.2",
+        "illuminate/contracts": "^13.0",
+        "illuminate/support": "^13.0",
+        "nesbot/carbon": "^3.8.4",
         "saloonphp/cache-plugin": "^3.1",
-        "saloonphp/laravel-plugin": "^3.0|^4.0",
-        "saloonphp/saloon": "^3.0|^4.0",
-        "spatie/laravel-package-tools": "^1.19"
+        "saloonphp/laravel-plugin": "^4.0",
+        "saloonphp/saloon": "^4.0",
+        "spatie/laravel-package-tools": "^1.19.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.21",
-        "larastan/larastan": "^v3.1",
-        "orchestra/testbench": "^10.0",
-        "pestphp/pest": "^3.7",
-        "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan-deprecation-rules": "^2.0",
-        "phpstan/phpstan-phpunit": "^2.0",
-        "spatie/laravel-ray": "^1.39"
+        "laravel/pint": "^1.21.1",
+        "larastan/larastan": "^3.9.3",
+        "nunomaduro/collision": "^8.9",
+        "orchestra/testbench": "^11.0",
+        "pestphp/pest": "^4.4",
+        "phpdocumentor/reflection-docblock": "^5.6.1",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan-deprecation-rules": "^2.0.1",
+        "phpstan/phpstan-phpunit": "^2.0.4",
+        "spatie/laravel-ray": "^1.40.0"
     },
     "autoload": {
         "psr-4": {
@@ -53,16 +56,16 @@
     "scripts": {
         "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi",
         "analyse": "vendor/bin/phpstan analyse",
-        "test": "vendor/bin/pest",
+        "test": "vendor/bin/pest --no-coverage",
         "test-coverage": "vendor/bin/pest --coverage",
         "format": "vendor/bin/pint"
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "phpstan/extension-installer": true,
-            "pestphp/pest-plugin": true
+            "composer/package-versions-deprecated": false,
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
         }
     },
     "extra": {

phpstan.neon.dist

@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 5
+    level: 6
     paths:
         - src
         - config

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" backupGlobals="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd" backupGlobals="false"
          bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false"
          executionOrder="defects" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
          beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">

src/Connectors/DocuWareConnector.php

@@ -17,6 +17,7 @@
 use Psr\SimpleCache\InvalidArgumentException;
 use Saloon\Http\Auth\TokenAuthenticator;
 use Saloon\Http\Connector;
+use Saloon\Http\Response;
 
 class DocuWareConnector extends Connector
 {
@@ -48,42 +49,40 @@ protected function defaultAuth(): TokenAuthenticator
         return new TokenAuthenticator($this->getOrCreateNewOAuthToken());
     }
 
+    protected function oauthTokenCacheTtlSeconds(RequestTokenDto $token): int
+    {
+        return max(1, $token->expiresIn - 60);
+    }
+
     /**
      * @throws InvalidArgumentException
-     * @throws \Exception
      */
     protected function getOrCreateNewOAuthToken(): string
     {
         $cache = Cache::store($this->configuration->cacheDriver);
 
         $cacheKey = 'docuware.oauth.'.$this->configuration->identifier;
 
-        // Check if the token exists in cache and return it if found
         if ($cache->has($cacheKey)) {
             $token = Crypt::decrypt($cache->get($cacheKey));
             DocuWareOAuthLog::dispatch($this->configuration->url, $this->configuration->username, 'Token retrieved from cache');
 
             return $token->accessToken;
         }
 
-        // Handle token retrieval for ConfigWithCredentials
         if ($this->configuration instanceof ConfigWithCredentials) {
             $token = $this->getNewOAuthTokenWithCredentials();
             DocuWareOAuthLog::dispatch($this->configuration->url, $this->configuration->username, 'Token retrieved from API');
-            $cache->put($cacheKey, Crypt::encrypt($token), $token->expiresIn - 60);
+            $cache->put($cacheKey, Crypt::encrypt($token), $this->oauthTokenCacheTtlSeconds($token));
 
             return $token->accessToken;
         }
 
-        // Handle token retrieval for ConfigWithCredentialsTrustedUser
-        // @phpstan-ignore-next-line
-        if ($this->configuration instanceof ConfigWithCredentialsTrustedUser) {
-            $token = $this->getNewOAuthTokenWithCredentialsTrustedUser();
-            DocuWareOAuthLog::dispatch($this->configuration->url, $this->configuration->username, 'Token retrieved from API');
-            $cache->put($cacheKey, Crypt::encrypt($token), $token->expiresIn - 60);
+        $token = $this->getNewOAuthTokenWithCredentialsTrustedUser();
+        DocuWareOAuthLog::dispatch($this->configuration->url, $this->configuration->username, 'Token retrieved from API');
+        $cache->put($cacheKey, Crypt::encrypt($token), $this->oauthTokenCacheTtlSeconds($token));
 
-            return $token->accessToken;
-        }
+        return $token->accessToken;
     }
 
     protected function getAuthenticationTokenEndpoint(): IdentityServiceConfiguration
@@ -111,18 +110,7 @@ protected function getNewOAuthTokenWithCredentials(): RequestTokenDto
             password: $this->configuration->password,
         ))->send();
 
-        throw_if(
-            $requestTokenResponse->failed(),
-            trim(preg_replace('/\s\s+/', ' ', Arr::get(
-                array: $requestTokenResponse->json(),
-                key: 'error_description',
-                default: $requestTokenResponse->body()
-            )))
-        );
-
-        throw_if($requestTokenResponse->dto() == null, 'Token response is null');
-
-        return $requestTokenResponse->dto();
+        return $this->ensureRequestTokenSuccess($requestTokenResponse);
     }
 
     /**
@@ -140,6 +128,15 @@ protected function getNewOAuthTokenWithCredentialsTrustedUser(): RequestTokenDto
             impersonateName: $this->configuration->impersonatedUsername,
         ))->send();
 
+        return $this->ensureRequestTokenSuccess($requestTokenResponse);
+    }
+
+    /**
+     * @throws \Throwable
+     * @throws \JsonException
+     */
+    protected function ensureRequestTokenSuccess(Response $requestTokenResponse): RequestTokenDto
+    {
         throw_if(
             $requestTokenResponse->failed(),
             trim(preg_replace('/\s\s+/', ' ', Arr::get(