Permalink
Browse files

Merge branch '3.6'

  • Loading branch information...
2 parents 023b0fc + 784fa73 commit e4743029a8a8be7238511a636bb28ceca6e688c3 @sebastianbergmann committed Jun 13, 2012
Showing with 10 additions and 2 deletions.
  1. +5 −1 PHPUnit/Autoload.php
  2. +5 −1 PHPUnit/Autoload.php.in
View
@@ -212,7 +212,11 @@ function phpunit_autoload($class = NULL)
require_once 'PHPUnit/Extensions/Database/Autoload.php';
}
-if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumTestCase/Autoload.php')) {
+if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumCommon/Autoload.php')) {
+ require_once 'PHPUnit/Extensions/SeleniumCommon/Autoload.php';
+}
+
+else if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumTestCase/Autoload.php')) {
require_once 'PHPUnit/Extensions/SeleniumTestCase/Autoload.php';
}
View
@@ -95,7 +95,11 @@ if (stream_resolve_include_path('PHPUnit/Extensions/Database/Autoload.php')) {
require_once 'PHPUnit/Extensions/Database/Autoload.php';
}
-if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumTestCase/Autoload.php')) {
+if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumCommon/Autoload.php')) {
+ require_once 'PHPUnit/Extensions/SeleniumCommon/Autoload.php';
+}
+
+else if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumTestCase/Autoload.php')) {
require_once 'PHPUnit/Extensions/SeleniumTestCase/Autoload.php';
}

0 comments on commit e474302

Please sign in to comment.