Merge pull request #95 from dantleech/fix-nodename-helper

Allow node names to be passed to getNodeName

Author: dbu

src/PHPCR/Util/PathHelper.php

@@ -229,7 +229,15 @@ public static function getParentPath($path)
      */
     public static function getNodeName($path)
     {
-        return substr($path, strrpos($path, '/') + 1);
+        $strrpos = strrpos($path, '/');
+
+        if (false === $strrpos) {
+            self::error(sprintf(
+                'Path "%s" must be an absolute path', $path
+            ), true);
+        }
+
+        return substr($path, $strrpos + 1);
     }
 
     /**

tests/PHPCR/Tests/Util/PathHelperTest.php

@@ -249,21 +249,30 @@ public function testGetParentPathRoot()
         $this->assertEquals('/', PathHelper::getParentPath('/'));
     }
 
-    // getNodeName tests
-
-    public function testGetNodeName()
+    public function provideGetNodeName()
     {
-        $this->assertEquals('child', PathHelper::getNodeName('/parent/child'));
+        return array(
+            array('/parent/child', 'child'),
+            array('/parent/ns:child', 'ns:child'),
+            array('/', ''),
+        );
     }
 
-    public function testGetNodeNameNamespaced()
+    /**
+     * @dataProvider provideGetNodeName
+     */
+    public function testGetNodeName($path, $expected = null)
     {
-        $this->assertEquals('ns:child', PathHelper::getNodeName('/parent/ns:child'));
+        $this->assertEquals($expected, PathHelper::getNodeName($path));
     }
 
-    public function testGetNodeNameRoot()
+    /**
+     * @expectedException PHPCR\RepositoryException
+     * @expectedExceptionMessage must be an absolute path
+     */
+    public function testGetNodeNameMustBeAbsolute()
     {
-        $this->assertEquals('', PathHelper::getNodeName('/'));
+        PathHelper::getNodeName('foobar');
     }
 
     public function testGetPathDepth()