Skip to content
This repository was archived by the owner on Feb 20, 2023. It is now read-only.

Commit efc85d6

Browse files
sebastianbergmannsebastianbergmann
committed
Make autoloader function anonymous.
1 parent cab48c8 commit efc85d6

File tree

3 files changed

+70
-93
lines changed

3 files changed

+70
-93
lines changed

‎PHPUnit/Framework/MockObject/Autoload.php‎

Lines changed: 52 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -42,70 +42,59 @@
4242
* @since File available since Release 1.1.0
4343
*/
4444

45-
function phpunit_mockobject_autoload($class = NULL) {
46-
static $classes = NULL;
47-
static $path = NULL;
45+
spl_autoload_register(
46+
function ($class)
47+
{
48+
static $classes = NULL;
49+
static $path = NULL;
4850

49-
if ($classes === NULL) {
50-
$classes = array(
51-
'phpunit_framework_mockobject_builder_identity' => '/Framework/MockObject/Builder/Identity.php',
52-
'phpunit_framework_mockobject_builder_invocationmocker' => '/Framework/MockObject/Builder/InvocationMocker.php',
53-
'phpunit_framework_mockobject_builder_match' => '/Framework/MockObject/Builder/Match.php',
54-
'phpunit_framework_mockobject_builder_methodnamematch' => '/Framework/MockObject/Builder/MethodNameMatch.php',
55-
'phpunit_framework_mockobject_builder_namespace' => '/Framework/MockObject/Builder/Namespace.php',
56-
'phpunit_framework_mockobject_builder_parametersmatch' => '/Framework/MockObject/Builder/ParametersMatch.php',
57-
'phpunit_framework_mockobject_builder_stub' => '/Framework/MockObject/Builder/Stub.php',
58-
'phpunit_framework_mockobject_generator' => '/Framework/MockObject/Generator.php',
59-
'phpunit_framework_mockobject_invocation' => '/Framework/MockObject/Invocation.php',
60-
'phpunit_framework_mockobject_invocation_object' => '/Framework/MockObject/Invocation/Object.php',
61-
'phpunit_framework_mockobject_invocation_static' => '/Framework/MockObject/Invocation/Static.php',
62-
'phpunit_framework_mockobject_invocationmocker' => '/Framework/MockObject/InvocationMocker.php',
63-
'phpunit_framework_mockobject_invokable' => '/Framework/MockObject/Invokable.php',
64-
'phpunit_framework_mockobject_matcher' => '/Framework/MockObject/Matcher.php',
65-
'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Framework/MockObject/Matcher/AnyInvokedCount.php',
66-
'phpunit_framework_mockobject_matcher_anyparameters' => '/Framework/MockObject/Matcher/AnyParameters.php',
67-
'phpunit_framework_mockobject_matcher_invocation' => '/Framework/MockObject/Matcher/Invocation.php',
68-
'phpunit_framework_mockobject_matcher_invokedatindex' => '/Framework/MockObject/Matcher/InvokedAtIndex.php',
69-
'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
70-
'phpunit_framework_mockobject_matcher_invokedcount' => '/Framework/MockObject/Matcher/InvokedCount.php',
71-
'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Framework/MockObject/Matcher/InvokedRecorder.php',
72-
'phpunit_framework_mockobject_matcher_methodname' => '/Framework/MockObject/Matcher/MethodName.php',
73-
'phpunit_framework_mockobject_matcher_parameters' => '/Framework/MockObject/Matcher/Parameters.php',
74-
'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Framework/MockObject/Matcher/StatelessInvocation.php',
75-
'phpunit_framework_mockobject_mockbuilder' => '/Framework/MockObject/MockBuilder.php',
76-
'phpunit_framework_mockobject_mockobject' => '/Framework/MockObject/MockObject.php',
77-
'phpunit_framework_mockobject_stub' => '/Framework/MockObject/Stub.php',
78-
'phpunit_framework_mockobject_stub_consecutivecalls' => '/Framework/MockObject/Stub/ConsecutiveCalls.php',
79-
'phpunit_framework_mockobject_stub_exception' => '/Framework/MockObject/Stub/Exception.php',
80-
'phpunit_framework_mockobject_stub_matchercollection' => '/Framework/MockObject/Stub/MatcherCollection.php',
81-
'phpunit_framework_mockobject_stub_return' => '/Framework/MockObject/Stub/Return.php',
82-
'phpunit_framework_mockobject_stub_returnargument' => '/Framework/MockObject/Stub/ReturnArgument.php',
83-
'phpunit_framework_mockobject_stub_returncallback' => '/Framework/MockObject/Stub/ReturnCallback.php',
84-
'phpunit_framework_mockobject_stub_returnself' => '/Framework/MockObject/Stub/ReturnSelf.php',
85-
'phpunit_framework_mockobject_stub_returnvaluemap' => '/Framework/MockObject/Stub/ReturnValueMap.php',
86-
'phpunit_framework_mockobject_verifiable' => '/Framework/MockObject/Verifiable.php'
87-
);
51+
if ($classes === NULL) {
52+
$classes = array(
53+
'phpunit_framework_mockobject_builder_identity' => '/Framework/MockObject/Builder/Identity.php',
54+
'phpunit_framework_mockobject_builder_invocationmocker' => '/Framework/MockObject/Builder/InvocationMocker.php',
55+
'phpunit_framework_mockobject_builder_match' => '/Framework/MockObject/Builder/Match.php',
56+
'phpunit_framework_mockobject_builder_methodnamematch' => '/Framework/MockObject/Builder/MethodNameMatch.php',
57+
'phpunit_framework_mockobject_builder_namespace' => '/Framework/MockObject/Builder/Namespace.php',
58+
'phpunit_framework_mockobject_builder_parametersmatch' => '/Framework/MockObject/Builder/ParametersMatch.php',
59+
'phpunit_framework_mockobject_builder_stub' => '/Framework/MockObject/Builder/Stub.php',
60+
'phpunit_framework_mockobject_generator' => '/Framework/MockObject/Generator.php',
61+
'phpunit_framework_mockobject_invocation' => '/Framework/MockObject/Invocation.php',
62+
'phpunit_framework_mockobject_invocation_object' => '/Framework/MockObject/Invocation/Object.php',
63+
'phpunit_framework_mockobject_invocation_static' => '/Framework/MockObject/Invocation/Static.php',
64+
'phpunit_framework_mockobject_invocationmocker' => '/Framework/MockObject/InvocationMocker.php',
65+
'phpunit_framework_mockobject_invokable' => '/Framework/MockObject/Invokable.php',
66+
'phpunit_framework_mockobject_matcher' => '/Framework/MockObject/Matcher.php',
67+
'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Framework/MockObject/Matcher/AnyInvokedCount.php',
68+
'phpunit_framework_mockobject_matcher_anyparameters' => '/Framework/MockObject/Matcher/AnyParameters.php',
69+
'phpunit_framework_mockobject_matcher_invocation' => '/Framework/MockObject/Matcher/Invocation.php',
70+
'phpunit_framework_mockobject_matcher_invokedatindex' => '/Framework/MockObject/Matcher/InvokedAtIndex.php',
71+
'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
72+
'phpunit_framework_mockobject_matcher_invokedcount' => '/Framework/MockObject/Matcher/InvokedCount.php',
73+
'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Framework/MockObject/Matcher/InvokedRecorder.php',
74+
'phpunit_framework_mockobject_matcher_methodname' => '/Framework/MockObject/Matcher/MethodName.php',
75+
'phpunit_framework_mockobject_matcher_parameters' => '/Framework/MockObject/Matcher/Parameters.php',
76+
'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Framework/MockObject/Matcher/StatelessInvocation.php',
77+
'phpunit_framework_mockobject_mockbuilder' => '/Framework/MockObject/MockBuilder.php',
78+
'phpunit_framework_mockobject_mockobject' => '/Framework/MockObject/MockObject.php',
79+
'phpunit_framework_mockobject_stub' => '/Framework/MockObject/Stub.php',
80+
'phpunit_framework_mockobject_stub_consecutivecalls' => '/Framework/MockObject/Stub/ConsecutiveCalls.php',
81+
'phpunit_framework_mockobject_stub_exception' => '/Framework/MockObject/Stub/Exception.php',
82+
'phpunit_framework_mockobject_stub_matchercollection' => '/Framework/MockObject/Stub/MatcherCollection.php',
83+
'phpunit_framework_mockobject_stub_return' => '/Framework/MockObject/Stub/Return.php',
84+
'phpunit_framework_mockobject_stub_returnargument' => '/Framework/MockObject/Stub/ReturnArgument.php',
85+
'phpunit_framework_mockobject_stub_returncallback' => '/Framework/MockObject/Stub/ReturnCallback.php',
86+
'phpunit_framework_mockobject_stub_returnself' => '/Framework/MockObject/Stub/ReturnSelf.php',
87+
'phpunit_framework_mockobject_stub_returnvaluemap' => '/Framework/MockObject/Stub/ReturnValueMap.php',
88+
'phpunit_framework_mockobject_verifiable' => '/Framework/MockObject/Verifiable.php'
89+
);
8890

89-
$path = dirname(dirname(dirname(__FILE__)));
90-
}
91+
$path = dirname(dirname(dirname(__FILE__)));
92+
}
9193

92-
if ($class === NULL) {
93-
$result = array(__FILE__);
94+
$cn = strtolower($class);
9495

95-
foreach ($classes as $file) {
96-
$result[] = $path . $file;
97-
}
98-
99-
return $result;
100-
}
101-
102-
$cn = strtolower($class);
103-
104-
if (isset($classes[$cn])) {
105-
$file = $path . $classes[$cn];
106-
107-
require $file;
108-
}
109-
}
110-
111-
spl_autoload_register('phpunit_mockobject_autoload');
96+
if (isset($classes[$cn])) {
97+
require $path . $classes[$cn];
98+
}
99+
}
100+
);

