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 8665ee7..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 @@ -20,7 +20,7 @@ jobs: coverage: none - name: Install composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 - name: Run PHPStan run: composer test:types diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 784cfe4..7776a8f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,18 +15,20 @@ jobs: 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 10329b2..3d7279e 100644 --- a/composer.json +++ b/composer.json @@ -17,17 +17,17 @@ ], "require": { "php": "^8.2", - "spatie/laravel-package-tools": "^1.14.1", - "illuminate/contracts": "^10.0" + "spatie/laravel-package-tools": "^1.16", + "illuminate/contracts": "^10.0 || ^11.0" }, "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/phpstan-baseline.neon b/phpstan-baseline.neon index 614c412..cd827ed 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,5 +1,25 @@ parameters: ignoreErrors: + - + message: "#^Worksome\\\\Ceevee\\\\Facades\\\\Ceevee facade should not be used\\.$#" + count: 1 + path: src/Commands/ReadCommand.php + + - + message: "#^Worksome\\\\Ceevee\\\\Facades\\\\Ceevee facade should not be used\\.$#" + count: 1 + path: src/Facades/Ceevee.php + + - + message: "#^Parameter \\#1 \\$value of function intval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#" + count: 1 + path: src/Parsers/SovrenParser.php + + - + message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#" + count: 1 + path: src/Parsers/SovrenParser.php + - message: "#^Parameter \\#1 \\$value of function collect expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<\\(int\\|string\\), mixed\\>\\|iterable\\<\\(int\\|string\\), mixed\\>\\|null, mixed given\\.$#" count: 1 @@ -35,6 +55,11 @@ parameters: count: 1 path: src/Parsers/SovrenParser/EmploymentHistoryParser.php + - + message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#" + count: 1 + path: src/Parsers/SovrenParser/EmploymentHistoryParser.php + - message: "#^Unable to resolve the template type TKey in call to function collect$#" count: 1 @@ -61,7 +86,7 @@ parameters: path: src/Parsers/SovrenParser/LanguageParser.php - - message: "#^Method Worksome\\\\Ceevee\\\\Parsers\\\\SovrenParser\\\\LinksParser\\:\\:__invoke\\(\\) should return array\\ but returns array\\.$#" + message: "#^Method Worksome\\\\Ceevee\\\\Parsers\\\\SovrenParser\\\\LinksParser\\:\\:__invoke\\(\\) should return array\\ but returns array\\\\.$#" count: 1 path: src/Parsers/SovrenParser/LinksParser.php @@ -76,7 +101,7 @@ parameters: path: src/Parsers/SovrenParser/LinksParser.php - - message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:filter\\(\\) expects \\(callable\\(mixed, \\(int\\|string\\)\\)\\: bool\\)\\|null, Closure\\(array\\)\\: bool given\\.$#" + message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:filter\\(\\) expects \\(callable\\(mixed, int\\|string\\)\\: bool\\)\\|null, Closure\\(array\\)\\: bool given\\.$#" count: 1 path: src/Parsers/SovrenParser/LinksParser.php