]> git.pld-linux.org Git - packages/ZendFramework.git/commitdiff
fix paths for dependency generator
authorElan Ruusamäe <glen@delfi.ee>
Wed, 29 Apr 2015 15:24:01 +0000 (18:24 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 29 Apr 2015 15:24:01 +0000 (18:24 +0300)
ZendFramework-deps.patch

index e5f84e176b1f5f8b207b34a24f71107fa2e226d4..c24fb4761c79b7fe5fca0719127192e17924dc03 100644 (file)
              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];
This page took 0.057308 seconds and 4 git commands to generate.