Use external ZendXml\Security

mshilov · Mar 5, 2014 · 68d0756 · 68d0756
1 parent bbcf41e
commit 68d0756
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 281 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,8 @@
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "zendframework/zendxml": "dev-master"
     },
     "require-dev": {
         "doctrine/annotations": ">=1.0",

diff --git a/library/Zend/Json/Json.php b/library/Zend/Json/Json.php
@@ -12,7 +12,7 @@
 use SimpleXMLElement;
 use Zend\Json\Exception\RecursionException;
 use Zend\Json\Exception\RuntimeException;
-use Zend\Xml\Security as XmlSecurity;
+use ZendXml\Security as XmlSecurity;
 
 /**
  * Class for encoding to and decoding from JSON.

diff --git a/library/Zend/Xml/Exception/ExceptionInterface.php b/library/Zend/Xml/Exception/ExceptionInterface.php
diff --git a/library/Zend/Xml/Exception/InvalidArgumentException.php b/library/Zend/Xml/Exception/InvalidArgumentException.php
diff --git a/library/Zend/Xml/Exception/RuntimeException.php b/library/Zend/Xml/Exception/RuntimeException.php
diff --git a/library/Zend/Xml/Security.php b/library/Zend/Xml/Security.php
diff --git a/library/Zend/XmlRpc/Fault.php b/library/Zend/XmlRpc/Fault.php
@@ -10,7 +10,7 @@
 namespace Zend\XmlRpc;
 
 use SimpleXMLElement;
-use Zend\Xml\Security as XmlSecurity;
+use ZendXml\Security as XmlSecurity;
 
 /**
  * XMLRPC Faults
@@ -182,7 +182,7 @@ public function loadXml($fault)
         $xmlErrorsFlag = libxml_use_internal_errors(true);
         try {
             $xml = XmlSecurity::scan($fault);
-        } catch (\Zend\Xml\Exception\RuntimeException $e) {
+        } catch (\ZendXml\Exception\RuntimeException $e) {
             // Unsecure XML
             throw new Exception\RuntimeException('Failed to parse XML fault: ' .  $e->getMessage(), 500, $e);
         }

diff --git a/library/Zend/XmlRpc/Response.php b/library/Zend/XmlRpc/Response.php
@@ -9,7 +9,7 @@
 
 namespace Zend\XmlRpc;
 
-use Zend\Xml\Security as XmlSecurity;
+use ZendXml\Security as XmlSecurity;
 
 /**
  * XmlRpc Response
@@ -155,7 +155,7 @@ public function loadXml($response)
 
         try {
             $xml = XmlSecurity::scan($response);
-        } catch (\Zend\Xml\Exception\RuntimeException $e) {
+        } catch (\ZendXml\Exception\RuntimeException $e) {
             $this->fault = new Fault(651);
             $this->fault->setEncoding($this->getEncoding());
             return false;

diff --git a/tests/ZendTest/Xml/SecurityTest.php b/tests/ZendTest/Xml/SecurityTest.php