From a33a959b0f6c56f441b53f1ce8b5f66d19c8d1ae Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Tue, 29 Sep 2009 13:31:05 -0400 Subject: [PATCH] These test suites need to not throw warnings when autoloading, so use the same logic we do in Horde_Autoloader. Also include PHPUnit/Framework.php. --- framework/Db/test/Horde/Db/AllTests.php | 2 +- framework/Injector/test/Horde/Injector/AllTests.php | 2 +- framework/Yaml/test/Horde/Yaml/AllTests.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/Db/test/Horde/Db/AllTests.php b/framework/Db/test/Horde/Db/AllTests.php index 52c586803..33a1dc369 100644 --- a/framework/Db/test/Horde/Db/AllTests.php +++ b/framework/Db/test/Horde/Db/AllTests.php @@ -47,7 +47,7 @@ class Horde_Db_AllTests { // Set up include_path and autoloading set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path()); if (!spl_autoload_functions()) { - spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); + spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); $er = error_reporting(22525); include "$filename.php"; error_reporting($er);')); } // Build the suite diff --git a/framework/Injector/test/Horde/Injector/AllTests.php b/framework/Injector/test/Horde/Injector/AllTests.php index 0bbbf8726..666f5076e 100644 --- a/framework/Injector/test/Horde/Injector/AllTests.php +++ b/framework/Injector/test/Horde/Injector/AllTests.php @@ -21,7 +21,7 @@ class Horde_Injector_AllTests public static function suite() { if (!spl_autoload_functions()) { - spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); + spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); $er = error_reporting(22525); include "$filename.php"; error_reporting($er);')); } set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path()); diff --git a/framework/Yaml/test/Horde/Yaml/AllTests.php b/framework/Yaml/test/Horde/Yaml/AllTests.php index 2f2924a6f..e42149a19 100644 --- a/framework/Yaml/test/Horde/Yaml/AllTests.php +++ b/framework/Yaml/test/Horde/Yaml/AllTests.php @@ -13,7 +13,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'Horde_Yaml_AllTests::main'); } -require_once 'PHPUnit/Framework/TestSuite.php'; +require_once 'PHPUnit/Framework.php'; require_once 'PHPUnit/TextUI/TestRunner.php'; /** @@ -36,7 +36,7 @@ class Horde_Yaml_AllTests { // Set up autoload set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path()); if (!spl_autoload_functions()) { - spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); + spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); $er = error_reporting(22525); include "$filename.php"; error_reporting($er);')); } // Test helpers -- 2.11.0