Merge branch 'release/4.1.11'

WsdlToPhp · Oct 18, 2023 · 4959c20 · 4959c20
2 parents d418c3c + 46a4d6f
commit 4959c20
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
     }