‎PHPUnit/Framework/MockObject/Autoload.php.in‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,24 @@
4242
* @since File available since Release 1.1.0
4343
*/
4444

45-
function phpunit_mockobject_autoload($class = NULL) {
46-
static $classes = NULL;
47-
static $path = NULL;
45+
spl_autoload_register(
46+
function ($class)
47+
{
48+
static $classes = NULL;
49+
static $path = NULL;
4850

49-
if ($classes === NULL) {
50-
$classes = array(
51-
___CLASSLIST___
52-
);
51+
if ($classes === NULL) {
52+
$classes = array(
53+
___CLASSLIST___
54+
);
5355

54-
$path = dirname(dirname(dirname(__FILE__)));
55-
}
56+
$path = dirname(dirname(dirname(__FILE__)));
57+
}
5658

57-
if ($class === NULL) {
58-
$result = array(__FILE__);
59+
$cn = strtolower($class);
5960

60-
foreach ($classes as $file) {
61-
$result[] = $path . $file;
62-
}
63-
64-
return $result;
65-
}
66-
67-
$cn = strtolower($class);
68-
69-
if (isset($classes[$cn])) {
70-
$file = $path . $classes[$cn];
71-
72-
require $file;
73-
}
74-
}
75-
76-
spl_autoload_register('phpunit_mockobject_autoload');
61+
if (isset($classes[$cn])) {
62+
require $path . $classes[$cn];
63+
}
64+
}
65+
);

‎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="PHPUnit/Framework/MockObject/Autoload.php" />
47-
<arg value="--compat" />
4847
<arg value="--template" />
4948
<arg path="PHPUnit/Framework/MockObject/Autoload.php.in" />
5049
<arg value="--indent" />
51-
<arg value=" " />
50+
<arg value=" " />
5251
<arg path="PHPUnit" />
5352
</exec>
5453
</target>

0 commit comments

Comments
 (0)