Merge pull request #146 from phpcr/fix-validate-namespaces

fix namespace validation

Author: lsmith77

src/PHPCR/Util/PathHelper.php

@@ -59,7 +59,7 @@ public static function assertValidAbsolutePath($path, $destination = false, $thr
         }
         if ($namespacePrefixes) {
             $matches = array();
-            preg_match_all('#/(?P<prefixes>[^:]+):#', $path, $matches);
+            preg_match_all('#/(?P<prefixes>[^/:]+):#', $path, $matches);
             $unknown = array_diff(array_unique($matches['prefixes']), $namespacePrefixes);
             if (count($unknown)) {
                 if (!$throw) {

tests/PHPCR/Tests/Util/PathHelperTest.php

@@ -37,6 +37,29 @@ public function testAssertInvalidAbsolutePath($path, $destination = false)
         PathHelper::assertValidAbsolutePath($path, $destination);
     }
 
+    /**
+     * @dataProvider dataproviderValidAbsolutePathsWithNamespaces
+     */
+    public function testAssertAbsolutePathNamespace($path)
+    {
+        PathHelper::assertValidAbsolutePath($path, false, true, array('jcr', 'nt'));
+    }
+
+    public function dataproviderValidAbsolutePathsWithNamespaces()
+    {
+        return array(
+            array('/parent/child'),
+            array('/jcr:localname'),
+            array('/jcr:localname/test'),
+            array('/jcr:localname/test/nt:node'),
+            array('/jcr:localname/test/nt:node/bla'),
+            array('/'),
+            array('/jcr:foo_/b-a/0^.txt'),
+            array('/parent[7]/child'),
+            array('/jcr:localname[3]/test'),
+        );
+    }
+
     /**
      * @expectedException \PHPCR\NamespaceException
      * @expectedExceptionMessage invalidprefix and other-ns