diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
index e7e28b9..372212b 100644
--- a/.github/workflows/dependabot-auto-merge.yml
+++ b/.github/workflows/dependabot-auto-merge.yml
@@ -1,4 +1,4 @@
-name: dependabot-auto-merge
+name: Dependabot Auto-Merge
on: pull_request_target
permissions:
@@ -10,23 +10,23 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
-
+
- name: Dependabot metadata
id: metadata
- uses: dependabot/fetch-metadata@v1.3.5
+ uses: dependabot/fetch-metadata@v1
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
-
+
- name: Auto-merge Dependabot PRs for semver-minor updates
- if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+ if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
run: gh pr merge --auto --merge "$PR_URL"
env:
- PR_URL: ${{github.event.pull_request.html_url}}
- GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
+ PR_URL: ${{ github.event.pull_request.html_url }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
- name: Auto-merge Dependabot PRs for semver-patch updates
- if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
+ if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
run: gh pr merge --auto --merge "$PR_URL"
env:
- PR_URL: ${{github.event.pull_request.html_url}}
- GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+ PR_URL: ${{ github.event.pull_request.html_url }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 591ab8a..524abf6 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -11,7 +11,7 @@ jobs:
name: phpstan
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index d645204..4066598 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -13,18 +13,20 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
- php: [8.2]
- laravel: [10.*]
+ php: [8.2, 8.3]
+ laravel: [10.*, 11.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
+ - laravel: 11.*
+ testbench: 9.*
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
diff --git a/.gitignore b/.gitignore
index 9a43686..6127d06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
.idea
.php_cs
.php_cs.cache
-.phpunit.result.cache
+.phpunit.cache
build
composer.lock
coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 3516fc9..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Changelog
-
-All notable changes to `verify-by-phone` will be documented in this file.
-
-## v0.5.0 - 2023-02-27
-
-### Added
-
-- Support for Laravel 10 in [#25](https://github.com/worksome/verify-by-phone/pull/25)
diff --git a/README.md b/README.md
index ef34dc3..784f504 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ composer test
## Changelog
-Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
+Please see [GitHub Releases](https://github.com/worksome/verify-by-phone/releases) for more information on what has changed recently.
## Contributing
diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 6a70364..0000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Release instructions
-
-The following steps should be performed each and every time a new release is made.
-
-1. Switch to the `main` branch in your local installation
-2. Run `git pull` to get the latest code changes
-4. Edit [CHANGELOG.md](CHANGELOG.md) following the [Keep a Changelog](https://keepachangelog.com) convention
-5. Run `git commit -m "docs: update CHANGELOG" && git push`
-6. Run `git tag vX.X.X && git push --tags`, replacing `X` with the appropriate version number
diff --git a/composer.json b/composer.json
index 1f72ba7..5c324ff 100644
--- a/composer.json
+++ b/composer.json
@@ -17,18 +17,18 @@
],
"require": {
"php": "^8.2",
- "illuminate/contracts": "^10.0",
- "propaganistas/laravel-phone": "^5.0.3",
- "spatie/laravel-package-tools": "^1.14.2",
- "twilio/sdk": "^6.44"
+ "illuminate/contracts": "^10.0 || ^11.0",
+ "propaganistas/laravel-phone": "^5.2",
+ "spatie/laravel-package-tools": "^1.16",
+ "twilio/sdk": "^6.44 || ^7.0"
},
"require-dev": {
- "guzzlehttp/guzzle": "^7.5",
- "nunomaduro/collision": "^7.3.2",
- "orchestra/testbench": "^8.0",
- "pestphp/pest": "^2.0",
- "pestphp/pest-plugin-laravel": "^2.0",
- "worksome/coding-style": "^2.5"
+ "guzzlehttp/guzzle": "^7.8",
+ "nunomaduro/collision": "^7.10 || ^8.1",
+ "orchestra/testbench": "^8.21 || ^9.0",
+ "pestphp/pest": "^2.33",
+ "pestphp/pest-plugin-laravel": "^2.2",
+ "worksome/coding-style": "^2.10"
},
"autoload": {
"psr-4": {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 4083453..6c5811e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,5 +1,15 @@
parameters:
ignoreErrors:
+ -
+ message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+ count: 1
+ path: src/Commands/SendVerificationCodeCommand.php
+
+ -
+ message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+ count: 2
+ path: src/Commands/VerifyVerificationCodeCommand.php
+
-
message: "#^Illuminate\\\\Support\\\\Facades\\\\Http facade should not be used\\.$#"
count: 1
@@ -9,3 +19,13 @@ parameters:
message: "#^Parameter \\#1 \\$number of class Propaganistas\\\\LaravelPhone\\\\PhoneNumber constructor expects string\\|null, mixed given\\.$#"
count: 1
path: src/Validation/Rules/VerificationCodeIsValid.php
+
+ -
+ message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+ count: 2
+ path: src/VerifyByPhoneManager.php
+
+ -
+ message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
+ count: 2
+ path: src/VerifyByPhoneServiceProvider.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bd5506a..b1163a1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,18 +4,19 @@
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
+ cacheDirectory=".phpunit.cache"
>
-
+
+
+ tests
+
+
+
src
src/Exceptions
-
-
-
- tests
-
-
+