php-ini option was required but should not

ArthurHlt · ArthurHlt · commit 4b7a96cf4988 · 2014-07-16T18:27:03.000+02:00
diff --git a/src/orange/cfhelper/configuration/PhpIniConfigurator.php b/src/orange/cfhelper/configuration/PhpIniConfigurator.php
@@ -66,6 +66,9 @@ public function loadIniConfig()
         }
         if (is_file(__DIR__ . '/../../../../../../../composer.json')) {
             $composerJson = json_decode(file_get_contents(__DIR__ . '/../../../../../../../composer.json'), true);
+            if (empty($composerJson['php-ini'])) {
+                return;
+            }
             $arrayValues = array_merge($arrayValues, $composerJson['php-ini']);
         }
         foreach ($arrayValues as $key => $value) {
@@ -109,4 +112,4 @@ public function setApplicationInfo(ApplicationInfo $applicationInfo)
     }
 
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ public function loadIniConfig()`
`66`	`66`	`}`
`67`	`67`	`if (is_file(__DIR__ . '/../../../../../../../composer.json')) {`
`68`	`68`	`$composerJson = json_decode(file_get_contents(__DIR__ . '/../../../../../../../composer.json'), true);`
	`69`	`+ if (empty($composerJson['php-ini'])) {`
	`70`	`+ return;`
	`71`	`+ }`
`69`	`72`	`$arrayValues = array_merge($arrayValues, $composerJson['php-ini']);`
`70`	`73`	`}`
`71`	`74`	`foreach ($arrayValues as $key => $value) {`
`@@ -109,4 +112,4 @@ public function setApplicationInfo(ApplicationInfo $applicationInfo)`
`109`	`112`	`}`
`110`	`113`
`111`	`114`
`112`		`-}`
	`115`	`+}`