Skip to content
This repository was archived by the owner on Jan 4, 2022. It is now read-only.

Commit c6c40aa

Browse files
localheinzlocalheinz
authored
Merge pull request #156 from ergebnis/feature/synchronize
Enhancement: Synchronize with ergebnis/php-library-template
2 parents caf0682 + 4ea0c36 commit c6c40aa

File tree

5 files changed

+66
-67
lines changed

5 files changed

+66
-67
lines changed

‎.dependabot/config.yml

+1-17
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,6 @@ update_configs:
1010
default_reviewers:
1111
- "localheinz"
1212
directory: "/"
13-
package_manager: "github_actions"
14-
update_schedule: "daily"
15-
16-
- automerged_updates:
17-
- match:
18-
dependency_type: "development"
19-
default_assignees:
20-
- "localheinz"
21-
default_labels:
22-
- "dependency"
23-
default_reviewers:
24-
- "localheinz"
25-
directory: "/"
26-
ignored_updates:
27-
- match:
28-
dependency_name: "phpunit/phpunit"
2913
package_manager: "php:composer"
30-
update_schedule: "daily"
14+
update_schedule: "live"
3115
version_requirement_updates: "increase_versions"

‎.github/settings.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ branches:
1010
required_approving_review_count: 1
1111
required_status_checks:
1212
contexts:
13-
- "Coding Standards (7.1)"
14-
- "Dependency Analysis (7.4)"
15-
- "Static Code Analysis (7.4)"
13+
- "Coding Standards (7.1, locked)"
14+
- "Dependency Analysis (7.4, locked)"
15+
- "Static Code Analysis (7.4, locked)"
1616
- "Tests (7.1, lowest)"
1717
- "Tests (7.1, locked)"
1818
- "Tests (7.1, highest)"
@@ -25,8 +25,8 @@ branches:
2525
- "Tests (7.4, lowest)"
2626
- "Tests (7.4, locked)"
2727
- "Tests (7.4, highest)"
28-
- "Code Coverage (7.4)"
29-
- "Mutation Tests (7.4)"
28+
- "Code Coverage (7.4, locked)"
29+
- "Mutation Tests (7.4, locked)"
3030
- "codecov/patch"
3131
- "codecov/project"
3232
strict: false

‎.github/workflows/continuous-integration.yml

+57-42
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,49 @@ jobs:
2121
php-version:
2222
- 7.1
2323

24+
dependencies:
25+
- locked
26+
2427
steps:
2528
- name: "Checkout"
26-
uses: actions/checkout@v1
29+
uses: actions/checkout@v2.0.0
2730

2831
- name: "Install PHP with extensions"
29-
uses: shivammathur/setup-php@v1
32+
uses: shivammathur/setup-php@1.6.1
3033
with:
3134
coverage: none
32-
extension-csv: "mbstring"
35+
extensions: "mbstring"
3336
php-version: ${{ matrix.php-version }}
3437

3538
- name: "Validate composer.json and composer.lock"
3639
run: composer validate --strict
3740

3841
- name: "Cache dependencies installed with composer"
39-
uses: actions/cache@v1
42+
uses: actions/cache@v1.0.3
4043
with:
4144
path: ~/.composer/cache
42-
key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
45+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
4346
restore-keys: |
44-
php${{ matrix.php-version }}-composer-locked-
47+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
4548
4649
- name: "Install locked dependencies with composer"
4750
run: composer install --no-interaction --no-progress --no-suggest
4851

49-
- name: "Run localheinz/composer-normalize"
52+
- name: "Run ergebnis/composer-normalize"
5053
run: composer normalize --dry-run
5154

5255
- name: "Create cache directory for friendsofphp/php-cs-fixer"
5356
run: mkdir -p .build/php-cs-fixer
5457

5558
- name: "Cache cache directory for friendsofphp/php-cs-fixer"
56-
uses: actions/cache@v1
59+
uses: actions/cache@v1.0.3
5760
with:
5861
path: .build/php-cs-fixer
59-
key: php${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('**/composer.lock') }}
62+
key: php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('**/composer.lock') }}
6063
restore-keys: |
61-
php${{ matrix.php-version }}-php-cs-fixer-
64+
php-${{ matrix.php-version }}-php-cs-fixer-
6265
63-
- name: "Run friendsofphp/php-cs-fixer for source"
66+
- name: "Run friendsofphp/php-cs-fixer"
6467
run: vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --dry-run --verbose
6568

6669
- name: "Run friendsofphp/php-cs-fixer for test fixtures"
@@ -76,32 +79,35 @@ jobs:
7679
php-version:
7780
- 7.4
7881

82+
dependencies:
83+
- locked
84+
7985
steps:
8086
- name: "Checkout"
81-
uses: actions/checkout@v1
87+
uses: actions/checkout@v2.0.0
8288

8389
- name: "Install PHP with extensions"
84-
uses: shivammathur/setup-php@v1
90+
uses: shivammathur/setup-php@1.6.1
8591
with:
8692
coverage: none
87-
extension-csv: "mbstring"
93+
extensions: "mbstring"
8894
php-version: ${{ matrix.php-version }}
8995

9096
- name: "Cache dependencies installed with composer"
91-
uses: actions/cache@v1
97+
uses: actions/cache@v1.0.3
9298
with:
9399
path: ~/.composer/cache
94-
key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
100+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
95101
restore-keys: |
96-
php${{ matrix.php-version }}-composer-locked-
102+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
97103
98104
- name: "Install locked dependencies with composer"
99105
run: composer install --no-interaction --no-progress --no-suggest
100106

