Skip to content

Commit

Permalink
Merge pull request #104 from Roave/feature/96-require-php-8
Browse files Browse the repository at this point in the history
Require PHP 8, upgrade dependencies
  • Loading branch information
Ocramius committed Jan 20, 2021
2 parents cd96001 + b72b471 commit fbc2a8c
Show file tree
Hide file tree
Showing 11 changed files with 174 additions and 145 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutation-tests.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/phpunit.yml
Expand Up @@ -17,7 +17,6 @@ jobs:
- "highest"
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"
Expand Down Expand Up @@ -47,15 +46,15 @@ jobs:

- name: "Install lowest dependencies"
if: ${{ matrix.dependencies == 'lowest' }}
run: "composer update --prefer-lowest --no-interaction --no-progress --ignore-platform-req=php"
run: "composer update --prefer-lowest --no-interaction --no-progress"

- name: "Install highest dependencies"
if: ${{ matrix.dependencies == 'highest' }}
run: "composer update --no-interaction --no-progress --ignore-platform-req=php"
run: "composer update --no-interaction --no-progress"

- name: "Install locked dependencies"
if: ${{ matrix.dependencies == 'locked' }}
run: "composer install --no-interaction --no-progress --ignore-platform-req=php"
run: "composer install --no-interaction --no-progress"

- name: "Checkout current HEAD as a named ref"
run: "git checkout -b ci-run-branch"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-example.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
- "highest"
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Expand Up @@ -10,17 +10,17 @@
}
],
"require": {
"php": "^7.4.7 || ~8.0.0",
"php": "~8.0.0",
"ext-json": "*",
"composer-plugin-api": "^2.0.0",
"ocramius/package-versions": "^2.1.0",
"vimeo/psalm": "^4.3.2"
"ocramius/package-versions": "^2.3.0",
"vimeo/psalm": "^4.4.1"
},
"require-dev": {
"composer/composer": "^2.0.8@alpha",
"composer/composer": "^2.0.8",
"doctrine/coding-standard": "^8.2.0",
"infection/infection": "^0.20.2",
"phpunit/phpunit": "^9.5.0",
"phpunit/phpunit": "^9.5.1",
"symfony/process": "^5.2.1"
},
"autoload": {
Expand Down

0 comments on commit fbc2a8c

Please sign in to comment.