Merge branch 'hotfix/27'

Close zfcampus#27
weierophinney · Nov 1, 2017 · 09f5af9 · 09f5af9
2 parents 109b8ca + 4a654e6
commit 09f5af9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/ConfigResource.php b/src/ConfigResource.php
@@ -192,10 +192,8 @@ public function replaceKey($keys, $value, array $config)
 
         $key = array_shift($keys);
 
-        $haveKeys = (count($keys) > 0) ? true : false;
-
         // If no more keys, overwrite and return
-        if (! $haveKeys) {
+        if (! $keys) {
             $config[$key] = $value;
             return $config;
         }
@@ -307,7 +305,7 @@ public function createNestedKeyValuePair(&$patchValues, $key, $value)
     protected function extractAndSet(array $keys, $value, &$array)
     {
         $key = array_shift($keys);
-        if (count($keys)) {
+        if ($keys) {
             if (! isset($array[$key]) || ! is_array($array[$key])) {
                 $array[$key] = [];
             }
@@ -331,7 +329,7 @@ protected function deleteByKey(&$array, array $keys)
             return;
         }
 
-        if (1 > count($keys)) {
+        if (! $keys) {
             unset($array[$key]);
             return;
         }

diff --git a/src/ModuleUtils.php b/src/ModuleUtils.php
@@ -40,9 +40,7 @@ public function __construct(ModuleManager $modules)
     public function getModulePath($moduleName)
     {
         $moduleName = $this->normalizeModuleName($moduleName);
-        if (isset($this->moduleData[$moduleName])
-            && isset($this->moduleData[$moduleName]['path'])
-        ) {
+        if (isset($this->moduleData[$moduleName]['path'])) {
             return $this->moduleData[$moduleName]['path'];
         }
 
@@ -63,9 +61,7 @@ public function getModulePath($moduleName)
     public function getModuleConfigPath($moduleName)
     {
         $moduleName = $this->normalizeModuleName($moduleName);
-        if (isset($this->moduleData[$moduleName])
-            && isset($this->moduleData[$moduleName]['config'])
-        ) {
+        if (isset($this->moduleData[$moduleName]['config'])) {
             return $this->moduleData[$moduleName]['config'];
         }