Skip to content

Commit

Permalink
Merge pull request #396 from weaverryan/bump-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
greg0ire committed Sep 13, 2023
2 parents 1e3b85f + 384a8e1 commit d2c8c09
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 44 deletions.
36 changes: 1 addition & 35 deletions .github/workflows/continuous-integration.yml
Expand Up @@ -23,28 +23,15 @@ jobs:
strategy:
matrix:
php-version:
- "7.1"
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
dependencies:
- "highest"
stability:
- "stable"
extra_constraint:
- ""
include:
- dependencies: "lowest"
php-version: "7.1"
- dependencies: "highest"
extra_constraint: "symfony/lts:v3"
php-version: "7.3"
- dependencies: "highest"
stability: "dev"
php-version: "7.3"
php-version: "8.1"
- dependencies: "highest"
stability: "dev"
php-version: "8.2"
Expand All @@ -57,28 +44,15 @@ jobs:

- name: "Install PHP with PCOV"
uses: "shivammathur/setup-php@v2"
if: "${{ matrix.php-version != '7.1' }}"
with:
php-version: "${{ matrix.php-version }}"
coverage: "pcov"
ini-values: "zend.assertions=1"

- name: "Install PHP with XDebug"
uses: "shivammathur/setup-php@v2"
if: "${{ matrix.php-version == '7.1' }}"
with:
php-version: "${{ matrix.php-version }}"
coverage: "xdebug"
ini-values: "zend.assertions=1"

- name: "Use dev stability"
run: "composer config minimum-stability dev"
if: "${{ matrix.stability == 'dev' }}"

- name: "Add extra constraint"
run: "composer require --no-update ${{matrix.extra_constraint}}"
if: "${{ contains(matrix.extra_constraint, '/') }}"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
Expand All @@ -94,18 +68,10 @@ jobs:

- name: "Upload coverage file"
uses: "actions/upload-artifact@v3"
if: "${{ ! contains(matrix.extra_constraint, '/') }}"
with:
name: "phpunit-${{ matrix.dependencies }}-${{ matrix.stability }}-${{ matrix.php-version }}.coverage"
path: "coverage.xml"

- name: "Upload coverage file, sanitize the name"
uses: "actions/upload-artifact@v3"
if: "${{ contains(matrix.extra_constraint, '/') }}"
with:
name: "phpunit-symfony-lts-${{ matrix.php-version }}.coverage"
path: "coverage.xml"

upload_coverage:
name: "Upload coverage to Codecov"
runs-on: "ubuntu-22.04"
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Expand Up @@ -20,21 +20,21 @@
}
],
"require": {
"php": "^7.1 || ^8.0",
"php": "^8.1",
"doctrine/data-fixtures": "^1.3",
"doctrine/doctrine-bundle": "^1.11|^2.0",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/orm": "^2.6.0",
"doctrine/persistence": "^1.3.7|^2.0|^3.0",
"symfony/config": "^3.4|^4.3|^5.0|^6.0|^7.0",
"symfony/console": "^3.4|^4.3|^5.0|^6.0|^7.0",
"symfony/dependency-injection": "^3.4.47|^4.3|^5.0|^6.0|^7.0",
"symfony/doctrine-bridge": "^3.4|^4.1|^5.0|^6.0|^7.0",
"symfony/http-kernel": "^3.4|^4.3|^5.0|^6.0|^7.0"
"doctrine/persistence": "^2.0|^3.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/console": "^5.4|^6.0|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/doctrine-bridge": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
"phpstan/phpstan": "^1.4.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
"phpunit/phpunit": "^9.5.20",
"symfony/phpunit-bridge": "^6.0.8",
"vimeo/psalm": "^4.22"
},
Expand Down

0 comments on commit d2c8c09

Please sign in to comment.