X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=ZendFramework-deps.patch;h=06066ff4a95f5999cf6372d7b6e52a974a24a6ba;hb=5fa931291b949e004ace6c59baa86134e148295a;hp=0f1d25c226df56bd3fb828b071491539201a1f3b;hpb=7ae13fb980538eeb4db6f7d51e5310490ff1d9ca;p=packages%2FZendFramework.git

diff --git a/ZendFramework-deps.patch b/ZendFramework-deps.patch
index 0f1d25c..06066ff 100644
--- a/ZendFramework-deps.patch
+++ b/ZendFramework-deps.patch
@@ -1,14 +1,3 @@
---- ZendFramework-1.7.6/library/Zend/Gdata/YouTube.php~	2009-03-10 22:11:26.000000000 +0200
-+++ ZendFramework-1.7.6/library/Zend/Gdata/YouTube.php	2009-03-10 22:13:01.898984500 +0200
-@@ -687,7 +687,7 @@
-     public function getFriendActivityForCurrentUser()
-     {
-         if (!$this->isAuthenticated()) {
--            require_once 'Zend/Gdata/YouTube/App/Exception.php';
-+            require_once 'Zend/Gdata/App/Exception.php';
-             throw new Zend_Gdata_App_Exception('You must be authenticated to ' .
-                 'use the getFriendActivityForCurrentUser function in Zend_' .
-                 'Gdata_YouTube.');
 --- ZendFramework-1.7.6/library/Zend/Service/Audioscrobbler/Exception.php~	2009-03-10 22:15:39.811374312 +0200
 +++ ZendFramework-1.7.6/library/Zend/Service/Audioscrobbler/Exception.php	2009-03-10 22:15:31.689629002 +0200
 @@ -0,0 +1,32 @@
@@ -44,3 +33,69 @@
 +class Zend_Service_Audioscrobbler_Exception extends Exception
 +{
 +}
+--- ZendFramework-1.12.15/library/Zend/Xml/Security.php~	2015-08-17 14:18:52.000000000 +0300
++++ ZendFramework-1.12.15/library/Zend/Xml/Security.php	2015-08-17 14:19:42.795236199 +0300
+@@ -40,6 +40,7 @@
+     {
+         foreach (self::getEntityComparison($xml) as $compare) {
+             if (strpos($xml, $compare) !== false) {
++                require_once 'Zend/Xml/Exception.php';
+                 throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+             }
+         }
+@@ -96,7 +96,7 @@
+             foreach ($dom->childNodes as $child) {
+                 if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+                     if ($child->entities->length > 0) {
+-                        require_once 'Exception.php';
++                        require_once 'Zend/Xml/Exception.php';
+                         throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+                     }
+                 }
+@@ -130,7 +130,7 @@
+     public static function scanFile($file, DOMDocument $dom = null)
+     {
+         if (!file_exists($file)) {
+-            require_once 'Exception.php';
++            require_once 'Zend/Xml/Exception.php';
+             throw new Zend_Xml_Exception(
+                 "The file $file specified doesn't exist"
+             );
+--- ZendFramework-1.12.11/library/Zend/Loader/AutoloaderFactory.php~	2015-04-29 18:13:53.000000000 +0300
++++ ZendFramework-1.12.11/library/Zend/Loader/AutoloaderFactory.php	2015-04-29 18:20:50.748094112 +0300
+@@ -82,7 +82,7 @@
+         }
+ 
+         if (!is_array($options) && !($options instanceof Traversable)) {
+-            require_once 'Exception/InvalidArgumentException.php';
++            require_once 'Zend/Loader/Exception/InvalidArgumentException.php';
+             throw new Zend_Loader_Exception_InvalidArgumentException(
+                 'Options provided must be an array or Traversable'
+             );
+@@ -105,7 +105,7 @@
+                 // Autoload with standard autoloader
+                 $autoloader = self::getStandardAutoloader();
+                 if (!class_exists($class) && !$autoloader->autoload($class)) {
+-                    require_once 'Exception/InvalidArgumentException.php';
++                    require_once 'Zend/Loader/Exception/InvalidArgumentException.php';
+                     throw new Zend_Loader_Exception_InvalidArgumentException(sprintf(
+                         'Autoloader class "%s" not loaded', 
+                         $class
+@@ -116,7 +116,7 @@
+                 // additionally instanceof is also broken for this use case
+                 if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+                         if (!is_subclass_of($class, 'Zend_Loader_SplAutoloader')) {
+-                        require_once 'Exception/InvalidArgumentException.php';
++                        require_once 'Zend/Loader/Exception/InvalidArgumentException.php';
+                         throw new Zend_Loader_Exception_InvalidArgumentException(sprintf(
+                             'Autoloader class %s must implement Zend\\Loader\\SplAutoloader', 
+                             $class
+@@ -159,7 +159,7 @@
+     public static function getRegisteredAutoloader($class)
+     {
+         if (!isset(self::$loaders[$class])) {
+-            require_once 'Exception/InvalidArgumentException.php';
++            require_once 'Zend/Loader/Exception/InvalidArgumentException.php';
+             throw new Zend_Loader_Exception_InvalidArgumentException(sprintf('Autoloader class "%s" not loaded', $class));
+         }
+         return self::$loaders[$class];