diff --git a/.editorconfig b/.editorconfig index fe208953..9576ebcf 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,6 +2,7 @@ root = true [*] charset = utf-8 +end_of_line = lf indent_size = 4 indent_style = space insert_final_newline = true diff --git a/.github/settings.yml b/.github/settings.yml index e352f876..46fe92a3 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,4 +1,4 @@ -# https://github.com/probot/settings +# https://github.com/repository-settings/app branches: - name: "main" diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 61756c52..fa702953 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -14,6 +14,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -73,6 +75,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -149,6 +153,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -196,13 +202,15 @@ jobs: trust-gpg-keys: "0xC00543248C87FB13,0x033E5F8D801A2F8D" - name: "Run maglnet/composer-require-checker" - run: ".phive/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json" + run: ".phive/composer-require-checker check --ansi --config-file=$(pwd)/composer-require-checker.json" mutation-tests: name: "Mutation Tests" runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -253,6 +261,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -313,6 +323,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -361,6 +373,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: @@ -412,6 +426,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 39279b01..5b326809 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -15,6 +15,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + if: > github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' && diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c760eede..bbed7cdb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,6 +13,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + steps: - name: "Create release" uses: "ergebnis/.github/actions/github/release/create@1.8.0" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index 17bf2b1b..3d628330 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -12,6 +12,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + strategy: matrix: php-version: diff --git a/.github/workflows/triage.yaml b/.github/workflows/triage.yaml index 8f59cb6e..6b1217b6 100644 --- a/.github/workflows/triage.yaml +++ b/.github/workflows/triage.yaml @@ -13,6 +13,8 @@ jobs: runs-on: "ubuntu-latest" + timeout-minutes: 5 + steps: - name: "Add labels based on branch name" uses: "ergebnis/.github/actions/github/pull-request/add-label-based-on-branch-name@1.8.0" diff --git a/README.md b/README.md index ab188c76..a100fdbb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ [![Total Downloads](https://poser.pugx.org/ergebnis/json-normalizer/downloads)](https://packagist.org/packages/ergebnis/json-normalizer) [![Monthly Downloads](http://poser.pugx.org/ergebnis/json-normalizer/d/monthly)](https://packagist.org/packages/ergebnis/json-normalizer) -Provides generic and vendor-specific normalizers for normalizing JSON documents. +This package provides generic and vendor-specific normalizers for normalizing [JSON documents](https://www.json.org). ## Installation @@ -596,30 +596,40 @@ sections, the `Vendor\Composer\VersionConstraintNormalizer` will ensure that ## Changelog -Please have a look at [`CHANGELOG.md`](CHANGELOG.md). +The maintainers of this package record notable changes to this project in a [changelog](CHANGELOG.md). ## Contributing -Please have a look at [`CONTRIBUTING.md`](.github/CONTRIBUTING.md). +The maintainers of this package suggest following the [contribution guide](.github/CONTRIBUTING.md). ## Code of Conduct -Please have a look at [`CODE_OF_CONDUCT.md`](https://github.com/ergebnis/.github/blob/main/CODE_OF_CONDUCT.md). +The maintainers of this package ask contributors to follow the [code of conduct](https://github.com/ergebnis/.github/blob/main/CODE_OF_CONDUCT.md). + +## General Support Policy + +The maintainers of this package provide limited support. + +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:am@localheinz.com?subject=ergebnis/json-normalizer:%20Requesting%20invoice%20for%20services). + +## PHP Version Support Policy + +This package supports PHP versions with [active support](https://www.php.net/supported-versions.php). + +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. ## Security Policy -Please have a look at [`SECURITY.md`](.github/SECURITY.md). +This package has a [security policy](.github/SECURITY.md). ## License -This package is licensed using the MIT License. - -Please have a look at [`LICENSE.md`](LICENSE.md). +This package uses the [MIT license](LICENSE.md). ## Credits The algorithm for sorting packages in the [`Vendor\Composer\PackageHashNormalizer`](src/Vendor/Composer/PackageHashNormalizer.php) has been adopted from [`Composer\Json\JsonManipulator::sortPackages()`](https://github.com/composer/composer/blob/1.6.2/src/Composer/Json/JsonManipulator.php#L110-L146) (originally licensed under MIT by [Nils Adermann](https://github.com/naderman) and [Jordi Boggiano](https://github.com/seldaek)), which I initially contributed to `composer/composer` with [`composer/composer#3549`](https://github.com/composer/composer/pull/3549) and [`composer/composer#3872`](https://github.com/composer/composer/pull/3872). -## Curious what I am up to? +## Social -Follow me on [Twitter](https://twitter.com/intent/follow?screen_name=localheinz)! +Follow [@localheinz](https://twitter.com/intent/follow?screen_name=localheinz) and [@ergebnis](https://twitter.com/intent/follow?screen_name=ergebnis) on Twitter. diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 092aa5df..2dda92a5 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + Json diff --git a/test/Util/Helper.php b/test/Util/Helper.php index 76aa6ec9..c1be178e 100644 --- a/test/Util/Helper.php +++ b/test/Util/Helper.php @@ -21,7 +21,7 @@ trait Helper final protected static function faker(string $locale = 'en_US'): Generator { /** - * @var array + * @var array $fakers */ static $fakers = [];