Skip to content

Commit 40b8abd

Browse files
authored
Merge pull request #411 from ergebnis/feature/synchronize
Enhancement: Synchronize with `ergebnis/php-package-template`
2 parents a9639a6 + 7d88507 commit 40b8abd

File tree

7 files changed

+36
-27
lines changed

7 files changed

+36
-27
lines changed

.github/CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CONTRIBUTING
22

3-
We are using [GitHub Actions](https://github.com/features/actions) as a continuous integration system.
3+
We use [GitHub Actions](https://github.com/features/actions) as a continuous integration system.
44

55
For details, take a look at the following workflow configuration files:
66

@@ -12,9 +12,9 @@ For details, take a look at the following workflow configuration files:
1212

1313
## Coding Standards
1414

15-
We are using [`ergebnis/composer-normalize`](https://github.com/ergebnis/composer-normalize) to normalize `composer.json`.
15+
We use [`ergebnis/composer-normalize`](https://github.com/ergebnis/composer-normalize) to normalize `composer.json`.
1616

17-
We are using [`yamllint`](https://github.com/adrienverge/yamllint) to enforce coding standards in YAML files.
17+
We use [`yamllint`](https://github.com/adrienverge/yamllint) to enforce coding standards in YAML files.
1818

1919
If you do not have `yamllint` installed yet, run
2020

@@ -24,7 +24,7 @@ brew install yamllint
2424

2525
to install `yamllint`.
2626

27-
We are using [`friendsofphp/php-cs-fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to enforce coding standards in PHP files.
27+
We use [`friendsofphp/php-cs-fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to enforce coding standards in PHP files.
2828

2929
Run
3030

@@ -36,7 +36,7 @@ to automatically fix coding standard violations.
3636

3737
## Dependency Analysis
3838

39-
We are using [`maglnet/composer-require-checker`](https://github.com/maglnet/ComposerRequireChecker) to prevent the use of unknown symbols in production code.
39+
We use [`maglnet/composer-require-checker`](https://github.com/maglnet/ComposerRequireChecker) to prevent the use of unknown symbols in production code.
4040

4141
Run
4242

@@ -48,7 +48,7 @@ to run a dependency analysis.
4848

4949
## Refactoring
5050

51-
We are using [`rector/rector`](https://github.com/rectorphp/rector) to automatically refactor code.
51+
We use [`rector/rector`](https://github.com/rectorphp/rector) to automatically refactor code.
5252

5353
Run
5454

@@ -60,7 +60,7 @@ to automatically refactor code.
6060

6161
## Security Analysis
6262

63-
We are using [`composer`](https://github.com/composer/composer) to run a security analysis.
63+
We use [`composer`](https://github.com/composer/composer) to run a security analysis.
6464

6565
Run
6666

@@ -72,7 +72,7 @@ to run a security analysis.
7272

7373
## Static Code Analysis
7474

75-
We are using [`vimeo/psalm`](https://github.com/vimeo/psalm) to statically analyze the code.
75+
We use [`vimeo/psalm`](https://github.com/vimeo/psalm) to statically analyze the code.
7676

7777
Run
7878

@@ -82,7 +82,7 @@ make static-code-analysis
8282

8383
to run a static code analysis.
8484

85-
We are also using the baseline feature of [`vimeo/psalm`](https://psalm.dev/docs/running_psalm/dealing_with_code_issues/#using-a-baseline-file).
85+
We also use the baseline feature of [`vimeo/psalm`](https://psalm.dev/docs/running_psalm/dealing_with_code_issues/#using-a-baseline-file).
8686

8787
Run
8888

@@ -96,7 +96,7 @@ to regenerate the baseline in [`../psalm-baseline.xml`](../psalm-baseline.xml).
9696

9797
## Tests
9898

99-
We are using [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit) to drive the development.
99+
We use [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit) to drive the development.
100100

101101
Run
102102

.github/workflows/integrate.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,10 @@ jobs:
540540
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
541541
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-"
542542

543+
- name: "Remove platform configuration with composer"
544+
if: "${{ matrix.php-version }} != 'locked'"
545+
run: "composer config platform.php --ansi --unset"
546+
543547
- name: "Remove incompatible dependencies with composer"
544548
run: "composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"
545549

.php-cs-fixer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
'.note/',
4242
])
4343
->ignoreDotFiles(false)
44-
->in(__DIR__)
45-
->name('.php-cs-fixer.php');
44+
->in(__DIR__);
4645

4746
$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');
4847

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
6060
.PHONY: tests
6161
tests: ## Runs unit and end-to-end tests with phpunit/phpunit
6262
mkdir -p .build/phpunit
63-
composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.19 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml; git checkout HEAD -- composer.json composer.lock
64-
composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.19 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version8/phpunit.xml; git checkout HEAD -- composer.json composer.lock
65-
composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^9.0.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version9/phpunit.xml; git checkout HEAD -- composer.json composer.lock
66-
composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^10.0.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version10/phpunit.xml; git checkout HEAD -- composer.json composer.lock
63+
composer config platform.php --unset; composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.19 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml; git checkout HEAD -- composer.json composer.lock
64+
composer config platform.php --unset; composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.19 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version8/phpunit.xml; git checkout HEAD -- composer.json composer.lock
65+
composer config platform.php --unset; composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^9.0.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version9/phpunit.xml; git checkout HEAD -- composer.json composer.lock
66+
composer config platform.php --unset; composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^10.0.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version10/phpunit.xml; git checkout HEAD -- composer.json composer.lock
6767

6868
vendor: composer.json composer.lock
6969
composer validate --strict

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[![Total Downloads](https://poser.pugx.org/ergebnis/phpunit-slow-test-detector/downloads)](https://packagist.org/packages/ergebnis/phpunit-slow-test-detector)
1313
[![Monthly Downloads](http://poser.pugx.org/ergebnis/phpunit-slow-test-detector/d/monthly)](https://packagist.org/packages/ergebnis/phpunit-slow-test-detector)
1414

15-
This package provides an extension for detecting slow tests in [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit).
15+
This project provides a [`composer`](https://getcomposer.org) package and a [Phar archive](https://www.php.net/manual/en/book.phar.php) with an extension for detecting slow tests in [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit).
1616

1717
The extension is compatible with the following versions of `phpunit/phpunit`:
1818

@@ -355,35 +355,35 @@ When the extension uses the new event system, it uses and subscribes to the [`PH
355355

356356
## Changelog
357357

358-
The maintainers of this package record notable changes to this project in a [changelog](CHANGELOG.md).
358+
The maintainers of this project record notable changes to this project in a [changelog](CHANGELOG.md).
359359

360360
## Contributing
361361

362-
The maintainers of this package suggest following the [contribution guide](.github/CONTRIBUTING.md).
362+
The maintainers of this project suggest following the [contribution guide](.github/CONTRIBUTING.md).
363363

364364
## Code of Conduct
365365

366-
The maintainers of this package ask contributors to follow the [code of conduct](https://github.com/ergebnis/.github/blob/main/CODE_OF_CONDUCT.md).
366+
The maintainers of this project ask contributors to follow the [code of conduct](.github/CODE_OF_CONDUCT.md).
367367

368368
## General Support Policy
369369

370-
The maintainers of this package provide limited support.
370+
The maintainers of this project provide limited support.
371371

372-
You can support the maintenance of this package by [sponsoring @localheinz](https://github.com/sponsors/localheinz) or [requesting an invoice for services related to this package](mailto:[email protected]?subject=ergebnis/phpunit-slow-test-detector:%20Requesting%20invoice%20for%20services).
372+
You can support the maintenance of this project by [sponsoring @localheinz](https://github.com/sponsors/localheinz) or [requesting an invoice for services related to this project](mailto:[email protected]?subject=ergebnis/phpunit-slow-test-detector:%20Requesting%20invoice%20for%20services).
373373

374374
## PHP Version Support Policy
375375

376-
This package supports PHP versions with [active support](https://www.php.net/supported-versions.php).
376+
This project supports PHP versions with [active and security support](https://www.php.net/supported-versions.php).
377377

378-
The maintainers of this package add support for a PHP version following its initial release and drop support for a PHP version when it has reached its end of active support.
378+
The maintainers of this project add support for a PHP version following its initial release and drop support for a PHP version when it has reached the end of security support.
379379

380380
## Security Policy
381381

382-
This package has a [security policy](.github/SECURITY.md).
382+
This project has a [security policy](.github/SECURITY.md).
383383

384384
## License
385385

386-
This package uses the [MIT license](LICENSE.md).
386+
This project uses the [MIT license](LICENSE.md).
387387

388388
## Credits
389389

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
"audit": {
5555
"abandoned": "report"
5656
},
57+
"platform": {
58+
"php": "7.4.33"
59+
},
5760
"preferred-install": "dist",
5861
"sort-packages": true
5962
},

composer.lock

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)