diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
| commit | c793a6569013f9ab46f2cd7331cc1a04aa42cbed (patch) | |
| tree | ba42379833bfa8176f468bfb23d24cd8ec3019e1 /tests | |
| parent | 3626db6142eda230586357a707b6cb4a0887e971 (diff) | |
| parent | 8d86597d7368460383a33a4399ea7a8b244cd6fa (diff) | |
| download | php-git-c793a6569013f9ab46f2cd7331cc1a04aa42cbed.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/classes/static_properties_004.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt index ce1d19dcc1..e98c605eb4 100644 --- a/tests/classes/static_properties_004.phpt +++ b/tests/classes/static_properties_004.phpt @@ -6,7 +6,7 @@ class C { public static $p = 'original'; } class D extends C { } class E extends D { } -echo "\nInherited static properties refer to the same value accross classes:\n"; +echo "\nInherited static properties refer to the same value across classes:\n"; var_dump(C::$p, D::$p, E::$p); echo "\nChanging one changes all the others:\n"; @@ -20,7 +20,7 @@ var_dump(C::$p, D::$p, E::$p); ?> ==Done== --EXPECTF-- -Inherited static properties refer to the same value accross classes: +Inherited static properties refer to the same value across classes: %unicode|string%(8) "original" %unicode|string%(8) "original" %unicode|string%(8) "original" |