Skip to content

Commit

Permalink
Merge branch 'release/2.0.0-rc1'
Browse files Browse the repository at this point in the history
  • Loading branch information
TravisCarden committed Apr 17, 2024
2 parents e687ed9 + 6a55a6f commit eaba6e5
Show file tree
Hide file tree
Showing 36 changed files with 655 additions and 572 deletions.
9 changes: 6 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ updates:
patterns:
- "*"
ignore:
# @see https://github.com/slevomat/coding-standard/issues/1632 Irresolvable conflict between DocCommentSpacing rules since 8.14.0
- dependency-name: "slevomat/coding-standard"
versions: [ "8.14.0", "8.14.1" ]
- dependency-name: "phpunit/phpunit"
versions: [ "10.x", "11.x" ]
- dependency-name: "symfony/filesystem"
versions: [ "6.x" ]
- dependency-name: "symfony/process"
versions: [ "6.x" ]

- package-ecosystem: "github-actions"
directory: "/"
Expand Down
50 changes: 36 additions & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Main
on:
push:
branches: [ main, develop, wip ]
# As of September 19, 2023, these branches-ignore patterns don't work due to
# As of September 19, 2023, these paths-ignore patterns don't work due to
# a bug in GitHub Actions See https://github.com/actions/runner/issues/2324
# Ditto below.
paths-ignore:
Expand Down Expand Up @@ -41,34 +41,34 @@ jobs:
run: "composer static"

tests:
name: "Test: ${{ matrix.os }} / ${{ matrix.php }} / ${{ matrix.dependencies }}"
name: "Tests: ${{ matrix.os }} / ${{ matrix.php }} / ${{ matrix.dependencies }}${{ matrix.os == 'ubuntu' && matrix.dependencies == 'high' && matrix.php == '8.3' && ' w/ coverage' || '' }}"
runs-on: "${{ matrix.os }}-latest"
strategy:
fail-fast: false
matrix:
os: [ ubuntu, macos, windows ]
php: [ "8.1", "8.2" ]
dependencies: [ lowest, highest ]
php: [ "8.1", "8.2", "8.3" ]
dependencies: [ low, high ]
steps:
- name: "Install rsync"
uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync

- name: "Set up PHP w/ Coverage"
if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'highest' }}
if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'high' && matrix.php == '8.3' }}
uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
with:
php-version: "${{ matrix.php }}"
extensions: gd
ini-values: assert.active=1, assert.exception=1, zend.assertions=1
ini-values: zend.assertions=1

- name: "Set up PHP w/o Coverage"
if: ${{ !( matrix.os == 'ubuntu' && matrix.dependencies == 'highest' ) }}
if: ${{ !( matrix.os == 'ubuntu' && matrix.dependencies == 'high' && matrix.php == '8.3' ) }}
uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
with:
php-version: "${{ matrix.php }}"
coverage: none
extensions: gd
ini-values: assert.active=1, assert.exception=1, zend.assertions=1
ini-values: zend.assertions=1

- name: "Debugging info"
run: |
Expand All @@ -81,19 +81,19 @@ jobs:
- name: "Install dependencies"
uses: ramsey/composer-install@v3 # https://github.com/marketplace/actions/install-composer-dependencies
with:
dependency-versions: "${{ matrix.dependencies }}"
dependency-versions: "${{ matrix.dependencies }}est"

- name: "Run core tests with coverage"
run: "composer test"
if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'highest' }}
if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'high' && matrix.php == '8.3' }}

# There's no reason to generate coverage data on multiple jobs--the result should be the same.
- name: "Run core tests without coverage"
run: "./vendor/bin/phpunit --no-coverage --exclude-group=windows_only"
if: ${{ runner.os != 'Windows' && !( matrix.os == 'ubuntu' && matrix.dependencies == 'highest' ) }}
run: "./vendor/bin/phpunit --no-coverage --testsuite=all --exclude-group=windows_only"
if: ${{ runner.os != 'Windows' && !( matrix.os == 'ubuntu' && matrix.dependencies == 'high' && matrix.php == '8.3' ) }}

- name: "Run Windows tests"
run: "./vendor/bin/phpunit --no-coverage --exclude-group=no_windows"
run: "./vendor/bin/phpunit --no-coverage --testsuite=all --exclude-group=no_windows"
if: ${{ runner.os == 'Windows' }}

performance:
Expand Down Expand Up @@ -122,6 +122,28 @@ jobs:
- name: "Run performance tests"
run: "composer phpbench -- --progress=plain --ansi"

compatability:
name: "Compatability"
runs-on: ubuntu-latest
steps:
- name: "Install rsync"
uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync

- name: "Set up PHP"
uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
with:
php-version: "8.3"
coverage: none

- name: "Checkout code"
uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout

- name: "Install dependencies"
uses: ramsey/composer-install@v3 # https://github.com/marketplace/actions/install-composer-dependencies

- name: "Run compatability tests"
run: "composer compatability"

mutation:
name: "Mutation"
runs-on: ubuntu-latest
Expand All @@ -131,7 +153,7 @@ jobs:
with:
php-version: "8.2"
extensions: gd
ini-values: assert.active=1, assert.exception=1, zend.assertions=1
ini-values: zend.assertions=1

- name: "Checkout code"
uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
php: [ "8.1" ]
php: [ "8.2" ]
steps:
- name: "Install rsync"
uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync

- name: "Set up PHP"
uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
with:
php-version: "8.1"
php-version: "8.2"
coverage: none

- name: "Checkout code"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: "Set up PHP"
uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
with:
php-version: "8.1"
php-version: "8.2"

- name: "Checkout code"
uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
Expand Down
2 changes: 1 addition & 1 deletion .idea/runConfigurations/All_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Fast_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_template__of_PHPUnit.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
"infection/infection": "^0.27.0",
"infection/infection": "^0.27.0 || ^0.28.0",
"phpbench/phpbench": "^1.2",
"phpro/grumphp-shim": "^2.0",
"phpspec/prophecy": "^1.17",
Expand Down Expand Up @@ -91,7 +91,7 @@
"rm -r var/*/* &> /dev/null || true",
"git checkout -- var"
],
"compatability": "phpunit -- tests/Compatability",
"compatability": "phpunit --testsuite=compatability",
"dox": "phpunit --testdox --color=always --exclude-group=windows_only",
"fast": "phpunit --exclude-group=slow,windows_only",
"functional": "phpunit --testsuite=functional --exclude-group=windows_only",
Expand Down
Loading

0 comments on commit eaba6e5

Please sign in to comment.