-
-
Notifications
You must be signed in to change notification settings - Fork 592
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '4.1.x' into 4.0.x-merge-up-into-4.1.x_605a7ef3683fb4.94…
…092104
- Loading branch information
Showing
53 changed files
with
2,283 additions
and
847 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| /docs export-ignore | ||
| /test export-ignore | ||
| /.gitattributes export-ignore | ||
| /.github export-ignore | ||
| /.gitignore export-ignore | ||
| /*.yml export-ignore | ||
| /CONTRIBUTING.md export-ignore | ||
| /*.dist export-ignore | ||
| /phpbench.json export-ignore | ||
| /composer.lock export-ignore | ||
| /README.md export-ignore | ||
| /Makefile export-ignore | ||
| /docs export-ignore | ||
| /test export-ignore | ||
| /.gitattributes export-ignore | ||
| /.github export-ignore | ||
| /.gitignore export-ignore | ||
| /*.yml export-ignore | ||
| /CONTRIBUTING.md export-ignore | ||
| /*.dist export-ignore | ||
| /phpbench.json export-ignore | ||
| /composer.lock export-ignore | ||
| /README.md export-ignore | ||
| /Makefile export-ignore | ||
| /composer-require-checker.json export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| name: "Lint composer.json" | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
|
|
||
| jobs: | ||
| coding-standards: | ||
| name: "Lint composer.json" | ||
|
|
||
| runs-on: ${{ matrix.operating-system }} | ||
|
|
||
| strategy: | ||
| matrix: | ||
| dependencies: | ||
| - "highest" | ||
| php-version: | ||
| - "7.4" | ||
| operating-system: | ||
| - "ubuntu-latest" | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v2" | ||
|
|
||
| - name: "Install PHP" | ||
| uses: "shivammathur/setup-php@v2" | ||
| with: | ||
| coverage: "none" | ||
| php-version: "${{ matrix.php-version }}" | ||
| ini-values: memory_limit=-1 | ||
| tools: composer:v2, composer-normalize, composer-require-checker, composer-unused | ||
|
|
||
| - name: Get composer cache directory | ||
| id: composer-cache | ||
| run: echo "::set-output name=dir::$(composer config cache-files-dir)" | ||
|
|
||
| - name: "Cache dependencies" | ||
| uses: "actions/cache@v2" | ||
| with: | ||
| path: ${{ steps.composer-cache.outputs.dir }} | ||
| key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}" | ||
| restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-" | ||
|
|
||
| - name: "Install lowest dependencies" | ||
| if: ${{ matrix.dependencies == 'lowest' }} | ||
| run: "composer update --prefer-lowest --no-interaction --no-progress" | ||
|
|
||
| - name: "Install highest dependencies" | ||
| if: ${{ matrix.dependencies == 'highest' }} | ||
| run: "composer update --no-interaction --no-progress" | ||
|
|
||
| - name: "Install locked dependencies" | ||
| if: ${{ matrix.dependencies == 'locked' }} | ||
| run: "composer install --no-interaction --no-progress" | ||
|
|
||
| - name: "Validate composer.json" | ||
| run: "composer validate --strict" | ||
|
|
||
| - name: "Normalize composer.json" | ||
| run: "composer-normalize --dry-run" | ||
|
|
||
| - name: "Check composer.json explicit dependencies" | ||
| run: "composer-require-checker check --config-file=$(realpath composer-require-checker.json)" | ||
|
|
||
| - name: "Check composer.json unused dependencies" | ||
| run: "composer-unused" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # https://help.github.com/en/categories/automating-your-workflow-with-github-actions | ||
|
|
||
| name: "Automatic Releases" | ||
|
|
||
| on: | ||
| milestone: | ||
| types: | ||
| - "closed" | ||
|
|
||
| jobs: | ||
| release: | ||
| name: "GIT tag, release & create merge-up PR" | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v2" | ||
|
|
||
| - name: "Release" | ||
| uses: "laminas/automatic-releases@v1" | ||
| with: | ||
| command-name: "laminas:automatic-releases:release" | ||
| env: | ||
| "SHELL_VERBOSITY": "3" | ||
| "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }} | ||
| "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }} | ||
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| - name: "Create Merge-Up Pull Request" | ||
| uses: "laminas/automatic-releases@v1" | ||
| with: | ||
| command-name: "laminas:automatic-releases:create-merge-up-pull-request" | ||
| env: | ||
| "SHELL_VERBOSITY": "3" | ||
| "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }} | ||
| "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }} | ||
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| - name: "Create and/or Switch to new Release Branch" | ||
| uses: "laminas/automatic-releases@v1" | ||
| with: | ||
| command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor" | ||
| env: | ||
| "SHELL_VERBOSITY": "3" | ||
| "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }} | ||
| "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }} | ||
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| - name: "Bump Changelog Version On Originating Release Branch" | ||
| uses: "laminas/automatic-releases@v1" | ||
| with: | ||
| command-name: "laminas:automatic-releases:bump-changelog" | ||
| env: | ||
| "SHELL_VERBOSITY": "3" | ||
| "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }} | ||
| "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }} | ||
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| - name: "Create new milestones" | ||
| uses: "laminas/automatic-releases@v1" | ||
| with: | ||
| command-name: "laminas:automatic-releases:create-milestones" | ||
| env: | ||
| "SHELL_VERBOSITY": "3" | ||
| "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }} | ||
| "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }} | ||
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "symbol-whitelist" : [ | ||
| "null", "true", "false", | ||
| "static", "self", "parent", | ||
| "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object", | ||
| "OpenSSLAsymmetricKey" | ||
| ] | ||
| } |
Oops, something went wrong.