Fix viral parse error.

diff --git a/framework/Argv/test/Horde/Argv/AllTests.php b/framework/Argv/test/Horde/Argv/AllTests.php
index e8b56f1..a97d8f6 100644 (file)
--- a/framework/Argv/test/Horde/Argv/AllTests.php
+++ b/framework/Argv/test/Horde/Argv/AllTests.php
@@ -40,9 +40,9 @@ class Horde_Argv_AllTests {
         error_reporting(E_ALL | E_STRICT);
 
         // Set up autoload
-        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         // Test base classes and helper objects

diff --git a/framework/Constraint/test/Horde/Constraint/AllTests.php b/framework/Constraint/test/Horde/Constraint/AllTests.php
index 02333c4..cef8231 100644 (file)
--- a/framework/Constraint/test/Horde/Constraint/AllTests.php
+++ b/framework/Constraint/test/Horde/Constraint/AllTests.php
@@ -20,10 +20,11 @@ class Horde_Constraint_AllTests
 
     public static function suite()
     {
+        // Set up autoload
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
-        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Constraint');
 

diff --git a/framework/Controller/test/Horde/Controller/AllTests.php b/framework/Controller/test/Horde/Controller/AllTests.php
index a366d50..841f3c6 100644 (file)
--- a/framework/Controller/test/Horde/Controller/AllTests.php
+++ b/framework/Controller/test/Horde/Controller/AllTests.php
@@ -37,9 +37,10 @@ class Horde_Controller_AllTests {
 
     public static function suite()
     {
+        // Set up autoload
         set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Controller');

diff --git a/framework/Date/test/Horde/Date/AllTests.php b/framework/Date/test/Horde/Date/AllTests.php
index 302deaf..4c884e9 100644 (file)
--- a/framework/Date/test/Horde/Date/AllTests.php
+++ b/framework/Date/test/Horde/Date/AllTests.php
@@ -23,9 +23,10 @@ class Horde_Date_AllTests {
 
     public static function suite()
     {
+        // Set up autoload
         set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Date');

diff --git a/framework/Db/test/Horde/Db/AllTests.php b/framework/Db/test/Horde/Db/AllTests.php
index 2c035ba..d84cf29 100644 (file)
--- a/framework/Db/test/Horde/Db/AllTests.php
+++ b/framework/Db/test/Horde/Db/AllTests.php
@@ -44,10 +44,10 @@ class Horde_Db_AllTests {
         // Ensure a default timezone is set.
         date_default_timezone_set('America/New_York');
 
-        // Set up include_path and autoloading
-        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        // Set up autoload
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); $er = error_reporting(22525); include "$filename.php"; error_reporting($er);'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         // Build the suite

diff --git a/framework/Feed/test/Horde/Feed/AllTests.php b/framework/Feed/test/Horde/Feed/AllTests.php
index 016b6e1..0c4fc14 100644 (file)
--- a/framework/Feed/test/Horde/Feed/AllTests.php
+++ b/framework/Feed/test/Horde/Feed/AllTests.php
@@ -20,8 +20,10 @@ class Horde_Feed_AllTests
 
     public static function suite()
     {
+        // Set up autoload
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Feed');

diff --git a/framework/Http/test/Horde/Http/AllTests.php b/framework/Http/test/Horde/Http/AllTests.php
index 1c18ab8..fa9e6b5 100644 (file)
--- a/framework/Http/test/Horde/Http/AllTests.php
+++ b/framework/Http/test/Horde/Http/AllTests.php
@@ -23,9 +23,10 @@ class Horde_Http_AllTests
 
     public static function suite()
     {
+        // Set up autoload
         set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Http');

diff --git a/framework/Injector/test/Horde/Injector/AllTests.php b/framework/Injector/test/Horde/Injector/AllTests.php
index 5f97f04..fa64bf2 100644 (file)
--- a/framework/Injector/test/Horde/Injector/AllTests.php
+++ b/framework/Injector/test/Horde/Injector/AllTests.php
@@ -20,10 +20,11 @@ class Horde_Injector_AllTests
 
     public static function suite()
     {
+        // Set up autoload
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); $er = error_reporting(22525); include "$filename.php"; error_reporting($er);'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
-        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Injector');
 

diff --git a/framework/Log/test/Horde/Log/AllTests.php b/framework/Log/test/Horde/Log/AllTests.php
index 1735d11..0abfe3f 100644 (file)
--- a/framework/Log/test/Horde/Log/AllTests.php
+++ b/framework/Log/test/Horde/Log/AllTests.php
@@ -39,10 +39,11 @@ class Horde_Log_AllTests
 
     public static function suite()
     {
+        // Set up autoload
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
-        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
 
         $suite = new PHPUnit_Framework_TestSuite('Horde_Log');
 

diff --git a/framework/Pdf/test/Horde/Pdf/AllTests.php b/framework/Pdf/test/Horde/Pdf/AllTests.php
index fd81034..176051d 100644 (file)
--- a/framework/Pdf/test/Horde/Pdf/AllTests.php
+++ b/framework/Pdf/test/Horde/Pdf/AllTests.php
@@ -31,9 +31,10 @@ class Horde_Pdf_AllTests
 
     public static function suite()
     {
-        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        // Set up autoload
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Pdf');

diff --git a/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php b/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
index 1094d66..4377489 100644 (file)
--- a/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
+++ b/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
@@ -31,9 +31,9 @@ class Horde_Stream_Filter_AllTests
         error_reporting(E_ALL | E_STRICT);
 
         // Set up autoload
-        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Stream_Filter');

diff --git a/framework/Support/test/Horde/Support/AllTests.php b/framework/Support/test/Horde/Support/AllTests.php
index 5f65318..a07e87e 100644 (file)
--- a/framework/Support/test/Horde/Support/AllTests.php
+++ b/framework/Support/test/Horde/Support/AllTests.php
@@ -23,9 +23,10 @@ class Horde_Support_AllTests {
 
     public static function suite()
     {
+        // Set up autoload
         set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Support');

diff --git a/framework/View/test/Horde/View/AllTests.php b/framework/View/test/Horde/View/AllTests.php
index 736e067..fba118a 100644 (file)
--- a/framework/View/test/Horde/View/AllTests.php
+++ b/framework/View/test/Horde/View/AllTests.php
@@ -31,9 +31,9 @@ class Horde_View_AllTests {
         date_default_timezone_set('America/New_York');
 
         // Set up autoload
-        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); include "$filename.php";'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         // Build the suite

diff --git a/framework/Yaml/test/Horde/Yaml/AllTests.php b/framework/Yaml/test/Horde/Yaml/AllTests.php
index 35fe686..021dca4 100644 (file)
--- a/framework/Yaml/test/Horde/Yaml/AllTests.php
+++ b/framework/Yaml/test/Horde/Yaml/AllTests.php
@@ -34,9 +34,9 @@ class Horde_Yaml_AllTests {
         error_reporting(E_ALL | E_STRICT);
 
         // Set up autoload
-        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path());
         if (!spl_autoload_functions()) {
-            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\', \'_\'), \'/\', $class); $er = error_reporting(22525); include "$filename.php"; error_reporting($er);'));
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'\\\\\', \'_\'), \'/\', $class); include "$filename.php";'));
         }
 
         // Test helpers