Skip to content

Commit

Permalink
Preparing for PHP 8.2 (#250
Browse files Browse the repository at this point in the history
* Preparing for PHP 8.2

* final deps

* fixing build.yml

* removing cache and adding gitignore
  • Loading branch information
jaydiablo committed Apr 21, 2023
1 parent 4936cb0 commit a771bbe
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 39 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Expand Up @@ -13,21 +13,21 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2']
composer-args: ['', '--prefer-lowest']
runs-on: ${{ matrix.operating-system }}
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup PHP
uses: shivammathur/setup-php@2.19.1
uses: shivammathur/setup-php@2.24.0
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring
tools: cs2pr
- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache dependencies
uses: actions/cache@v3
with:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
@@ -0,0 +1,22 @@
name: Dependabot auto-merge
on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
32 changes: 0 additions & 32 deletions .github/workflows/merge-me.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,4 +2,5 @@
/composer.lock
/clover.xml
.php_cs.cache
.php-cs-fixer.cache
.phpunit.result.cache
1 change: 0 additions & 1 deletion .php-cs-fixer.cache

This file was deleted.

11 changes: 8 additions & 3 deletions composer.json
Expand Up @@ -10,7 +10,7 @@
"license": "BSD-3-Clause",
"prefer-stable": true,
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
"diablomedia/zendframework1-ldap": "^1.0.0",
"diablomedia/zendframework1-validate": "^1.0.0"
},
Expand All @@ -20,13 +20,18 @@
}
},
"require-dev": {
"phpstan/phpstan": "1.8.0",
"friendsofphp/php-cs-fixer": "3.8.0",
"phpstan/phpstan": "1.10.13",
"friendsofphp/php-cs-fixer": "3.16.0",
"maglnet/composer-require-checker": "^3.0.0",
"phpro/grumphp-shim": "^1.5.0"
},
"scripts": {
"phpstan": "phpstan analyze -c phpstan.neon --no-progress --ansi",
"style-check": "php-cs-fixer fix --dry-run -vv"
},
"config": {
"allow-plugins": {
"phpro/grumphp-shim": true
}
}
}

0 comments on commit a771bbe

Please sign in to comment.