Remove unnecessary conditions in set and reset methods

Sieg · May 19, 2017 · 0ffb7b4 · 0ffb7b4
1 parent 6121f4c
commit 0ffb7b4
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/Source/DataContainer.php b/Source/DataContainer.php
@@ -68,17 +68,13 @@ public function get($key)
         $data = $this->getData();
         $result = null;
 
-        if (strpos($key, $this->getSeparator())) {
-            $path = $this->getPath($key);
-            if ($lastLevelData = $this->getDeepLevelLink($data, $path) and is_array($lastLevelData)) {
-                $mainKey = end($path);
-                if (array_key_exists($mainKey, $lastLevelData)) {
-                    $result = $lastLevelData[$mainKey];
-                }
-            };
-        } elseif (isset($data[$key])) {
-            $result = $data[$key];
-        }
+        $path = $this->getPath($key);
+        if ($lastLevelData = $this->getDeepLevelLink($data, $path) and is_array($lastLevelData)) {
+            $mainKey = end($path);
+            if (array_key_exists($mainKey, $lastLevelData)) {
+                $result = $lastLevelData[$mainKey];
+            }
+        };
 
         return $result;
     }
@@ -93,14 +89,10 @@ public function set($key, $value)
     {
         $data = &$this->data;
 
-        if (strpos($key, $this->getSeparator())) {
-            $path = $this->getPath($key);
-            $lastLevelData = &$this->ensureStructure($data, $path);
-            $mainKey = end($path);
-            $lastLevelData[$mainKey] = $value;
-        } else {
-            $data[$key] = $value;
-        }
+        $path = $this->getPath($key);
+        $lastLevelData = &$this->ensureStructure($data, $path);
+        $mainKey = end($path);
+        $lastLevelData[$mainKey] = $value;
     }
 
     /**