Skip to content

Commit 48e1ec4

Browse files
sebastianbergmannsebastianbergmann
committed
Make autoloader function anonymous.
1 parent d711eb5 commit 48e1ec4

File tree

3 files changed

+55
-74
lines changed

3 files changed

+55
-74
lines changed

‎PHP/CodeCoverage/Autoload.php‎

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -47,53 +47,44 @@
4747
require_once 'PHP/Token/Stream/Autoload.php';
4848
require_once 'Text/Template/Autoload.php';
4949

50-
function php_codecoverage_autoload($class = NULL) {
51-
static $classes = NULL;
52-
static $path = NULL;
50+
spl_autoload_register(
51+
function ($class)
52+
{
53+
static $classes = NULL;
54+
static $path = NULL;
5355

54-
if ($classes === NULL) {
55-
$classes = array(
56-
'php_codecoverage' => '/CodeCoverage.php',
57-
'php_codecoverage_driver' => '/CodeCoverage/Driver.php',
58-
'php_codecoverage_driver_xdebug' => '/CodeCoverage/Driver/Xdebug.php',
59-
'php_codecoverage_exception' => '/CodeCoverage/Exception.php',
60-
'php_codecoverage_filter' => '/CodeCoverage/Filter.php',
61-
'php_codecoverage_report_clover' => '/CodeCoverage/Report/Clover.php',
62-
'php_codecoverage_report_factory' => '/CodeCoverage/Report/Factory.php',
63-
'php_codecoverage_report_html' => '/CodeCoverage/Report/HTML.php',
64-
'php_codecoverage_report_html_renderer' => '/CodeCoverage/Report/HTML/Renderer.php',
65-
'php_codecoverage_report_html_renderer_dashboard' => '/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
66-
'php_codecoverage_report_html_renderer_directory' => '/CodeCoverage/Report/HTML/Renderer/Directory.php',
67-
'php_codecoverage_report_html_renderer_file' => '/CodeCoverage/Report/HTML/Renderer/File.php',
68-
'php_codecoverage_report_node' => '/CodeCoverage/Report/Node.php',
69-
'php_codecoverage_report_node_directory' => '/CodeCoverage/Report/Node/Directory.php',
70-
'php_codecoverage_report_node_file' => '/CodeCoverage/Report/Node/File.php',
71-
'php_codecoverage_report_node_iterator' => '/CodeCoverage/Report/Node/Iterator.php',
72-
'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
73-
'php_codecoverage_report_text' => '/CodeCoverage/Report/Text.php',
74-
'php_codecoverage_util' => '/CodeCoverage/Util.php',
75-
'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php',
76-
'php_codecoverage_version' => '/CodeCoverage/Version.php'
77-
);
56+
if ($classes === NULL) {
57+
$classes = array(
58+
'php_codecoverage' => '/CodeCoverage.php',
59+
'php_codecoverage_driver' => '/CodeCoverage/Driver.php',
60+
'php_codecoverage_driver_xdebug' => '/CodeCoverage/Driver/Xdebug.php',
61+
'php_codecoverage_exception' => '/CodeCoverage/Exception.php',
62+
'php_codecoverage_filter' => '/CodeCoverage/Filter.php',
63+
'php_codecoverage_report_clover' => '/CodeCoverage/Report/Clover.php',
64+
'php_codecoverage_report_factory' => '/CodeCoverage/Report/Factory.php',
65+
'php_codecoverage_report_html' => '/CodeCoverage/Report/HTML.php',
66+
'php_codecoverage_report_html_renderer' => '/CodeCoverage/Report/HTML/Renderer.php',
67+
'php_codecoverage_report_html_renderer_dashboard' => '/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
68+
'php_codecoverage_report_html_renderer_directory' => '/CodeCoverage/Report/HTML/Renderer/Directory.php',
69+
'php_codecoverage_report_html_renderer_file' => '/CodeCoverage/Report/HTML/Renderer/File.php',
70+
'php_codecoverage_report_node' => '/CodeCoverage/Report/Node.php',
71+
'php_codecoverage_report_node_directory' => '/CodeCoverage/Report/Node/Directory.php',
72+
'php_codecoverage_report_node_file' => '/CodeCoverage/Report/Node/File.php',
73+
'php_codecoverage_report_node_iterator' => '/CodeCoverage/Report/Node/Iterator.php',
74+
'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
75+
'php_codecoverage_report_text' => '/CodeCoverage/Report/Text.php',
76+
'php_codecoverage_util' => '/CodeCoverage/Util.php',
77+
'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php',
78+
'php_codecoverage_version' => '/CodeCoverage/Version.php'
79+
);
7880

79-
$path = dirname(dirname(__FILE__));
80-
}
81+
$path = dirname(dirname(__FILE__));
82+
}
8183

82-
if ($class === NULL) {
83-
$result = array(__FILE__);
84+
$cn = strtolower($class);
8485

85-
foreach ($classes as $file) {
86-
$result[] = $path . $file;
87-
}
88-
89-
return $result;
90-
}
91-
92-
$cn = strtolower($class);
93-
94-
if (isset($classes[$cn])) {
95-
require $path . $classes[$cn];
96-
}
97-
}
98-
99-
spl_autoload_register('php_codecoverage_autoload');
86+
if (isset($classes[$cn])) {
87+
require $path . $classes[$cn];
88+
}
89+
}
90+
);

‎PHP/CodeCoverage/Autoload.php.in‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,24 @@ require_once 'File/Iterator/Autoload.php';
4747
require_once 'PHP/Token/Stream/Autoload.php';
4848
require_once 'Text/Template/Autoload.php';
4949

50-
function php_codecoverage_autoload($class = NULL) {
51-
static $classes = NULL;
52-
static $path = NULL;
50+
spl_autoload_register(
51+
function ($class)
52+
{
53+
static $classes = NULL;
54+
static $path = NULL;
5355

54-
if ($classes === NULL) {
55-
$classes = array(
56-
___CLASSLIST___
57-
);
56+
if ($classes === NULL) {
57+
$classes = array(
58+
___CLASSLIST___
59+
);
5860

59-
$path = dirname(dirname(__FILE__));
60-
}
61+
$path = dirname(dirname(__FILE__));
62+
}
6163

62-
if ($class === NULL) {
63-
$result = array(__FILE__);
64+
$cn = strtolower($class);
6465

65-
foreach ($classes as $file) {
66-
$result[] = $path . $file;
67-
}
68-
69-
return $result;
70-
}
71-
72-
$cn = strtolower($class);
73-
74-
if (isset($classes[$cn])) {
75-
require $path . $classes[$cn];
76-
}
77-
}
78-
79-
spl_autoload_register('php_codecoverage_autoload');
66+
if (isset($classes[$cn])) {
67+
require $path . $classes[$cn];
68+
}
69+
}
70+
);

‎build.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@
4444
<exec executable="phpab">
4545
<arg value="--output" />
4646
<arg path="PHP/CodeCoverage/Autoload.php" />
47-
<arg value="--compat" />
4847
<arg value="--template" />
4948
<arg path="PHP/CodeCoverage/Autoload.php.in" />
5049
<arg value="--indent" />
51-
<arg value=" " />
50+
<arg value=" " />
5251
<arg path="PHP" />
5352
</exec>
5453
</target>

0 commit comments

Comments
 (0)