Merge branch '1.x' into 2.x

.github/workflows/run-tests.yml

@@ -9,24 +9,27 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', '8.1']
-        laravel: ['9.*']
+        php: ['8.0', '8.1', '8.2']
+        laravel: ['9.*', '10.*@dev']
         composer-flags: ['--prefer-stable']
         can-fail: [false]
         include:
           - php: '8.0'
             laravel: '9.*'
             composer-flags: '--prefer-stable --prefer-lowest'
             can-fail: false
+        exclude:
+          - php: '8.0'
+            laravel: '10.*@dev'
 
     name: "PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}"
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}-flags-${{ matrix.composer-flags }}

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Changelog
 
-## 2.0.0 (2022-??-??)
+## 2.0.0 (2023-??-??)
 
 - Consult the UPGRADE guide for changes between 1.x and 2.0

composer.json

@@ -5,15 +5,15 @@
     "keywords": ["laravel", "twilio"],
     "require": {
         "php": "^8.0",
-        "illuminate/http": "^9.0",
-        "illuminate/support": "^9.0",
+        "illuminate/http": "^9.0 || ^10.0",
+        "illuminate/support": "^9.0 || ^10.0",
         "twilio/sdk": "^6.33"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^9.0",
-        "orchestra/testbench": "^7.0",
-        "phpunit/phpunit": "^9.5"
+        "laravel/framework": "^9.0 || ^10.0",
+        "orchestra/testbench": "^7.0 || ^8.0",
+        "phpunit/phpunit": "^9.5 || ^10.0"
     },
     "suggest": {
         "illuminate/notifications": "To use Laravel's notifications component with this package"