diff --git a/CHANGELOG.md b/CHANGELOG.md index 4837a845..5f44c0f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # CHANGELOG +## 4.1.11 - 2023-10-18 +- issue #304, pr #305 - Override required PHP version in composer.json + ## 4.1.10 - 2023-09-11 - issue #298, pr #303 - Undefined constant "WsdlToPhp\PackageGenerator\Generator\SOAP_1_1" diff --git a/README.md b/README.md index 497d9b13..ebfedc66 100644 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ Developers who helped on this project are listed in the [composer.json](composer - [Arnaud POINTET](https://github.com/Oipnet) - [dypa](https://github.com/dypa) - [tbreuss](https://github.com/tbreuss) +- [Paul Melekhov](https://github.com/gugglegum) ## FAQ diff --git a/composer.json b/composer.json index bbbe6611..f189bc84 100644 --- a/composer.json +++ b/composer.json @@ -89,9 +89,14 @@ "role": "Contributor" }, { - "name": "tbreuss", - "email": "thomasbreuss@gmx.ch", + "name": "gugglegum", + "email": "gugglegum@gmail.com", "role": "Contributor" + }, + { + "name": "tbreuss", + "email": "thomasbreuss@gmx.ch", + "role": "Contributor" } ], "support" : { diff --git a/src/File/Composer.php b/src/File/Composer.php index dfc1d734..408153fc 100644 --- a/src/File/Composer.php +++ b/src/File/Composer.php @@ -91,7 +91,7 @@ protected function addAutoloadToComposerJson(array &$content): Composer protected function addComposerSettings(array &$content): Composer { - $content = array_merge_recursive($content, $this->getGenerator()->getOptionComposerSettings()); + $content = array_replace_recursive($content, $this->getGenerator()->getOptionComposerSettings()); return $this; }