Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Jul 25, 2010 · f0671be · f0671be
4 parents ff81391 + cfbc839 + 49e4d7c + 21cca29
commit f0671be
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Css2Xpath.php b/src/Css2Xpath.php
@@ -106,7 +106,7 @@ protected static function _tokenize($expression)
         // arbitrary attribute strict equality
         $expression = preg_replace_callback(
             '|\[([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i',
-            function($matches) {
+            function ($matches) {
                 return '[@' . strtolower($matches[1]) . "='" . $matches[2] . "']";
             },
             $expression

diff --git a/src/Query.php b/src/Query.php
@@ -61,6 +61,12 @@ class Query
      */
     protected $_docType;
 
+    /**
+     * XPath namespaces
+     * @var array
+     */
+    protected $_xpathNamespaces = array();
+
     /**
      * Constructor
      *
@@ -215,6 +221,17 @@ public function queryXpath($xpathQuery, $query = null)
         return new NodeList($query, $xpathQuery, $domDoc, $nodeList);
     }
 
+    /**
+     * Register XPath namespaces
+     *
+     * @param   array $xpathNamespaces
+     * @return  void
+     */
+    public function registerXpathNamespaces($xpathNamespaces)
+    {
+        $this->_xpathNamespaces = $xpathNamespaces;
+    }
+
     /**
      * Prepare node list
      *
@@ -225,6 +242,9 @@ public function queryXpath($xpathQuery, $query = null)
     protected function _getNodeList($document, $xpathQuery)
     {
         $xpath      = new \DOMXPath($document);
+        foreach ($this->_xpathNamespaces as $prefix => $namespaceUri) {
+            $xpath->registerNamespace($prefix, $namespaceUri);
+        }
         $xpathQuery = (string) $xpathQuery;
         return $xpath->query($xpathQuery);
     }