Make test line-trimming-resilient

Author: tontonsb

Zend/tests/optional_interfaces/dynamic_definition.phpt

@@ -5,8 +5,8 @@ Dynamically defined interfaces only affect classes defined later
 
 class AncientClass implements ?OptionalInterface {}
 $ancientClass = new AncientClass;
-echo 'AC implements: '.implode(', ', class_implements('AncientClass')),"\n";
-echo 'AC object implements: '.implode(', ', class_implements($ancientClass)),"\n\n";
+echo 'AC implements:'.implode(', ', class_implements('AncientClass')),"\n";
+echo 'AC object implements:'.implode(', ', class_implements($ancientClass)),"\n\n";
 
 eval('interface OptionalInterface {}');
 echo "Interface defined\n\n";
@@ -15,16 +15,16 @@ class NewClass implements ?OptionalInterface {}
 
 // Newly defined class implements the interface
 $newClass = new NewClass;
-echo 'NC implements: '.implode(', ', class_implements('NewClass')),"\n";
-echo 'NC implements: '.implode(', ', class_implements($newClass)),"\n\n";
+echo 'NC implements:'.implode(', ', class_implements('NewClass')),"\n";
+echo 'NC implements:'.implode(', ', class_implements($newClass)),"\n\n";
 
 // The old class doesn't
-echo 'AC object implements: '.implode(', ', class_implements($ancientClass)),"\n";
+echo 'AC object implements:'.implode(', ', class_implements($ancientClass)),"\n";
 
-echo 'AC implements: '.implode(', ', class_implements('AncientClass')),"\n";
+echo 'AC implements:'.implode(', ', class_implements('AncientClass')),"\n";
 
 $ancientClass2 = new AncientClass;
-echo 'New AC object implements: '.implode(', ', class_implements($ancientClass2)),"\n";
+echo 'New AC object implements:'.implode(', ', class_implements($ancientClass2)),"\n";
 
 ?>
 --EXPECT--
@@ -33,8 +33,8 @@ AC object implements:
 
 Interface defined
 
-NC implements: OptionalInterface
-NC implements: OptionalInterface
+NC implements:OptionalInterface
+NC implements:OptionalInterface
 
 AC object implements:
 AC implements:

Zend/tests/optional_interfaces/optional_interfaces.phpt

@@ -31,8 +31,8 @@ $classes = [
 
 foreach ($classes as $class) {
     echo "$class\n";
-    echo '    class implements '.implode(', ', class_implements($class))."\n";
-    echo '    object implements '.implode(', ', class_implements(new $class))."\n";
+    echo '    class implements:'.implode(', ', class_implements($class))."\n";
+    echo '    object implements:'.implode(', ', class_implements(new $class))."\n";
 }
 
 $interfaces = [
@@ -42,36 +42,36 @@ $interfaces = [
 
 foreach ($interfaces as $interface) {
     echo "$interface\n";
-    echo '    interface extends '.implode(', ', class_implements($class))."\n";
+    echo '    interface extends:'.implode(', ', class_implements($class))."\n";
 }
 
 ?>
 --EXPECT--
 ImplementingOptionalInterface
-    class implements ExistingInterface
-    object implements ExistingInterface
+    class implements:ExistingInterface
+    object implements:ExistingInterface
 SkippingOptionalInterface
-    class implements
-    object implements
+    class implements:
+    object implements:
 MultipleOptionalsExistingFirst
-    class implements ExistingInterface
-    object implements ExistingInterface
+    class implements:ExistingInterface
+    object implements:ExistingInterface
 MultipleOptionalsExistingLast
-    class implements ExistingInterface
-    object implements ExistingInterface
+    class implements:ExistingInterface
+    object implements:ExistingInterface
 MixedOptionalFirst
-    class implements ExistingInterface
-    object implements ExistingInterface
+    class implements:ExistingInterface
+    object implements:ExistingInterface
 MixedOptionalLast
-    class implements ExistingInterface
-    object implements ExistingInterface
+    class implements:ExistingInterface
+    object implements:ExistingInterface
 ImplementsInheritedExisting
-    class implements ExtendingExistingOptional, ExistingInterface
-    object implements ExtendingExistingOptional, ExistingInterface
+    class implements:ExtendingExistingOptional, ExistingInterface
+    object implements:ExtendingExistingOptional, ExistingInterface
 ImplementsInheritedSkipped
-    class implements ExtendingNonexistantOptional
-    object implements ExtendingNonexistantOptional
+    class implements:ExtendingNonexistantOptional
+    object implements:ExtendingNonexistantOptional
 ExtendingExistingOptional
-    interface extends ExtendingNonexistantOptional
+    interface extends:ExtendingNonexistantOptional
 ExtendingNonexistantOptional
-    interface extends ExtendingNonexistantOptional
+    interface extends:ExtendingNonexistantOptional