Commit09f5af9

committed

Merge branch 'hotfix/27'

Close#27

2 parents109b8ca +4a654e6 commit09f5af9Copy full SHA for 09f5af9

File tree

-11

lines changed

-11

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,10 +192,8 @@ public function replaceKey($keys, $value, array $config)`
`192`	`192`
`193`	`193`	`$key =array_shift($keys);`
`194`	`194`
`195`		`-$haveKeys = (count($keys) >0) ?true :false;`
`196`		`-`
`197`	`195`	`// If no more keys, overwrite and return`
`198`		`-if (!$haveKeys) {`
	`196`	`+if (!$keys) {`
`199`	`197`	`$config[$key] =$value;`
`200`	`198`	`return$config;`
`201`	`199`	`}`
`@@ -307,7 +305,7 @@ public function createNestedKeyValuePair(&$patchValues, $key, $value)`
`307`	`305`	`protectedfunctionextractAndSet(array$keys,$value, &$array)`
`308`	`306`	`{`
`309`	`307`	`$key =array_shift($keys);`
`310`		`-if (count($keys)) {`
	`308`	`+if ($keys) {`
`311`	`309`	`if (!isset($array[$key]) \|\| !is_array($array[$key])) {`
`312`	`310`	`$array[$key] = [];`
`313`	`311`	`}`
`@@ -331,7 +329,7 @@ protected function deleteByKey(&$array, array $keys)`
`331`	`329`	`return;`
`332`	`330`	`}`
`333`	`331`
`334`		`-if (1 >count($keys)) {`
	`332`	`+if (!$keys) {`
`335`	`333`	`unset($array[$key]);`
`336`	`334`	`return;`
`337`	`335`	`}`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ public function __construct(ModuleManager $modules)`
`40`	`40`	`publicfunctiongetModulePath($moduleName)`
`41`	`41`	`{`
`42`	`42`	`$moduleName =$this->normalizeModuleName($moduleName);`
`43`		`-if (isset($this->moduleData[$moduleName])`
`44`		`- &&isset($this->moduleData[$moduleName]['path'])`
`45`		`- ) {`
	`43`	`+if (isset($this->moduleData[$moduleName]['path'])) {`
`46`	`44`	`return$this->moduleData[$moduleName]['path'];`
`47`	`45`	`}`
`48`	`46`
`@@ -63,9 +61,7 @@ public function getModulePath($moduleName)`
`63`	`61`	`publicfunctiongetModuleConfigPath($moduleName)`
`64`	`62`	`{`
`65`	`63`	`$moduleName =$this->normalizeModuleName($moduleName);`
`66`		`-if (isset($this->moduleData[$moduleName])`
`67`		`- &&isset($this->moduleData[$moduleName]['config'])`
`68`		`- ) {`
	`64`	`+if (isset($this->moduleData[$moduleName]['config'])) {`
`69`	`65`	`return$this->moduleData[$moduleName]['config'];`
`70`	`66`	`}`
`71`	`67`

Comments

(0)