diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index a5d8efd07e..8bb8b585aa 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -14,7 +14,7 @@ jobs: php-version: '7.4' coverage: 'none' extensions: 'json, mbstring, tokenizer' - tools: 'composer-normalize:2.15.0, php-cs-fixer:3.8.0' + tools: 'composer-normalize:2.28.0, php-cs-fixer:3.8.0' - name: 'Check PHP code' run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d0c184d8a..37f5027423 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * Updated `symfony/phpunit-bridge` to `6.0` by @franmomu [#2067](https://github.com/ruflin/Elastica/pull/2067) * Updated `php-cs-fixer` to `3.8.0` [#2074](https://github.com/ruflin/Elastica/pull/2074) +* Updated `composer-normalize` to `2.2.28` by @deguif [#2084](https://github.com/ruflin/Elastica/pull/2084) * Increased `PHPStan` level to `4` [#2080](https://github.com/ruflin/Elastica/pull/2080) ### Deprecated * Deprecated `Elastica\Reindex::WAIT_FOR_COMPLETION_FALSE`, use a boolean as parameter instead by @franmomu [#2070](https://github.com/ruflin/Elastica/pull/2070) diff --git a/composer.json b/composer.json index bc80abf9a6..936893b9ff 100644 --- a/composer.json +++ b/composer.json @@ -1,19 +1,19 @@ { "name": "ruflin/elastica", - "type": "library", "description": "Elasticsearch Client", + "license": "MIT", + "type": "library", "keywords": [ "search", "client" ], - "homepage": "http://elastica.io/", - "license": "MIT", "authors": [ { "name": "Nicolas Ruflin", "homepage": "http://ruflin.com/" } ], + "homepage": "http://elastica.io/", "require": { "php": "^7.2 || ^8.0", "ext-json": "*", @@ -36,11 +36,6 @@ "guzzlehttp/guzzle": "Allow using guzzle as transport", "monolog/monolog": "Logging request" }, - "extra": { - "branch-alias": { - "dev-master": "7.0.x-dev" - } - }, "autoload": { "psr-4": { "Elastica\\": "src/" @@ -50,5 +45,10 @@ "psr-4": { "Elastica\\Test\\": "tests/" } + }, + "extra": { + "branch-alias": { + "dev-master": "7.0.x-dev" + } } }