diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 461cc97..372212b 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,4 +1,4 @@ -name: Dependabot +name: Dependabot Auto-Merge on: pull_request_target permissions: @@ -7,7 +7,6 @@ permissions: jobs: dependabot: - name: Auto Merge runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} steps: @@ -19,15 +18,15 @@ jobs: 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 8ea01b1..7b3b36e 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - 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 fe99fc5..53d435e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,24 +9,24 @@ on: jobs: test: runs-on: ${{ matrix.os }} - env: - PREVENT_OUTPUT: true strategy: fail-fast: true matrix: os: [ubuntu-latest, windows-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/composer.json b/composer.json index a63aa41..990551e 100644 --- a/composer.json +++ b/composer.json @@ -17,18 +17,18 @@ ], "require": { "php": "^8.2", - "google/cloud-translate": "^1.12", - "illuminate/support": "^10.0", - "spatie/laravel-package-tools": "^1.14.1" + "google/cloud-translate": "^1.17", + "illuminate/support": "^10.0 || ^11.0", + "spatie/laravel-package-tools": "^1.16" }, "require-dev": { - "guzzlehttp/guzzle": "^7.5", - "nunomaduro/collision": "^7.0", - "nunomaduro/larastan": "^2.4", - "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.0 || ^8.1", + "larastan/larastan": "^2.6", + "orchestra/testbench": "^8.0 || ^9.0", + "pestphp/pest": "^2.33", + "pestphp/pest-plugin-laravel": "^2.2", + "worksome/coding-style": "^2.8" }, "autoload": { "psr-4": { diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 60cde65..0000000 --- a/renovate.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": [ - "config:base" - ], - "rangeStrategy": "auto", - "semanticCommits": "enabled", - "branchConcurrentLimit": 10, - "reviewersFromCodeOwners": true -} diff --git a/src/Facades/Translator.php b/src/Facades/Translator.php index 8252631..402a20b 100644 --- a/src/Facades/Translator.php +++ b/src/Facades/Translator.php @@ -10,6 +10,7 @@ /** * @see Factory + * * @mixin TranslatorContract */ class Translator extends Facade