summaryrefslogtreecommitdiff
path: root/Zend/tests/traits/bugs
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/tests/traits/bugs')
-rw-r--r--Zend/tests/traits/bugs/abstract-methods01.phpt4
-rw-r--r--Zend/tests/traits/bugs/abstract-methods02.phpt2
-rw-r--r--Zend/tests/traits/bugs/abstract-methods03.phpt2
-rw-r--r--Zend/tests/traits/bugs/abstract-methods04.phpt8
-rw-r--r--Zend/tests/traits/bugs/abstract-methods05.phpt4
-rw-r--r--Zend/tests/traits/bugs/abstract-methods06.phpt4
-rw-r--r--Zend/tests/traits/bugs/alias-semantics.phpt2
-rw-r--r--Zend/tests/traits/bugs/alias-semantics02.phpt2
-rw-r--r--Zend/tests/traits/bugs/alias01.phpt2
-rw-r--r--Zend/tests/traits/bugs/interfaces.phpt2
-rw-r--r--Zend/tests/traits/bugs/missing-trait.phpt2
-rw-r--r--Zend/tests/traits/bugs/overridding-conflicting-methods.phpt2
-rw-r--r--Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt2
13 files changed, 19 insertions, 19 deletions
diff --git a/Zend/tests/traits/bugs/abstract-methods01.phpt b/Zend/tests/traits/bugs/abstract-methods01.phpt
index 6275caa193..5b90ae0f3d 100644
--- a/Zend/tests/traits/bugs/abstract-methods01.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods01.phpt
@@ -9,11 +9,11 @@ trait THello {
}
class TraitsTest {
- use THello;
+ use THello;
}
$test = new TraitsTest();
$test->hello();
?>
---EXPECTF--
+--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
diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt
index 78abe7d1bc..df12f9b554 100644
--- a/Zend/tests/traits/bugs/abstract-methods02.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods02.phpt
@@ -22,5 +22,5 @@ class TraitsTest {
$test = new TraitsTest();
$test->hello();
?>
---EXPECTF--
+--EXPECTF--
Hello \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt
index 605b1d8e9e..0914cbf3d7 100644
--- a/Zend/tests/traits/bugs/abstract-methods03.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods03.phpt
@@ -18,5 +18,5 @@ class TraitsTest {
$test = new TraitsTest();
$test->hello();
?>
---EXPECTF--
+--EXPECTF--
Hello \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt
index 56a3464067..00068e8cc7 100644
--- a/Zend/tests/traits/bugs/abstract-methods04.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods04.phpt
@@ -1,5 +1,5 @@
--TEST--
-Abstract Trait Methods should behave like common abstract methods and
+Abstract Trait Methods should behave like common abstract methods and
implementstion may be provided by other traits. Sorting order shouldn't influence result.
--FILE--
<?php
@@ -17,7 +17,7 @@ trait THelloImpl {
class TraitsTest1 {
use THello;
- use THelloImpl;
+ use THelloImpl;
}
$test = new TraitsTest1();
@@ -25,12 +25,12 @@ $test->hello();
class TraitsTest2 {
use THelloImpl;
- use THello;
+ use THello;
}
$test = new TraitsTest2();
$test->hello();
?>
---EXPECTF--
+--EXPECTF--
HelloHello \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods05.phpt b/Zend/tests/traits/bugs/abstract-methods05.phpt
index 9a1315f868..6a901bb601 100644
--- a/Zend/tests/traits/bugs/abstract-methods05.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods05.phpt
@@ -16,10 +16,10 @@ trait THelloA {
class TraitsTest1 {
use THelloB;
- use THelloA;
+ use THelloA;
}
?>
---EXPECTF--
+--EXPECTF--
Fatal error: Declaration of THelloA::hello($a) must be compatible with THelloB::hello() in %s on line %d
diff --git a/Zend/tests/traits/bugs/abstract-methods06.phpt b/Zend/tests/traits/bugs/abstract-methods06.phpt
index 8569aefb38..d8d4994f66 100644
--- a/Zend/tests/traits/bugs/abstract-methods06.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods06.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
trait THelloB {
public function hello() {
echo 'Hello';
- }
+ }
}
trait THelloA {
@@ -22,5 +22,5 @@ class TraitsTest1 {
?>
---EXPECTF--
+--EXPECTF--
Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt
index ac86692880..39eb82cbbd 100644
--- a/Zend/tests/traits/bugs/alias-semantics.phpt
+++ b/Zend/tests/traits/bugs/alias-semantics.phpt
@@ -19,5 +19,5 @@ $test->a();
$test->b();
?>
---EXPECTF--
+--EXPECTF--
AA \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt
index e0b5286e4f..d814dd3999 100644
--- a/Zend/tests/traits/bugs/alias-semantics02.phpt
+++ b/Zend/tests/traits/bugs/alias-semantics02.phpt
@@ -21,5 +21,5 @@ $test->a();
$test->b();
?>
---EXPECTF--
+--EXPECTF--
AA \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/alias01.phpt b/Zend/tests/traits/bugs/alias01.phpt
index 4b89a54dda..e6c47858e5 100644
--- a/Zend/tests/traits/bugs/alias01.phpt
+++ b/Zend/tests/traits/bugs/alias01.phpt
@@ -7,7 +7,7 @@ trait T1 {
function m2() { echo "T:m2\n"; }
}
-class C1 {
+class C1 {
use T1 { m1 as a1; }
}
diff --git a/Zend/tests/traits/bugs/interfaces.phpt b/Zend/tests/traits/bugs/interfaces.phpt
index b632b73be2..97ec174a7f 100644
--- a/Zend/tests/traits/bugs/interfaces.phpt
+++ b/Zend/tests/traits/bugs/interfaces.phpt
@@ -15,5 +15,5 @@ trait THello implements MyInterface {
}
?>
---EXPECTF--
+--EXPECTF--
Parse error: syntax error, unexpected 'implements' (T_IMPLEMENTS), expecting '{' in %s on line %d
diff --git a/Zend/tests/traits/bugs/missing-trait.phpt b/Zend/tests/traits/bugs/missing-trait.phpt
index ce4fa5c69a..1cdd4f1cc6 100644
--- a/Zend/tests/traits/bugs/missing-trait.phpt
+++ b/Zend/tests/traits/bugs/missing-trait.phpt
@@ -11,5 +11,5 @@ class TraitsTest {
$test = new TraitsTest();
?>
---EXPECTF--
+--EXPECTF--
Fatal error: Trait 'THello' not found in %s on line %d \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
index 0bbea11005..387c016492 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
@@ -27,5 +27,5 @@ class TraitsTest {
$test = new TraitsTest();
$test->hello();
?>
---EXPECTF--
+--EXPECTF--
Hello \ No newline at end of file
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
index 1b9d98dac0..b289651a9b 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
@@ -19,5 +19,5 @@ class baz
$obj = new baz();
echo $obj->zoo, "\n";
?>
---EXPECTF--
+--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
View Lorry Controller Status