Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/7.2.x' into 7.1.x-merge-up-into-…
Browse files Browse the repository at this point in the history
…7.2.x_RgT4Fg51
  • Loading branch information
lcobucci committed Apr 3, 2023
2 parents ebec70f + f260e88 commit aaefab9
Show file tree
Hide file tree
Showing 14 changed files with 942 additions and 1,110 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
/composer.lock export-ignore
/mkdocs.yml export-ignore
/Makefile export-ignore
/composer-unused.php export-ignore
6 changes: 3 additions & 3 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.15.0"
uses: "shivammathur/setup-php@2.16.0"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
Expand All @@ -36,7 +36,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/[email protected].6"
uses: "actions/[email protected].7"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/composer-json-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.15.0"
uses: "shivammathur/setup-php@2.16.0"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
Expand All @@ -36,7 +36,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/[email protected].6"
uses: "actions/[email protected].7"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Merge me!
uses: ridedott/[email protected].42
uses: ridedott/[email protected].102
with:
# Depending on branch protection rules, a manually populated
# `GITHUB_TOKEN_WORKAROUND` environment variable with permissions to
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mutation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.15.0"
uses: "shivammathur/setup-php@2.16.0"
with:
coverage: "xdebug"
php-version: "${{ matrix.php-version }}"
Expand All @@ -36,7 +36,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/[email protected].6"
uses: "actions/[email protected].7"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ jobs:
- "development"
php-version:
- "8.0"
- "8.1"
operating-system:
- "ubuntu-latest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.15.0"
uses: "shivammathur/setup-php@2.16.0"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
Expand All @@ -39,7 +40,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/[email protected].6"
uses: "actions/[email protected].7"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down Expand Up @@ -74,16 +75,16 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.1"
- "8.2"
operating-system:
- "ubuntu-latest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.15.0"
uses: "shivammathur/setup-php@2.16.0"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
Expand All @@ -95,7 +96,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/[email protected].6"
uses: "actions/[email protected].7"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Release"
uses: "laminas/automatic-releases@1.12.2"
uses: "laminas/automatic-releases@1.13.0"
with:
command-name: "laminas:automatic-releases:release"
env:
Expand All @@ -28,7 +28,7 @@ jobs:
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Create Merge-Up Pull Request"
uses: "laminas/automatic-releases@1.12.2"
uses: "laminas/automatic-releases@1.13.0"
with:
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
env:
Expand All @@ -39,7 +39,7 @@ jobs:
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Create and/or Switch to new Release Branch"
uses: "laminas/automatic-releases@1.12.2"
uses: "laminas/automatic-releases@1.13.0"
with:
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
env:
Expand All @@ -50,7 +50,7 @@ jobs:
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Bump Changelog Version On Originating Release Branch"
uses: "laminas/automatic-releases@1.12.2"
uses: "laminas/automatic-releases@1.13.0"
with:
command-name: "laminas:automatic-releases:bump-changelog"
env:
Expand All @@ -61,7 +61,7 @@ jobs:
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Create new milestones"
uses: "laminas/automatic-releases@1.12.2"
uses: "laminas/automatic-releases@1.13.0"
with:
command-name: "laminas:automatic-releases:create-milestones"
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.4"
uses: "actions/checkout@v2.4.0"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.15.0"
uses: "shivammathur/setup-php@2.16.0"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
Expand All @@ -36,7 +36,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/[email protected].6"
uses: "actions/[email protected].7"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vendor/composer/installed.json: composer.json composer.lock

.PHONY: phpunit
phpunit:
@vendor/bin/phpunit
@php -dzend.assertions=1 vendor/bin/phpunit

.PHONY: infection
infection:
Expand Down
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
"homepage": "https://github.com/lcobucci/di-builder",
"require": {
"php": "^8.0",
"symfony/config": "^5.3",
"symfony/dependency-injection": "^5.3",
"symfony/expression-language": "^5.3"
"symfony/config": "^6.0",
"symfony/dependency-injection": "^6.0",
"symfony/expression-language": "^6.0"
},
"require-dev": {
"infection/infection": "^0.25",
"infection/infection": "^0.26",
"lcobucci/coding-standard": "^8.0",
"mikey179/vfsstream": "^1.6.10",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpstan/phpstan": "^1.4",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.6",
"symfony/proxy-manager-bridge": "^5.3",
"symfony/yaml": "^5.3"
"symfony/proxy-manager-bridge": "^6.0",
"symfony/yaml": "^6.0"
},
"replace": {
"symfony/polyfill-php71": "*",
Expand Down
Loading

0 comments on commit aaefab9

Please sign in to comment.