From 483d2551eaea6ffc3f7e13c8ea9c3ea215fadff0 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 8 Oct 2014 15:24:19 +0200 Subject: get rid of simplepie absolute url function and use Net url2 --- tests/classloader.php | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/classloader.php b/tests/classloader.php index ef3849849..c7a8b9f4d 100644 --- a/tests/classloader.php +++ b/tests/classloader.php @@ -13,24 +13,25 @@ require_once __DIR__ . '/../3rdparty/ZendXml/vendor/autoload.php'; require_once __DIR__ . '/../3rdparty/simplepie/autoloader.php'; +require_once __DIR__ . '/../3rdparty/Net_URL2/Net/URL2.php'; require_once __DIR__ . '/../../../tests/lib/appframework/db/mappertestutility.php'; // to execute without owncloud, we need to create our own classloader spl_autoload_register(function ($className){ - if (strpos($className, 'OCA\\') === 0) { + if (strpos($className, 'OCA\\') === 0) { - $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); - $relPath = __DIR__ . '/../..' . $path; + $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + $relPath = __DIR__ . '/../..' . $path; - if(file_exists($relPath)){ - require_once $relPath; - } - } else if(strpos($className, 'OCP\\') === 0) { - $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); - $relPath = __DIR__ . '/../../../lib/public' . $path; + if(file_exists($relPath)){ + require_once $relPath; + } + } else if(strpos($className, 'OCP\\') === 0) { + $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + $relPath = __DIR__ . '/../../../lib/public' . $path; - if(file_exists($relPath)){ - require_once $relPath; - } - } + if(file_exists($relPath)){ + require_once $relPath; + } + } }); \ No newline at end of file -- cgit v1.2.3