diff --git a/CHANGELOG.md b/CHANGELOG.md index 329c0fe51..4eda64bdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -96,7 +96,7 @@ Have a look at the [Upgrade guide](https://github.com/ruflin/Elastica/blob/8.x/U * Removed `Elastica\Client::setLogger()` method [#2148](https://github.com/ruflin/Elastica/pull/2148) * Enabled `strict_types` on all classes [#2190](https://github.com/ruflin/Elastica/pull/2190) * Changed `Elastica\Scroll:clear` to use `scroll_id` body parameter instead of url parameter [#2211](https://github.com/ruflin/Elastica/pull/2211) - +* Remove branch alias for dev-master from composer file ### Added * Added support for PHP 8.2 [#2136](https://github.com/ruflin/Elastica/pull/2136) @@ -118,8 +118,6 @@ Have a look at the [Upgrade guide](https://github.com/ruflin/Elastica/blob/8.x/U ### Fixed * Fix types order in `Elastica\Query` to work with psalm & expand the `aggs` type to include raw arrays -### Security - ## [8.0.0-alpha1](https://github.com/ruflin/Elastica/compare/7.3.0...8.0.0-alpha1) ### Backward Compatibility Breaks * Dropped support for PHP <8.0 [#2131](https://github.com/ruflin/Elastica/pull/2131) diff --git a/composer.json b/composer.json index 1065ab1f0..5d2e8e89e 100644 --- a/composer.json +++ b/composer.json @@ -50,10 +50,5 @@ "php-http/discovery": true }, "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "8.0.x-dev" - } } }