101107
- name: "Run maglnet/composer-require-checker"
102-
uses: docker://localheinz/composer-require-checker-action:1.1.1
108+
uses: docker://webfactory/composer-require-checker:2.0.0
103109
with:
104-
args: --config-file=composer-require-checker.json
110+
args: check --config-file=composer-require-checker.json
105111

106112
static-code-analysis:
107113
name: "Static Code Analysis"
@@ -113,19 +119,22 @@ jobs:
113119
php-version:
114120
- 7.4
115121

122+
dependencies:
123+
- locked
124+
116125
steps:
117126
- name: "Checkout"
118-
uses: actions/checkout@v1
127+
uses: actions/checkout@v2.0.0
119128

120129
- name: "Install PHP with extensions"
121-
uses: shivammathur/setup-php@v1
130+
uses: shivammathur/setup-php@1.6.1
122131
with:
123132
coverage: none
124-
extension-csv: "mbstring"
133+
extensions: "mbstring"
125134
php-version: ${{ matrix.php-version }}
126135

127136
- name: "Cache dependencies installed with composer"
128-
uses: actions/cache@v1
137+
uses: actions/cache@v1.0.3
129138
with:
130139
path: ~/.composer/cache
131140
key: ${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
@@ -158,22 +167,22 @@ jobs:
158167

159168
steps:
160169
- name: "Checkout"
161-
uses: actions/checkout@v1
170+
uses: actions/checkout@v2.0.0
162171

163172
- name: "Install PHP with extensions"
164-
uses: shivammathur/setup-php@v1
173+
uses: shivammathur/setup-php@1.6.1
165174
with:
166175
coverage: none
167-
extension-csv: "mbstring"
176+
extensions: "mbstring"
168177
php-version: ${{ matrix.php-version }}
169178

170179
- name: "Cache dependencies installed with composer"
171-
uses: actions/cache@v1
180+
uses: actions/cache@v1.0.3
172181
with:
173182
path: ~/.composer/cache
174-
key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
183+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
175184
restore-keys: |
176-
php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
185+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
177186
178187
- name: "Install lowest dependencies with composer"
179188
if: matrix.dependencies == 'lowest'
@@ -206,24 +215,27 @@ jobs:
206215
php-version:
207216
- 7.4
208217

218+
dependencies:
219+
- locked
220+
209221
steps:
210222
- name: "Checkout"
211-
uses: actions/checkout@v1
223+
uses: actions/checkout@v2.0.0
212224

213225
- name: "Install PHP with extensions"
214-
uses: shivammathur/setup-php@v1
226+
uses: shivammathur/setup-php@1.6.1
215227
with:
216228
coverage: xdebug
217-
extension-csv: "mbstring"
229+
extensions: "mbstring"
218230
php-version: ${{ matrix.php-version }}
219231

220232
- name: "Cache dependencies installed with composer"
221-
uses: actions/cache@v1
233+
uses: actions/cache@v1.0.3
222234
with:
223235
path: ~/.composer/cache
224-
key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
236+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
225237
restore-keys: |
226-
php${{ matrix.php-version }}-composer-locked-
238+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
227239
228240
- name: "Install locked dependencies with composer"
229241
run: composer install --no-interaction --no-progress --no-suggest
@@ -249,27 +261,30 @@ jobs:
249261
php-version:
250262
- 7.4
251263

264+
dependencies:
265+
- locked
266+
252267
steps:
253268
- name: "Checkout"
254-
uses: actions/checkout@v1
269+
uses: actions/checkout@v2.0.0
255270

256271
- name: "Install PHP with extensions"
257-
uses: shivammathur/setup-php@v1
272+
uses: shivammathur/setup-php@1.6.1
258273
with:
259274
coverage: xdebug
260-
extension-csv: "mbstring"
275+
extensions: "mbstring"
261276
php-version: ${{ matrix.php-version }}
262277

263278
- name: "Cache dependencies installed with composer"
264-
uses: actions/cache@v1
279+
uses: actions/cache@v1.0.3
265280
with:
266281
path: ~/.composer/cache
267-
key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
282+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
268283
restore-keys: |
269-
php${{ matrix.php-version }}-composer-locked-
284+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
270285
271286
- name: "Install locked dependencies with composer"
272287
run: composer install --no-interaction --no-progress --no-suggest
273288

274-
- name: "Run mutation tests with infection/infection"
289+
- name: "Run mutation tests with Xdebug and infection/infection"
275290
run: vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=95 --min-msi=95

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ coding-standards: vendor ## Fixes code style issues with friendsofphp/php-cs-fix
1515

1616
.PHONY: dependency-analysis
1717
dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
18-
docker run --interactive --rm --tty --workdir=/app --volume ${PWD}:/app localheinz/composer-require-checker-action:1.1.1 --config-file=composer-require-checker.json
18+
docker run --interactive --rm --tty --volume ${PWD}:/app webfactory/composer-require-checker:2.0.0 check --config-file=composer-require-checker.json
1919

2020
.PHONY: help
2121
help: ## Displays this list of targets with descriptions

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ Please have a look at [`CHANGELOG.md`](CHANGELOG.md).
9696

9797
## Contributing
9898

99-
Please have a look at [`CODE_OF_CONDUCT.md`](https://github.com/ergebnis/.github/blob/master/CODE_OF_CONDUCT.md).
99+
Please have a look at [`CONTRIBUTING.md`](.github/CONTRIBUTING.md).
100100

101101
## Code of Conduct
102102

103-
Please have a look at [`CODE_OF_CONDUCT.md`](.github/CODE_OF_CONDUCT.md).
103+
Please have a look at [`CODE_OF_CONDUCT.md`](https://github.com/ergebnis/.github/blob/master/CODE_OF_CONDUCT.md).
104104

105105
## License
106106

0 commit comments

Comments
 (0)