Skip to content

Commit c867c60

Browse files
gsteelgsteel
authored
Merge pull request #18 from gsteel/cleanup
General QA and Cleanup
2 parents 927d943 + ba67078 commit c867c60

25 files changed

+3468
-1124
lines changed

‎.coveralls.yml

-2
This file was deleted.

‎.gitattributes

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
/.coveralls.yml export-ignore
21
/.gitattributes export-ignore
32
/.github/ export-ignore
43
/.gitignore export-ignore
5-
/.travis.yml export-ignore
64
/docs/ export-ignore
75
/mkdocs.yml export-ignore
86
/phpcs.xml export-ignore
97
/phpunit.xml.dist export-ignore
108
/test/ export-ignore
9+
/renovate.json
10+
/.laminas-ci.json
11+
/psalm.xml
12+
/psalm-baseline.xml

‎.github/workflows/auto-close.yml

-22
This file was deleted.

‎.github/workflows/continuous-integration.yml

+2-24
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,8 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- '[0-9]+.[0-9]+.x'
8-
- 'refs/pull/*'
97
tags:
108

119
jobs:
12-
matrix:
13-
name: Generate job matrix
14-
runs-on: ubuntu-latest
15-
outputs:
16-
matrix: ${{ steps.matrix.outputs.matrix }}
17-
steps:
18-
- name: Gather CI configuration
19-
id: matrix
20-
uses: laminas/laminas-ci-matrix-action@v1
21-
22-
qa:
23-
name: QA Checks
24-
needs: [matrix]
25-
runs-on: ${{ matrix.operatingSystem }}
26-
strategy:
27-
fail-fast: false
28-
matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
29-
steps:
30-
- name: ${{ matrix.name }}
31-
uses: laminas/laminas-continuous-integration-action@v1
32-
with:
33-
job: ${{ matrix.job }}
10+
ci:
11+
uses: laminas/workflow-continuous-integration/.github/workflows/continuous-integration.yml@1.x

‎.github/workflows/docs-build.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: docs-build
33
on:
44
release:
55
types: [published]
6-
repository_dispatch:
7-
types: docs-build
6+
workflow_dispatch:
87

98
jobs:
109
build-deploy:
@@ -13,4 +12,4 @@ jobs:
1312
- name: Build Docs
1413
uses: laminas/documentation-theme/github-actions/docs@master
1514
env:
16-
DOCS_DEPLOY_KEY: ${{ secrets.DOCS_DEPLOY_KEY }}
15+
DEPLOY_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-on-milestone-closed.yml

+6-62
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Alternate workflow example.
2-
# This one is identical to the one in release-on-milestone.yml, with one change:
3-
# the Release step uses the ORGANIZATION_ADMIN_TOKEN instead, to allow it to
4-
# trigger a release workflow event. This is useful if you have other actions
5-
# that intercept that event.
6-
71
name: "Automatic Releases"
82

93
on:
@@ -13,59 +7,9 @@ on:
137

148
jobs:
159
release:
16-
name: "GIT tag, release & create merge-up PR"
17-
runs-on: ubuntu-latest
18-
19-
steps:
20-
- name: "Checkout"
21-
uses: "actions/checkout@v2"
22-
23-
- name: "Release"
24-
uses: "laminas/automatic-releases@v1"
25-
with:
26-
command-name: "laminas:automatic-releases:release"
27-
env:
28-
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
29-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
30-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
31-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
32-
33-
- name: "Create Merge-Up Pull Request"
34-
uses: "laminas/automatic-releases@v1"
35-
with:
36-
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
37-
env:
38-
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
39-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
40-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
41-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
42-
43-
- name: "Create and/or Switch to new Release Branch"
44-
uses: "laminas/automatic-releases@v1"
45-
with:
46-
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
47-
env:
48-
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
49-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
50-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
51-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
52-
53-
- name: "Bump Changelog Version On Originating Release Branch"
54-
uses: "laminas/automatic-releases@v1"
55-
with:
56-
command-name: "laminas:automatic-releases:bump-changelog"
57-
env:
58-
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
59-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
60-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
61-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
62-
63-
- name: "Create new milestones"
64-
uses: "laminas/automatic-releases@v1"
65-
with:
66-
command-name: "laminas:automatic-releases:create-milestones"
67-
env:
68-
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
69-
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
70-
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
71-
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
10+
uses: laminas/workflow-automatic-releases/.github/workflows/release-on-milestone-closed.yml@1.x
11+
secrets:
12+
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
13+
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
14+
ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
15+
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}

‎.laminas-ci.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"ignore_php_platform_requirements": {
3+
"8.4": true
4+
},
5+
"backwardCompatibilityCheck": true
6+
}

‎composer.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
"laminas/laminas-stdlib": "^3.6"
3131
},
3232
"require-dev": {
33-
"laminas/laminas-coding-standard": "~2.3",
34-
"laminas/laminas-servicemanager": "^3.21.0",
35-
"phpunit/phpunit": "^10.5"
33+
"laminas/laminas-coding-standard": "^3.0.1",
34+
"laminas/laminas-servicemanager": "^3.23.0",
35+
"phpunit/phpunit": "^10.5.38",
36+
"psalm/plugin-phpunit": "^0.19.0",
37+
"vimeo/psalm": "^5.26.1"
3638
},
3739
"suggest": {
3840
"laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
@@ -55,7 +57,8 @@
5557
"cs-check": "phpcs",
5658
"cs-fix": "phpcbf",
5759
"test": "phpunit --colors=always",
58-
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
60+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
61+
"static-analysis": "psalm --shepherd --stats"
5962
},
6063
"conflict": {
6164
"zendframework/zend-tag": "*"

0 commit comments

Comments
 (0)