Merge pull request #14 from Traackr/CAMP-976-missing-prefix-child-keys

CAMP-976: ensure prefix is attached to child keys

src/RedisTreeEngine.php

@@ -572,6 +572,21 @@ protected function parseMultiKey($key)
         return $keys;
     }
 
+    /**
+     * Ensure prefix defined in settings is prepended to key.
+     * @param string $key
+     * @return string
+     */
+    private function _addKeyPrefix($key)
+    {
+        if (!empty($this->settings['prefix'])
+            && strpos($key, $this->settings['prefix']) !== 0
+        ) {
+            $key = $this->settings['prefix'] . $key;
+        }
+        return $key;
+    }
+
     /**
      * Get the key used to store the set of child keys.
      *
@@ -582,9 +597,8 @@ protected function parseMultiKey($key)
     private function _getChildSetKey($parentKey)
     {
         $key = $parentKey . $this->_childSetKeySuffix;
-        if (!empty($this->settings['prefix']) && strpos($key, $this->settings['prefix']) !== 0) {
-            $key = $this->settings['prefix'] . $key;
-        }
+        // ensure prefix is included
+        $key = $this->_addKeyPrefix($key);
         return $key;
     }
 
@@ -599,6 +613,10 @@ private function _getChildSetKey($parentKey)
     private function _writeChildRelationship($parentKey, ...$childKeys)
     {
         $setKey = $this->_getChildSetKey($parentKey);
+        // ensure all child keys include prefix
+        foreach ($childKeys as $index => $key) {
+            $childKeys[$index] = $this->_addKeyPrefix($key);
+        }
         return $this->redis->sadd($setKey, ...$childKeys);
     }