Skip to content

Change autoloader to be compatible with PHP 8.2+ #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amulet1 wants to merge 1 commit into
base: FRAMEWORK_6_0
Choose a base branch
from
+13 −9
Open

Change autoloader to be compatible with PHP 8.2+ #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/Horde/Test/Autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public static function init()
spl_autoload_register(
function($class) {
$filename = Horde_Test_Autoload::resolve($class);
$err_mask = error_reporting() & ~E_WARNING;
$old_err = error_reporting($err_mask);
include "$filename.php";
error_reporting($old_err);
$path = stream_resolve_include_path($filename);
if ($path) {
include $path;
}
},
true,
true
Expand Down
14 changes: 9 additions & 5 deletions lib/Horde/Test/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public static function bootstrap($dir, $no_autoload = false)
* We can safely move this before the runonce check
* as it will not load the same autoload file twice
*/

if (!$no_autoload) {
// Find composer autoloader if possible
$path = __DIR__;
Expand All @@ -64,12 +65,15 @@ public static function bootstrap($dir, $no_autoload = false)
while ($base != '/' && basename($base) != 'Horde') {
$base = dirname($base);
}
$base = dirname($base);
if ($base) {
set_include_path(
$base . PATH_SEPARATOR . $base . '/../lib' . PATH_SEPARATOR . get_include_path()
);
if ($base && $base != '/') {
$include = dirname($base);
$include2 = dirname($include) . '/lib';
if ($include != $include2) {
$include .= PATH_SEPARATOR . $include2;
}
set_include_path($include . PATH_SEPARATOR . get_include_path());
}

if (!class_exists(\Horde_Test_Autoload::class)) {
require_once 'Horde/Test/Autoload.php';
}
Expand Down