diff options
Diffstat (limited to 'Zend/tests/traits')
59 files changed, 43 insertions, 73 deletions
diff --git a/Zend/tests/traits/bug55554a.phpt b/Zend/tests/traits/bug55554a.phpt index b92a81f54f..dd844ba661 100644 --- a/Zend/tests/traits/bug55554a.phpt +++ b/Zend/tests/traits/bug55554a.phpt @@ -28,7 +28,6 @@ $o = new NewConstructor; echo "Legacy constructor: "; $o = new LegacyConstructor; - --EXPECT-- New constructor: ctor executed Legacy constructor: ctor executed diff --git a/Zend/tests/traits/bug55554b.phpt b/Zend/tests/traits/bug55554b.phpt index cf2eadf2f8..65ecb7adaf 100644 --- a/Zend/tests/traits/bug55554b.phpt +++ b/Zend/tests/traits/bug55554b.phpt @@ -46,8 +46,6 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- OverridingIsSilent1 __construct @@ -55,4 +53,3 @@ Deprecated: Methods with the same name as their class will not be constructors i OverridingIsSilent2 OverridingIsSilent2 Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d - diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt index dd224675bc..ddb6e66d19 100644 --- a/Zend/tests/traits/bug55554c.phpt +++ b/Zend/tests/traits/bug55554c.phpt @@ -40,7 +40,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- ReportCollision: New constructor executed diff --git a/Zend/tests/traits/bug55554d.phpt b/Zend/tests/traits/bug55554d.phpt index 10f2e2952d..88564a83c1 100644 --- a/Zend/tests/traits/bug55554d.phpt +++ b/Zend/tests/traits/bug55554d.phpt @@ -25,8 +25,5 @@ class ReportCollision { } $o = new ReportCollision; - --EXPECTF-- - Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d - diff --git a/Zend/tests/traits/bug55554e.phpt b/Zend/tests/traits/bug55554e.phpt index 5db508fc85..ed1c324831 100644 --- a/Zend/tests/traits/bug55554e.phpt +++ b/Zend/tests/traits/bug55554e.phpt @@ -24,7 +24,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- -Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d
\ No newline at end of file +Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d diff --git a/Zend/tests/traits/bug55554f.phpt b/Zend/tests/traits/bug55554f.phpt index 31f5f534c5..d7d4fc007d 100644 --- a/Zend/tests/traits/bug55554f.phpt +++ b/Zend/tests/traits/bug55554f.phpt @@ -23,7 +23,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- -Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
\ No newline at end of file +Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d diff --git a/Zend/tests/traits/bug55554g.phpt b/Zend/tests/traits/bug55554g.phpt index 662140cec0..d7de8216b0 100644 --- a/Zend/tests/traits/bug55554g.phpt +++ b/Zend/tests/traits/bug55554g.phpt @@ -23,7 +23,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- -Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
\ No newline at end of file +Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d diff --git a/Zend/tests/traits/bug60153.phpt b/Zend/tests/traits/bug60153.phpt index 8f01e72c2d..5dcc78a878 100644 --- a/Zend/tests/traits/bug60153.phpt +++ b/Zend/tests/traits/bug60153.phpt @@ -14,6 +14,5 @@ trait TFoo { class C implements IFoo { use TFoo; } - --EXPECTF-- Fatal error: Declaration of C::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d diff --git a/Zend/tests/traits/bug60165a.phpt b/Zend/tests/traits/bug60165a.phpt index 245bb94e97..6bc3352e21 100644 --- a/Zend/tests/traits/bug60165a.phpt +++ b/Zend/tests/traits/bug60165a.phpt @@ -12,6 +12,5 @@ class MyClass { nonExistent as barA; } } - --EXPECTF-- Fatal error: An alias (barA) was defined for method nonExistent(), but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60165b.phpt b/Zend/tests/traits/bug60165b.phpt index 7b4855a646..ac3f070bd8 100644 --- a/Zend/tests/traits/bug60165b.phpt +++ b/Zend/tests/traits/bug60165b.phpt @@ -12,6 +12,5 @@ class MyClass { A::nonExistent as barA; } } - --EXPECTF-- Fatal error: An alias was defined for A::nonExistent but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60165c.phpt b/Zend/tests/traits/bug60165c.phpt index d72491f030..9a8458d65d 100644 --- a/Zend/tests/traits/bug60165c.phpt +++ b/Zend/tests/traits/bug60165c.phpt @@ -17,6 +17,5 @@ class MyClass { baz as foobar; } } - --EXPECTF-- Fatal error: An alias (foobar) was defined for method baz(), but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60165d.phpt b/Zend/tests/traits/bug60165d.phpt index 26ac927a81..6b4a09d059 100644 --- a/Zend/tests/traits/bug60165d.phpt +++ b/Zend/tests/traits/bug60165d.phpt @@ -16,6 +16,5 @@ class MyClass { A::bar insteadof B; } } - --EXPECTF-- Fatal error: A precedence rule was defined for A::bar but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60173.phpt b/Zend/tests/traits/bug60173.phpt index f525a66aee..d4683a9921 100644 --- a/Zend/tests/traits/bug60173.phpt +++ b/Zend/tests/traits/bug60173.phpt @@ -7,7 +7,6 @@ trait foo { } $rc = new ReflectionClass('foo'); $rc->newInstance(); - --EXPECTF-- Fatal error: Uncaught Error: Cannot instantiate trait foo in %s:%d Stack trace: diff --git a/Zend/tests/traits/bug60217a.phpt b/Zend/tests/traits/bug60217a.phpt index 62a3515955..2eb191c45e 100644 --- a/Zend/tests/traits/bug60217a.phpt +++ b/Zend/tests/traits/bug60217a.phpt @@ -21,6 +21,5 @@ class C { $o = new C; $o->foo(); - --EXPECTF-- C::foo() works. diff --git a/Zend/tests/traits/bug60217b.phpt b/Zend/tests/traits/bug60217b.phpt index 8b2b64e534..b349cf2c54 100644 --- a/Zend/tests/traits/bug60217b.phpt +++ b/Zend/tests/traits/bug60217b.phpt @@ -21,6 +21,5 @@ class CBroken { $o = new CBroken; $o->foo(1); - --EXPECTF-- Fatal error: Declaration of TBroken1::foo($a) must be compatible with TBroken2::foo($a, $b = 0) in %s diff --git a/Zend/tests/traits/bug60217c.phpt b/Zend/tests/traits/bug60217c.phpt index baa4314a61..401444e978 100644 --- a/Zend/tests/traits/bug60217c.phpt +++ b/Zend/tests/traits/bug60217c.phpt @@ -21,6 +21,5 @@ class CBroken { $o = new CBroken; $o->foo(1); - --EXPECTF-- Fatal error: Declaration of TBroken2::foo($a) must be compatible with TBroken1::foo($a, $b = 0) in %s on line %d diff --git a/Zend/tests/traits/bug60369.phpt b/Zend/tests/traits/bug60369.phpt index bfc1ee303f..77a7067232 100644 --- a/Zend/tests/traits/bug60369.phpt +++ b/Zend/tests/traits/bug60369.phpt @@ -14,4 +14,4 @@ class Properties { ?> --EXPECTF-- -Fatal error: Properties and PropertiesTrait define the same property ($same) in the composition of Properties. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file +Fatal error: Properties and PropertiesTrait define the same property ($same) in the composition of Properties. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/bug60717.phpt b/Zend/tests/traits/bug60717.phpt index d4bf7ea6de..d38b1c0c24 100644 --- a/Zend/tests/traits/bug60717.phpt +++ b/Zend/tests/traits/bug60717.phpt @@ -68,6 +68,5 @@ namespace HTML $o = new HTMLHelper6; echo 'Done'; } - --EXPECT-- Done diff --git a/Zend/tests/traits/bug65576a.phpt b/Zend/tests/traits/bug65576a.phpt index 49b2ba0c96..5f2e3c5076 100644 --- a/Zend/tests/traits/bug65576a.phpt +++ b/Zend/tests/traits/bug65576a.phpt @@ -25,7 +25,5 @@ class B extends A } new B(); - --EXPECT-- Trait contructor - diff --git a/Zend/tests/traits/bug65576b.phpt b/Zend/tests/traits/bug65576b.phpt index 3be52ba7c9..772196c481 100644 --- a/Zend/tests/traits/bug65576b.phpt +++ b/Zend/tests/traits/bug65576b.phpt @@ -26,8 +26,6 @@ class B extends A } new B(); - --EXPECT-- Parent constructor Trait contructor - diff --git a/Zend/tests/traits/bugs/abstract-methods01.phpt b/Zend/tests/traits/bugs/abstract-methods01.phpt index 5b90ae0f3d..23cdef3a89 100644 --- a/Zend/tests/traits/bugs/abstract-methods01.phpt +++ b/Zend/tests/traits/bugs/abstract-methods01.phpt @@ -16,4 +16,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECTF-- -Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d
\ No newline at end of file +Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt index df12f9b554..75acda45ba 100644 --- a/Zend/tests/traits/bugs/abstract-methods02.phpt +++ b/Zend/tests/traits/bugs/abstract-methods02.phpt @@ -23,4 +23,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECTF-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt index 0914cbf3d7..6d791e07dc 100644 --- a/Zend/tests/traits/bugs/abstract-methods03.phpt +++ b/Zend/tests/traits/bugs/abstract-methods03.phpt @@ -19,4 +19,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECTF-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt index 00068e8cc7..d80e3dcdce 100644 --- a/Zend/tests/traits/bugs/abstract-methods04.phpt +++ b/Zend/tests/traits/bugs/abstract-methods04.phpt @@ -33,4 +33,4 @@ $test->hello(); ?> --EXPECTF-- -HelloHello
\ No newline at end of file +HelloHello diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt index 39eb82cbbd..272050788a 100644 --- a/Zend/tests/traits/bugs/alias-semantics.phpt +++ b/Zend/tests/traits/bugs/alias-semantics.phpt @@ -20,4 +20,4 @@ $test->b(); ?> --EXPECTF-- -AA
\ No newline at end of file +AA diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt index d814dd3999..250aacafdf 100644 --- a/Zend/tests/traits/bugs/alias-semantics02.phpt +++ b/Zend/tests/traits/bugs/alias-semantics02.phpt @@ -22,4 +22,4 @@ $test->b(); ?> --EXPECTF-- -AA
\ No newline at end of file +AA diff --git a/Zend/tests/traits/bugs/missing-trait.phpt b/Zend/tests/traits/bugs/missing-trait.phpt index 1cdd4f1cc6..d8ede9dfa7 100644 --- a/Zend/tests/traits/bugs/missing-trait.phpt +++ b/Zend/tests/traits/bugs/missing-trait.phpt @@ -12,4 +12,4 @@ $test = new TraitsTest(); ?> --EXPECTF-- -Fatal error: Trait 'THello' not found in %s on line %d
\ No newline at end of file +Fatal error: Trait 'THello' not found in %s on line %d diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index 387c016492..5d82220671 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -28,4 +28,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECTF-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt index b289651a9b..5c54f0027a 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt @@ -20,4 +20,4 @@ $obj = new baz(); echo $obj->zoo, "\n"; ?> --EXPECTF-- -Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file +Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/conflict001.phpt b/Zend/tests/traits/conflict001.phpt index dfc9456853..11dababdb5 100644 --- a/Zend/tests/traits/conflict001.phpt +++ b/Zend/tests/traits/conflict001.phpt @@ -22,4 +22,4 @@ class TraitsTest { } ?> --EXPECTF-- -Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d
\ No newline at end of file +Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt index db4386fbd9..23270c3da3 100644 --- a/Zend/tests/traits/conflict002.phpt +++ b/Zend/tests/traits/conflict002.phpt @@ -29,4 +29,4 @@ $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> --EXPECTF-- -Hello Universe!
\ No newline at end of file +Hello Universe! diff --git a/Zend/tests/traits/conflict003.phpt b/Zend/tests/traits/conflict003.phpt index 577f5c73c3..e274063a6f 100644 --- a/Zend/tests/traits/conflict003.phpt +++ b/Zend/tests/traits/conflict003.phpt @@ -28,4 +28,4 @@ class Talker { ?> --EXPECTF-- -Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d
\ No newline at end of file +Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt index e493430d16..3b17833a31 100644 --- a/Zend/tests/traits/flattening001.phpt +++ b/Zend/tests/traits/flattening001.phpt @@ -39,4 +39,4 @@ var_dump($o->getText()); --EXPECTF-- string(4) "test" string(3) "foo" -string(3) "bar"
\ No newline at end of file +string(3) "bar" diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt index 71ec4b1450..56621a4a21 100644 --- a/Zend/tests/traits/flattening002.phpt +++ b/Zend/tests/traits/flattening002.phpt @@ -25,4 +25,4 @@ $o = new MyHelloWorld(); $o->sayHello(); ?> --EXPECTF-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt index 0e131a7792..53e0043a7b 100644 --- a/Zend/tests/traits/flattening003.phpt +++ b/Zend/tests/traits/flattening003.phpt @@ -29,4 +29,4 @@ $o->sayHello(); $o->sayWorld(); ?> --EXPECTF-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt index 22d4ba666a..d5f64c9a35 100644 --- a/Zend/tests/traits/inheritance001.phpt +++ b/Zend/tests/traits/inheritance001.phpt @@ -21,4 +21,4 @@ $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> --EXPECTF-- -Hello Universe!
\ No newline at end of file +Hello Universe! diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt index 20c2afe1f4..89bfef0826 100644 --- a/Zend/tests/traits/inheritance002.phpt +++ b/Zend/tests/traits/inheritance002.phpt @@ -24,4 +24,4 @@ $o = new MyHelloWorld(); $o->sayHello(); ?> --EXPECTF-- -World!
\ No newline at end of file +World! diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt index 2c20133ebd..0093d88735 100644 --- a/Zend/tests/traits/language002.phpt +++ b/Zend/tests/traits/language002.phpt @@ -29,4 +29,4 @@ $o->sayWorld(); $o->sayExclamationMark(); ?> --EXPECTF-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt index 8324179265..0dc095f8e1 100644 --- a/Zend/tests/traits/language003.phpt +++ b/Zend/tests/traits/language003.phpt @@ -26,4 +26,4 @@ $o = new MyHelloWorld(); $o->saySomething(); ?> --EXPECTF-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt index 98673f14dc..cd4f03a1df 100644 --- a/Zend/tests/traits/language004.phpt +++ b/Zend/tests/traits/language004.phpt @@ -28,4 +28,4 @@ $o->saySomething(); $o->sayWorld(); ?> --EXPECTF-- -Hello World
\ No newline at end of file +Hello World diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt index 11e28af6e6..5cd519f621 100644 --- a/Zend/tests/traits/language005.phpt +++ b/Zend/tests/traits/language005.phpt @@ -37,4 +37,4 @@ $t->talk(); ?> --EXPECTF-- -bAB
\ No newline at end of file +bAB diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt index 6dc6ba9c98..6afd75ee89 100644 --- a/Zend/tests/traits/language006.phpt +++ b/Zend/tests/traits/language006.phpt @@ -28,4 +28,4 @@ $o->sayHelloWorld(); ?> --EXPECTF-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt index 3ccbc85929..860d829b75 100644 --- a/Zend/tests/traits/language007.phpt +++ b/Zend/tests/traits/language007.phpt @@ -27,4 +27,4 @@ $o->sayWorld(); ?> --EXPECTF-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt index 65a792faac..2d87de92e8 100644 --- a/Zend/tests/traits/language008a.phpt +++ b/Zend/tests/traits/language008a.phpt @@ -23,4 +23,4 @@ $o->sayHello(); Fatal error: Uncaught Error: Call to protected method MyClass::sayHello() from context '' in %s:%d Stack trace: #0 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt index c1a0d2629f..e40ff59282 100644 --- a/Zend/tests/traits/language008b.phpt +++ b/Zend/tests/traits/language008b.phpt @@ -30,4 +30,4 @@ Hello World!Hello World! Fatal error: Uncaught Error: Call to private method MyClass::sayHelloWorld() from context '' in %s:%d Stack trace: #0 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt index db19eddc90..b44dfa661a 100644 --- a/Zend/tests/traits/language009.phpt +++ b/Zend/tests/traits/language009.phpt @@ -33,4 +33,4 @@ $t->foo(); ?> --EXPECTF-- -b
\ No newline at end of file +b diff --git a/Zend/tests/traits/language010.phpt b/Zend/tests/traits/language010.phpt index ac3ab2e29e..cd518f43e2 100644 --- a/Zend/tests/traits/language010.phpt +++ b/Zend/tests/traits/language010.phpt @@ -27,4 +27,4 @@ $o->world(); ?> --EXPECTF-- -Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
\ No newline at end of file +Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d diff --git a/Zend/tests/traits/property002.phpt b/Zend/tests/traits/property002.phpt index 4234484d95..d33c3199a4 100644 --- a/Zend/tests/traits/property002.phpt +++ b/Zend/tests/traits/property002.phpt @@ -29,4 +29,4 @@ $t->test(); --EXPECTF-- bool(true) bool(true) -hello World!
\ No newline at end of file +hello World! diff --git a/Zend/tests/traits/property003.phpt b/Zend/tests/traits/property003.phpt index dc88ce3178..cf64d4d370 100644 --- a/Zend/tests/traits/property003.phpt +++ b/Zend/tests/traits/property003.phpt @@ -27,4 +27,4 @@ $t->hello = "foo"; --EXPECTF-- PRE-CLASS-GUARD -Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file +Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/property004.phpt b/Zend/tests/traits/property004.phpt index 483108dfb0..9d7d0aa72c 100644 --- a/Zend/tests/traits/property004.phpt +++ b/Zend/tests/traits/property004.phpt @@ -27,4 +27,4 @@ $t = new TraitsTest; --EXPECTF-- PRE-CLASS-GUARD -Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file +Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt index 5c463b596c..c81ab3c001 100644 --- a/Zend/tests/traits/property008.phpt +++ b/Zend/tests/traits/property008.phpt @@ -59,4 +59,4 @@ object(SubclassB)#3 (2) { int(0) ["hello":"BaseWithTPropB":private]=> int(0) -}
\ No newline at end of file +} diff --git a/Zend/tests/traits/property009.phpt b/Zend/tests/traits/property009.phpt index 590a5e9b7d..26eca0b940 100644 --- a/Zend/tests/traits/property009.phpt +++ b/Zend/tests/traits/property009.phpt @@ -42,7 +42,6 @@ var_dump($b); ?> --EXPECTF-- - object(SubclassClassicInheritance)#1 (1) { ["hello"]=> int(0) @@ -54,4 +53,4 @@ object(SubclassA)#2 (1) { object(SubclassB)#3 (1) { ["hello"]=> int(0) -}
\ No newline at end of file +} diff --git a/Zend/tests/traits/static_001.phpt b/Zend/tests/traits/static_001.phpt index 5953c008d5..326481c779 100644 --- a/Zend/tests/traits/static_001.phpt +++ b/Zend/tests/traits/static_001.phpt @@ -19,4 +19,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test
\ No newline at end of file +Test diff --git a/Zend/tests/traits/static_002.phpt b/Zend/tests/traits/static_002.phpt index 64ebf6bf14..5c1a92a806 100644 --- a/Zend/tests/traits/static_002.phpt +++ b/Zend/tests/traits/static_002.phpt @@ -20,4 +20,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test
\ No newline at end of file +Test diff --git a/Zend/tests/traits/static_003.phpt b/Zend/tests/traits/static_003.phpt index 01953cf724..7417083f69 100644 --- a/Zend/tests/traits/static_003.phpt +++ b/Zend/tests/traits/static_003.phpt @@ -24,4 +24,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test B
\ No newline at end of file +Test B diff --git a/Zend/tests/traits/static_004.phpt b/Zend/tests/traits/static_004.phpt index 3c3f380908..ca02a85e80 100644 --- a/Zend/tests/traits/static_004.phpt +++ b/Zend/tests/traits/static_004.phpt @@ -19,4 +19,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test
\ No newline at end of file +Test diff --git a/Zend/tests/traits/static_forward_static_call.phpt b/Zend/tests/traits/static_forward_static_call.phpt index 9cda8aee1d..9ba53bf08a 100644 --- a/Zend/tests/traits/static_forward_static_call.phpt +++ b/Zend/tests/traits/static_forward_static_call.phpt @@ -25,4 +25,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Forwarded Test A
\ No newline at end of file +Forwarded Test A diff --git a/Zend/tests/traits/static_get_called_class.phpt b/Zend/tests/traits/static_get_called_class.phpt index bd7a603712..b1d8fa3d1e 100644 --- a/Zend/tests/traits/static_get_called_class.phpt +++ b/Zend/tests/traits/static_get_called_class.phpt @@ -21,4 +21,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -B
\ No newline at end of file +B diff --git a/Zend/tests/traits/trait_constant_002.phpt b/Zend/tests/traits/trait_constant_002.phpt index ece3f61f9d..ebd75094e6 100644 --- a/Zend/tests/traits/trait_constant_002.phpt +++ b/Zend/tests/traits/trait_constant_002.phpt @@ -24,4 +24,4 @@ __TRAIT__: Use outside of traits. --EXPECT-- string(0) "" string(0) "" -string(0) ""
\ No newline at end of file +string(0) "" |