Merge pull request #126 from Sammyjo20/fix/php-8.2-support

Fix | Support PHP 8.2

Author: Sammyjo20

.github/workflows/php-cs-fixer.yml

@@ -11,6 +11,9 @@ on:
   release:
     types: [ released ]
 
+permissions:
+  contents: write
+
 jobs:
   php-cs-fixer:
     runs-on: ubuntu-latest
@@ -24,8 +27,8 @@ jobs:
       - name: Run PHP CS Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --config=.php-cs-fixer.dist.php
+          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Apply Code Style Fixes
+          commit_message: 🪄 Code Style Fixes

.github/workflows/tests.yml

@@ -11,36 +11,39 @@ on:
   release:
     types: [ released ]
 
+permissions:
+  contents: read
+
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.1, 8.0 ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
+        os: [ ubuntu-latest, windows-latest ]
+        php: [ 8.0, 8.1, 8.2 ]
+        stability: [ prefer-lowest, prefer-stable ]
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
+    name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+        uses: actions/checkout@v3
 
       - 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
 
-      - name: Install composer dependencies
+      - name: Setup problem matchers
         run: |
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: Install dependencies
+        run: |
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
       - name: Execute tests
-        run: composer test
+        run: vendor/bin/pest

composer.json

@@ -20,9 +20,9 @@
     "homepage": "https://github.com/sammyjo20/saloon",
     "require": {
         "php": "^8.0",
-        "guzzlehttp/guzzle": "^7.4",
+        "guzzlehttp/guzzle": "^7.5",
         "illuminate/support": "^8.0 || ^9.0",
-        "nesbot/carbon": "^2.58"
+        "nesbot/carbon": "^2.64"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",

tests/Fixtures/Connectors/TestConnector.php

@@ -9,6 +9,8 @@ class TestConnector extends SaloonConnector
 {
     use AcceptsJson;
 
+    public bool $unique = false;
+
     /**
      * Define the base url of the api.
      *

tests/Fixtures/Requests/NoTrailingSlashRequest.php

@@ -8,6 +8,11 @@
 
 class NoTrailingSlashRequest extends SaloonRequest
 {
+    /**
+     * @var bool
+     */
+    public bool $addTrailingSlashAfterBaseUrl = false;
+
     /**
      * Define the method that the request will use.
      *

tests/Unit/StorageTest.php

@@ -52,13 +52,15 @@
     $filesystem->deleteDirectory('/');
     $filesystem->createDirectory('/');
 
-    $storage = new Storage('tests/Fixtures/Saloon');
+    $path = 'some' . DIRECTORY_SEPARATOR . 'other' . DIRECTORY_SEPARATOR . 'directories' . DIRECTORY_SEPARATOR . 'example.txt';
+
+    $storage = new Storage('tests' . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'Saloon');
 
-    expect($storage->exists('some/other/directories/example.txt'))->toBeFalse();
+    expect($storage->exists($path))->toBeFalse();
 
-    $storage->put('some/other/directories/example.txt', 'Hello World');
+    $storage->put($path, 'Hello World');
 
-    expect($storage->exists('some/other/directories/example.txt'))->toBeTrue();
+    expect($storage->exists($path))->toBeTrue();
 
-    expect($storage->get('some/other/directories/example.txt'))->toEqual('Hello World');
+    expect($storage->get($path))->toEqual('Hello World');
 });