Skip to content

Commit 99f0837

Browse files
committed
Make test line-trimming-resilient
1 parent b00e2f3 commit 99f0837

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

Zend/tests/optional_interfaces/dynamic_definition.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Dynamically defined interfaces only affect classes defined later
55

66
class AncientClass implements ?OptionalInterface {}
77
$ancientClass = new AncientClass;
8-
echo 'AC implements: '.implode(', ', class_implements('AncientClass')),"\n";
9-
echo 'AC object implements: '.implode(', ', class_implements($ancientClass)),"\n\n";
8+
echo 'AC implements:'.implode(', ', class_implements('AncientClass')),"\n";
9+
echo 'AC object implements:'.implode(', ', class_implements($ancientClass)),"\n\n";
1010

1111
eval('interface OptionalInterface {}');
1212
echo "Interface defined\n\n";
@@ -15,16 +15,16 @@ class NewClass implements ?OptionalInterface {}
1515

1616
// Newly defined class implements the interface
1717
$newClass = new NewClass;
18-
echo 'NC implements: '.implode(', ', class_implements('NewClass')),"\n";
19-
echo 'NC implements: '.implode(', ', class_implements($newClass)),"\n\n";
18+
echo 'NC implements:'.implode(', ', class_implements('NewClass')),"\n";
19+
echo 'NC implements:'.implode(', ', class_implements($newClass)),"\n\n";
2020

2121
// The old class doesn't
22-
echo 'AC object implements: '.implode(', ', class_implements($ancientClass)),"\n";
22+
echo 'AC object implements:'.implode(', ', class_implements($ancientClass)),"\n";
2323

24-
echo 'AC implements: '.implode(', ', class_implements('AncientClass')),"\n";
24+
echo 'AC implements:'.implode(', ', class_implements('AncientClass')),"\n";
2525

2626
$ancientClass2 = new AncientClass;
27-
echo 'New AC object implements: '.implode(', ', class_implements($ancientClass2)),"\n";
27+
echo 'New AC object implements:'.implode(', ', class_implements($ancientClass2)),"\n";
2828

2929
?>
3030
--EXPECT--
@@ -33,8 +33,8 @@ AC object implements:
3333

3434
Interface defined
3535

36-
NC implements: OptionalInterface
37-
NC implements: OptionalInterface
36+
NC implements:OptionalInterface
37+
NC implements:OptionalInterface
3838

3939
AC object implements:
4040
AC implements:

Zend/tests/optional_interfaces/optional_interfaces.phpt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ $classes = [
3131

3232
foreach ($classes as $class) {
3333
echo "$class\n";
34-
echo ' class implements '.implode(', ', class_implements($class))."\n";
35-
echo ' object implements '.implode(', ', class_implements(new $class))."\n";
34+
echo ' class implements:'.implode(', ', class_implements($class))."\n";
35+
echo ' object implements:'.implode(', ', class_implements(new $class))."\n";
3636
}
3737

3838
$interfaces = [
@@ -42,36 +42,36 @@ $interfaces = [
4242

4343
foreach ($interfaces as $interface) {
4444
echo "$interface\n";
45-
echo ' interface extends '.implode(', ', class_implements($class))."\n";
45+
echo ' interface extends:'.implode(', ', class_implements($class))."\n";
4646
}
4747

4848
?>
4949
--EXPECT--
5050
ImplementingOptionalInterface
51-
class implements ExistingInterface
52-
object implements ExistingInterface
51+
class implements:ExistingInterface
52+
object implements:ExistingInterface
5353
SkippingOptionalInterface
54-
class implements
55-
object implements
54+
class implements:
55+
object implements:
5656
MultipleOptionalsExistingFirst
57-
class implements ExistingInterface
58-
object implements ExistingInterface
57+
class implements:ExistingInterface
58+
object implements:ExistingInterface
5959
MultipleOptionalsExistingLast
60-
class implements ExistingInterface
61-
object implements ExistingInterface
60+
class implements:ExistingInterface
61+
object implements:ExistingInterface
6262
MixedOptionalFirst
63-
class implements ExistingInterface
64-
object implements ExistingInterface
63+
class implements:ExistingInterface
64+
object implements:ExistingInterface
6565
MixedOptionalLast
66-
class implements ExistingInterface
67-
object implements ExistingInterface
66+
class implements:ExistingInterface
67+
object implements:ExistingInterface
6868
ImplementsInheritedExisting
69-
class implements ExtendingExistingOptional, ExistingInterface
70-
object implements ExtendingExistingOptional, ExistingInterface
69+
class implements:ExtendingExistingOptional, ExistingInterface
70+
object implements:ExtendingExistingOptional, ExistingInterface
7171
ImplementsInheritedSkipped
72-
class implements ExtendingNonexistantOptional
73-
object implements ExtendingNonexistantOptional
72+
class implements:ExtendingNonexistantOptional
73+
object implements:ExtendingNonexistantOptional
7474
ExtendingExistingOptional
75-
interface extends ExtendingNonexistantOptional
75+
interface extends:ExtendingNonexistantOptional
7676
ExtendingNonexistantOptional
77-
interface extends ExtendingNonexistantOptional
77+
interface extends:ExtendingNonexistantOptional

0 commit comments

Comments
 (0)