Use https urls

[packages/ZendFramework.git] / ZendFramework-deps.patch

diff --git a/ZendFramework-deps.patch b/ZendFramework-deps.patch
index e5f84e176b1f5f8b207b34a24f71107fa2e226d4..06066ff4a95f5999cf6372d7b6e52a974a24a6ba 100644 (file)
--- a/ZendFramework-deps.patch
+++ b/ZendFramework-deps.patch
@@ -33,17 +33,16 @@
 +class Zend_Service_Audioscrobbler_Exception extends Exception
 +{
 +}
---- ZendFramework-1.12.4/library/Zend/Xml/Security.php~        2014-05-19 22:41:57.000000000 +0300
-+++ ZendFramework-1.12.4/library/Zend/Xml/Security.php 2014-05-19 23:12:43.208009810 +0300
-@@ -39,7 +39,7 @@
-     protected static function heuristicScan($xml)
+--- 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 @@
      {
-         if (strpos($xml, '<!ENTITY') !== false) {
--            require_once 'Exception.php';
-+            require_once 'Zend/Xml/Exception.php';
-             throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+         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) {
@@ -62,3 +61,41 @@
              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];