--- 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 @@ +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];