Merge pull request Vinelab#97 from marcaube/fix-undefined-index-http

Mulkave · web-flow · commit c8ef55322d07 · 2016-06-30T17:02:13.000+03:00
Fix "'Undefined index: http' in AwsS3Provider.php:140"
diff --git a/src/Vinelab/Cdn/Providers/AwsS3Provider.php b/src/Vinelab/Cdn/Providers/AwsS3Provider.php
@@ -126,7 +126,7 @@ public function init($configurations)
     {
         // merge the received config array with the default configurations array to
         // fill missed keys with null or default values.
-        $this->default = array_merge($this->default, $configurations);
+        $this->default = array_replace_recursive($this->default, $configurations);
 
         $supplier = [
             'provider_url' => $this->default['url'],

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function init($configurations)`
`126`	`126`	`{`
`127`	`127`	`// merge the received config array with the default configurations array to`
`128`	`128`	`// fill missed keys with null or default values.`
`129`		`- $this->default = array_merge($this->default, $configurations);`
	`129`	`+ $this->default = array_replace_recursive($this->default, $configurations);`
`130`	`130`
`131`	`131`	`$supplier = [`
`132`	`132`	`'provider_url' => $this->default['url'],`