Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into merges/svntrunk
Browse files Browse the repository at this point in the history
Conflicts:
	demos/Zend/Service/LiveDocx/MailMerge/bitmaps/generate-bitmaps.php
	demos/Zend/Service/LiveDocx/MailMerge/constructors/hosted-licensed.php
	demos/Zend/Service/LiveDocx/MailMerge/constructors/public-zend_config.php
	demos/Zend/Service/LiveDocx/MailMerge/constructors/public.php
	demos/Zend/Service/LiveDocx/MailMerge/convert/convert-document.php
	demos/Zend/Service/LiveDocx/MailMerge/license-agreement/generate-document-concat.php
	demos/Zend/Service/LiveDocx/MailMerge/license-agreement/generate-document.php
	demos/Zend/Service/LiveDocx/MailMerge/metafiles/generate-metafiles.php
	demos/Zend/Service/LiveDocx/MailMerge/pdf-security/generate-document.php
	demos/Zend/Service/LiveDocx/MailMerge/supported-fonts/show-supported-fonts-cached.php
	demos/Zend/Service/LiveDocx/MailMerge/supported-fonts/show-supported-fonts.php
	demos/Zend/Service/LiveDocx/MailMerge/supported-formats/show-supported-formats-cached.php
	demos/Zend/Service/LiveDocx/MailMerge/supported-formats/show-supported-formats.php
	demos/Zend/Service/LiveDocx/MailMerge/telephone-bill/generate-document.php
	demos/Zend/Service/LiveDocx/MailMerge/template-info/list-template-info.php
	demos/Zend/Service/LiveDocx/MailMerge/templates/delete-all.php
	demos/Zend/Service/LiveDocx/MailMerge/templates/download.php
	demos/Zend/Service/LiveDocx/MailMerge/templates/list.php
	demos/Zend/Service/LiveDocx/MailMerge/templates/template-exists.php
	demos/Zend/Service/LiveDocx/MailMerge/templates/upload.php
	demos/Zend/Service/LiveDocx/check-environment.php
	demos/Zend/Service/LiveDocx/configuration.php.dist
	documentation/manual/de/module_specs/Zend_Application-CoreFunctionality-Application.xml
	documentation/manual/de/module_specs/Zend_Cache-Frontends.xml
	documentation/manual/de/module_specs/Zend_Config_Ini.xml
	documentation/manual/de/module_specs/Zend_Date-Introduction.xml
	documentation/manual/de/module_specs/Zend_Date-Overview.xml
	documentation/manual/de/module_specs/Zend_Db_Adapter.xml
	documentation/manual/de/module_specs/Zend_Dojo-BuildLayers.xml
	documentation/manual/de/module_specs/Zend_Dojo-Form-Elements.xml
	documentation/manual/de/module_specs/Zend_Dojo-View-Helpers.xml
	documentation/manual/de/module_specs/Zend_Feed_Writer.xml
	documentation/manual/de/module_specs/Zend_Filter-Decryption.xml
	documentation/manual/de/module_specs/Zend_Filter-Encryption.xml
	documentation/manual/de/module_specs/Zend_Filter-Inflector.xml
	documentation/manual/de/module_specs/Zend_Filter-Set.xml
	documentation/manual/de/module_specs/Zend_Filter.xml
	documentation/manual/de/module_specs/Zend_Gdata_Books.xml
	documentation/manual/de/module_specs/Zend_Http_Client-Adapters.xml
	documentation/manual/de/module_specs/Zend_Http_Client-Advanced.xml
	documentation/manual/de/module_specs/Zend_Serializer-Introduction.xml
	documentation/manual/de/module_specs/Zend_Service_Amazon.xml
	documentation/manual/de/module_specs/Zend_Service_Amazon_Ec2-Ebs.xml
	documentation/manual/de/module_specs/Zend_Service_LiveDocx.xml
	documentation/manual/de/module_specs/Zend_Service_WindowsAzure_Blob.xml
	documentation/manual/de/module_specs/Zend_Tool-Extending.xml
	documentation/manual/de/module_specs/Zend_Translate-Plurals.xml
	documentation/manual/de/module_specs/Zend_Translate-Using.xml
	documentation/manual/de/module_specs/Zend_Validate-Barcode.xml
	documentation/manual/de/module_specs/Zend_Validate-Between.xml
	documentation/manual/de/module_specs/Zend_Validate-Callback.xml
	documentation/manual/de/module_specs/Zend_Validate-CreditCard.xml
	documentation/manual/de/module_specs/Zend_Validate-GreaterThan.xml
	documentation/manual/de/module_specs/Zend_Validate-Hostname.xml
	documentation/manual/de/module_specs/Zend_Validate-Identical.xml
	documentation/manual/de/module_specs/Zend_Validate-Ip.xml
	documentation/manual/de/module_specs/Zend_Validate-Isbn.xml
	documentation/manual/de/module_specs/Zend_Validate-Messages.xml
	documentation/manual/de/module_specs/Zend_Validate-PostCode.xml
	documentation/manual/de/module_specs/Zend_Validate-Regex.xml
	documentation/manual/de/module_specs/Zend_Validate-Set.xml
	documentation/manual/de/module_specs/Zend_Validate-StringLength.xml
	documentation/manual/de/module_specs/Zend_Validate.xml
	documentation/manual/de/ref/coding_standard.xml
	documentation/manual/de/ref/migration-19.xml
	documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml
	documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml
	documentation/manual/en/module_specs/Zend_Feed_Reader.xml
	documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml
	documentation/manual/en/module_specs/Zend_Filter-Encryption.xml
	documentation/manual/en/module_specs/Zend_Filter-Inflector.xml
	documentation/manual/en/module_specs/Zend_Filter.xml
	documentation/manual/en/module_specs/Zend_Form-Decorators.xml
	documentation/manual/en/module_specs/Zend_Form-Elements.xml
	documentation/manual/en/module_specs/Zend_Form-Forms.xml
	documentation/manual/en/module_specs/Zend_Form-QuickStart.xml
	documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml
	documentation/manual/en/module_specs/Zend_Log-Overview.xml
	documentation/manual/en/module_specs/Zend_Validate-Between.xml
	documentation/manual/en/module_specs/Zend_Validate-GreaterThan.xml
	documentation/manual/en/module_specs/Zend_Validate-Hostname.xml
	documentation/manual/en/module_specs/Zend_Validate-Identical.xml
	documentation/manual/en/module_specs/Zend_Validate-Isbn.xml
	documentation/manual/en/module_specs/Zend_Validate-Messages.xml
	documentation/manual/en/module_specs/Zend_Validate-Regex.xml
	documentation/manual/en/module_specs/Zend_Validate-Set.xml
	documentation/manual/en/module_specs/Zend_Validate-StringLength.xml
	documentation/manual/fr/module_specs/Zend_Application-AvailableResources-Frontcontroller.xml
	documentation/manual/fr/module_specs/Zend_Application-CoreFunctionality-Application.xml
	documentation/manual/fr/module_specs/Zend_Cache-Backends.xml
	documentation/manual/fr/module_specs/Zend_Cache-Frontends.xml
	documentation/manual/fr/module_specs/Zend_Config_Ini.xml
	documentation/manual/fr/module_specs/Zend_Db_Adapter.xml
	documentation/manual/fr/module_specs/Zend_Filter-Decryption.xml
	documentation/manual/fr/module_specs/Zend_Ldap-Node.xml
	documentation/manual/fr/module_specs/Zend_Markup.xml
	documentation/manual/fr/module_specs/Zend_Service_Twitter.xml
	documentation/manual/fr/module_specs/Zend_Validate-Between.xml
	documentation/manual/fr/module_specs/Zend_Validate-GreaterThan.xml
	documentation/manual/fr/module_specs/Zend_Validate-StringLength.xml
	documentation/manual/ja/module_specs/Zend_Feed-ModifyingFeed.xml
	documentation/manual/ja/module_specs/Zend_Filter-Decryption.xml
	documentation/manual/ja/module_specs/Zend_Filter-Encryption.xml
	documentation/manual/ja/module_specs/Zend_Filter-Set.xml
	documentation/manual/ja/module_specs/Zend_Filter.xml
	documentation/manual/ja/module_specs/Zend_Mail-HtmlMails.xml
	documentation/manual/ja/module_specs/Zend_Mail-Introduction.xml
	documentation/manual/ja/module_specs/Zend_Mail_Read.xml
	documentation/manual/ja/module_specs/Zend_Mime_Part.xml
	documentation/manual/ja/module_specs/Zend_Translate-Using.xml
	documentation/manual/ja/module_specs/Zend_Validate-Ip.xml
	documentation/manual/ja/module_specs/Zend_Validate-Messages.xml
	documentation/manual/ja/module_specs/Zend_Validate-Set.xml
	documentation/manual/ja/module_specs/Zend_Validate.xml
	documentation/manual/ja/module_specs/Zend_XmlRpc_Server.xml
	documentation/manual/ja/ref/coding_standard.xml
	documentation/manual/ja/ref/migration-19.xml
	documentation/manual/pl/module_specs/Zend_Db_Adapter.xml
	documentation/manual/pl/module_specs/Zend_Db_Select.xml
	documentation/manual/pl/tutorials/quickstart-create-layout.xml
	documentation/manual/pl/tutorials/quickstart-create-project.xml
	documentation/manual/pl/tutorials/quickstart-intro-mvc.xml
	documentation/manual/pt-br/module_specs/Zend_Db_Adapter.xml
	documentation/manual/pt-br/module_specs/Zend_Search_Lucene-Charset.xml
	documentation/manual/pt-br/module_specs/Zend_Search_Lucene-Extending.xml
	library/Zend/Acl.php
	library/Zend/Amf/Parse/Amf0/Deserializer.php
	library/Zend/Amf/Parse/Amf0/Serializer.php
	library/Zend/Amf/Parse/Amf3/Deserializer.php
	library/Zend/Amf/Parse/Amf3/Serializer.php
	library/Zend/Amf/Parse/Serializer.php
	library/Zend/Amf/Response.php
	library/Zend/Amf/Response/Http.php
	library/Zend/Amf/Server.php
	library/Zend/Amf/Util/BinaryStream.php
	library/Zend/Application/Bootstrap/BootstrapAbstract.php
	library/Zend/Application/Resource/Multidb.php
	library/Zend/Application/Resource/Translate.php
	library/Zend/Auth/Adapter/DbTable.php
	library/Zend/Auth/Adapter/Ldap.php
	library/Zend/Barcode/Object/ObjectAbstract.php
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Barcode/Renderer/RendererAbstract.php
	library/Zend/Cache.php
	library/Zend/Cache/Backend/File.php
	library/Zend/Cache/Backend/Memcached.php
	library/Zend/Cache/Backend/Static.php
	library/Zend/Cache/Backend/Test.php
	library/Zend/Cache/Backend/TwoLevels.php
	library/Zend/Cache/Core.php
	library/Zend/Cache/Frontend/Function.php
	library/Zend/Cache/Manager.php
	library/Zend/CodeGenerator/Php/Class.php
	library/Zend/CodeGenerator/Php/Parameter.php
	library/Zend/CodeGenerator/Php/Property/DefaultValue.php
	library/Zend/Config/Writer/Ini.php
	library/Zend/Controller/Request/Http.php
	library/Zend/Controller/Response/Abstract.php
	library/Zend/Crypt/Rsa.php
	library/Zend/Currency.php
	library/Zend/Date.php
	library/Zend/Db/Adapter/Sqlsrv.php
	library/Zend/Db/Statement/Sqlsrv.php
	library/Zend/Db/Table/Row/Abstract.php
	library/Zend/Dojo/BuildLayer.php
	library/Zend/Dom/Query.php
	library/Zend/Dom/Query/Css2Xpath.php
	library/Zend/Feed/Pubsubhubbub/Model/Subscription.php
	library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php
	library/Zend/Feed/Reader.php
	library/Zend/Feed/Reader/Entry/Rss.php
	library/Zend/Feed/Reader/Feed/Atom.php
	library/Zend/Feed/Reader/Feed/Rss.php
	library/Zend/Feed/Reader/FeedAbstract.php
	library/Zend/Feed/Writer/Entry.php
	library/Zend/Feed/Writer/Feed/FeedAbstract.php
	library/Zend/Feed/Writer/Renderer/Entry/Rss.php
	library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php
	library/Zend/Feed/Writer/Renderer/Feed/Rss.php
	library/Zend/File/Transfer.php
	library/Zend/File/Transfer/Adapter/Abstract.php
	library/Zend/Filter/Encrypt/Mcrypt.php
	library/Zend/Filter/Encrypt/Openssl.php
	library/Zend/Filter/Inflector.php
	library/Zend/Filter/Input.php
	library/Zend/Filter/StripTags.php
	library/Zend/Form.php
	library/Zend/Form/Decorator/FormErrors.php
	library/Zend/Form/DisplayGroup.php
	library/Zend/Form/Element.php
	library/Zend/Gdata/App.php
	library/Zend/Gdata/Gapps.php
	library/Zend/Http/Client.php
	library/Zend/Http/Client/Adapter/Curl.php
	library/Zend/Http/Client/Adapter/Proxy.php
	library/Zend/Http/Client/Adapter/Socket.php
	library/Zend/Http/Response.php
	library/Zend/Json/Encoder.php
	library/Zend/Json/Server.php
	library/Zend/Ldap.php
	library/Zend/Ldap/Attribute.php
	library/Zend/Loader/Autoloader.php
	library/Zend/Loader/Autoloader/Interface.php
	library/Zend/Locale.php
	library/Zend/Locale/Format.php
	library/Zend/Log.php
	library/Zend/Log/Filter/Abstract.php
	library/Zend/Log/Writer/Abstract.php
	library/Zend/Log/Writer/Db.php
	library/Zend/Log/Writer/Syslog.php
	library/Zend/Log/Writer/ZendMonitor.php
	library/Zend/Mail.php
	library/Zend/Mail/Protocol/Abstract.php
	library/Zend/Mail/Transport/Sendmail.php
	library/Zend/Markup/Renderer/Html.php
	library/Zend/Markup/Renderer/RendererAbstract.php
	library/Zend/Measure/Abstract.php
	library/Zend/Oauth/Client.php
	library/Zend/Oauth/Consumer.php
	library/Zend/Oauth/Http/Utility.php
	library/Zend/Paginator.php
	library/Zend/Pdf.php
	library/Zend/Pdf/Action.php
	library/Zend/Pdf/Element/String.php
	library/Zend/Pdf/Filter/Ascii85.php
	library/Zend/Pdf/StringParser.php
	library/Zend/Search/Lucene.php
	library/Zend/Search/Lucene/Document/Html.php
	library/Zend/Service/Twitter.php
	library/Zend/Soap/AutoDiscover.php
	library/Zend/Soap/Wsdl.php
	library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
	library/Zend/Test/PHPUnit/Constraint/DomQuery.php
	library/Zend/Test/PHPUnit/ControllerTestCase.php
	library/Zend/Tool/Framework/Loader/Interface.php
	library/Zend/Translate.php
	library/Zend/Translate/Adapter.php
	library/Zend/Translate/Adapter/Csv.php
	library/Zend/Translate/Plural.php
	library/Zend/Uri.php
	library/Zend/Validate.php
	library/Zend/Validate/Abstract.php
	library/Zend/Validate/Barcode.php
	library/Zend/Validate/CreditCard.php
	library/Zend/Validate/Db/Abstract.php
	library/Zend/Validate/EmailAddress.php
	library/Zend/Validate/File/Count.php
	library/Zend/Validate/File/ExcludeMimeType.php
	library/Zend/Validate/File/MimeType.php
	library/Zend/Validate/File/Upload.php
	library/Zend/Validate/Float.php
	library/Zend/Validate/Iban.php
	library/Zend/Validate/Identical.php
	library/Zend/Validate/Isbn.php
	library/Zend/Validate/PostCode.php
	library/Zend/Validate/Regex.php
	library/Zend/Validate/Sitemap/Changefreq.php
	library/Zend/Validate/Sitemap/Lastmod.php
	library/Zend/Validate/Sitemap/Loc.php
	library/Zend/Validate/Sitemap/Priority.php
	library/Zend/View/Abstract.php
	library/Zend/View/Helper/FormButton.php
	library/Zend/View/Helper/FormLabel.php
	library/Zend/View/Helper/HeadTitle.php
	library/Zend/XmlRpc/Response.php
	library/Zend/XmlRpc/Value/Array.php
	resources/languages/de/Zend_Validate.php
	resources/languages/en/Zend_Validate.php
	resources/languages/ja/Zend_Validate.php
	resources/languages/pt_BR/Zend_Validate.php
	tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php
	tests/Zend/Application/Resource/MultidbTest.php
	tests/Zend/Application/Resource/NavigationTest.php
	tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php
	tests/Zend/Barcode/AllTests.php
	tests/Zend/Barcode/Renderer/TestCommon.php
	tests/Zend/Cache/AllTests.php
	tests/Zend/Cache/CommonBackendTest.php
	tests/Zend/Cache/CommonExtendedBackendTest.php
	tests/Zend/Cache/FunctionFrontendTest.php
	tests/Zend/Cache/ManagerTest.php
	tests/Zend/CodeGenerator/Php/ClassTest.php
	tests/Zend/CodeGenerator/Php/PropertyTest.php
	tests/Zend/Crypt/Rsa/RsaTest.php
	tests/Zend/CurrencyTest.php
	tests/Zend/DateTest.php
	tests/Zend/Db/Adapter/SqlsrvTest.php
	tests/Zend/Db/Statement/MysqliTest.php
	tests/Zend/Db/Statement/SqlsrvTest.php
	tests/Zend/Db/Table/Row/TestCommon.php
	tests/Zend/Dojo/BuildLayerTest.php
	tests/Zend/Dojo/_files/BuildProfile.js
	tests/Zend/Dojo/_files/BuildProfileWithDependencies.js
	tests/Zend/Dom/Query/Css2XpathTest.php
	tests/Zend/Dom/QueryTest.php
	tests/Zend/Feed/Pubsubhubbub/AllTests.php
	tests/Zend/Feed/Reader/Entry/RssTest.php
	tests/Zend/Feed/Reader/Feed/RssTest.php
	tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php
	tests/Zend/Feed/Writer/EntryTest.php
	tests/Zend/Feed/Writer/FeedTest.php
	tests/Zend/Feed/Writer/Renderer/Entry/RssTest.php
	tests/Zend/Feed/Writer/Renderer/Feed/RssTest.php
	tests/Zend/File/Transfer/Adapter/AbstractTest.php
	tests/Zend/File/Transfer/Adapter/HttpTest.php
	tests/Zend/Filter/AllTests.php
	tests/Zend/Filter/Encrypt/McryptTest.php
	tests/Zend/Filter/Encrypt/OpensslTest.php
	tests/Zend/Filter/InflectorTest.php
	tests/Zend/Filter/StripTagsTest.php
	tests/Zend/Form/AllTests.php
	tests/Zend/Form/Decorator/AllTests.php
	tests/Zend/Form/Decorator/FieldsetTest.php
	tests/Zend/Form/DisplayGroupTest.php
	tests/Zend/Form/Element/ImageTest.php
	tests/Zend/Form/Element/RadioTest.php
	tests/Zend/Form/Element/SubmitTest.php
	tests/Zend/Form/ElementTest.php
	tests/Zend/Form/FormTest.php
	tests/Zend/Form/SubFormTest.php
	tests/Zend/Gdata/AllTests.php
	tests/Zend/Gdata/GappsOnlineTest.php
	tests/Zend/Http/Client/CommonHttpTests.php
	tests/Zend/Http/Client/CurlTest.php
	tests/Zend/Http/Client/StaticTest.php
	tests/Zend/Http/ResponseTest.php
	tests/Zend/Json/ServerTest.php
	tests/Zend/JsonTest.php
	tests/Zend/Ldap/AttributeTest.php
	tests/Zend/Ldap/CrudTest.php
	tests/Zend/LoaderTest.php
	tests/Zend/Locale/FormatTest.php
	tests/Zend/LocaleTest.php
	tests/Zend/Log/AllTests.php
	tests/Zend/Log/LogTest.php
	tests/Zend/Log/Writer/DbTest.php
	tests/Zend/Markup/BbcodeAndHtmlTest.php
	tests/Zend/Measure/TimeTest.php
	tests/Zend/Oauth/Oauth/Token/AccessTest.php
	tests/Zend/PaginatorTest.php
	tests/Zend/Pdf/Element/StringTest.php
	tests/Zend/Reflection/_files/TestSampleClass.php
	tests/Zend/Search/Lucene/LuceneTest.php
	tests/Zend/Service/AllTests.php
	tests/Zend/Service/Twitter/TwitterSearchTest.php
	tests/Zend/Service/Twitter/TwitterTest.php
	tests/Zend/Soap/ServerTest.php
	tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php
	tests/Zend/Soap/_files/commontypes.php
	tests/Zend/TimeSyncTest.php
	tests/Zend/Translate/Adapter/ArrayTest.php
	tests/Zend/Translate/Adapter/CsvTest.php
	tests/Zend/Translate/Adapter/GettextTest.php
	tests/Zend/Translate/Adapter/IniTest.php
	tests/Zend/Translate/Adapter/QtTest.php
	tests/Zend/Translate/Adapter/TbxTest.php
	tests/Zend/Translate/Adapter/TmxTest.php
	tests/Zend/Translate/Adapter/XliffTest.php
	tests/Zend/Translate/Adapter/XmlTmTest.php
	tests/Zend/TranslateTest.php
	tests/Zend/UriTest.php
	tests/Zend/Validate/AllTests.php
	tests/Zend/Validate/CreditCardTest.php
	tests/Zend/Validate/File/AllTests.php
	tests/Zend/Validate/File/IsCompressedTest.php
	tests/Zend/Validate/File/IsImageTest.php
	tests/Zend/Validate/File/MimeTypeTest.php
	tests/Zend/Validate/FloatTest.php
	tests/Zend/Validate/IdenticalTest.php
	tests/Zend/Validate/IsbnTest.php
	tests/Zend/Validate/PostCodeTest.php
	tests/Zend/Validate/RegexTest.php
	tests/Zend/Validate/Sitemap/ChangefreqTest.php
	tests/Zend/Validate/Sitemap/LastmodTest.php
	tests/Zend/Validate/Sitemap/LocTest.php
	tests/Zend/Validate/Sitemap/PriorityTest.php
	tests/Zend/ValidateTest.php
	tests/Zend/ViewTest.php
	tests/Zend/Wildfire/WildfireTest.php
	tests/Zend/XmlRpc/ResponseTest.php
  • Loading branch information
weierophinney committed Jul 12, 2010
2 parents ff81391 + 49e4d7c commit cfbc839
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/Css2Xpath.php
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions src/Query.php
Expand Up @@ -61,6 +61,12 @@ class Query
*/
protected $_docType;

/**
* XPath namespaces
* @var array
*/
protected $_xpathNamespaces = array();

/**
* Constructor
*
Expand Down Expand Up @@ -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
*
Expand All @@ -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);
}
Expand Down

0 comments on commit cfbc839

Please sign in to comment.