Fixed access for has() and remove()

sagebind · Mar 30, 2014 · a03f1d0 · a03f1d0
1 parent 361e8d9
commit a03f1d0
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/Settings.php b/src/Settings.php
@@ -9,7 +9,7 @@ class Settings
     /**
      * The configuration tree of the settings.
      *
-     * @var ConfigurationNode
+     * @var ConfigurationProperty
      */
     protected $configuration;
     protected $provider;
@@ -40,22 +40,20 @@ public function __construct(ProviderInterface $provider = null)
      */
     public function has($name)
     {
-        $names = explode('.', $name, 2);
+        $names = explode('.', $name);
+        $node = $this->configuration;
 
-        foreach ($this->children as $property)
+        for ($i = 0; $i < count($names); $i++)
         {
-            if ($property->getName() === $names[0])
+            if (!$node->hasProperty($names[$i]))
             {
-                if (isset($names[1]))
-                {
-                    return $property->has($names[1]);
-                }
-
-                return true;
+                return false;
             }
+
+            $node = $node->getProperty($names[$i]);
         }
 
-        return false;
+        return true;
     }
 
     /**
@@ -118,10 +116,18 @@ public function remove($name)
 
         for ($i = 0; $i < count($names) - 1; $i++)
         {
-            $property = $property->getProperty($names[$i]);
-        }
+            if (!$node->hasProperty($names[$i]))
+            {
+                $node->appendChild(new ConfigurationProperty($names[$i]));
+            }
 
-        $property->removeProperty($names[count($names) - 1]);
+            $node = $node->getProperty($names[$i]);
+        }
+
+        if ($node->hasProperty($names[count($names) - 1]))
+        {
+            $node->removeProperty($names[count($names) - 1]);
+        }
     }
 
     /**