mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Zend/*: fix a bunch of typos (GH-16017)
* Zend/*: fix a bunch of typos * Zend/tests/try/try_catch_finally_005.phpt: update string length
This commit is contained in:
DanielEScherzer
GitHub
parent
15dde9d329
commit
ea297654f4
67 changed files with 92 additions and 92 deletions
|
|
@ -50,7 +50,7 @@ foreach ($scalar_variables as $scalar_var) {
|
|||
|
||||
// destroy the variable using unset
|
||||
unset( $scalar_var );
|
||||
// dump and see if its destroyed, expcted: NULL
|
||||
// dump and see if its destroyed, expected: NULL
|
||||
var_dump( $scalar_var );
|
||||
|
||||
// check using isset to see if unset, expected: bool(false)
|
||||
|
|
@ -165,11 +165,11 @@ foreach ($resources as $resource) {
|
|||
// unset the resource
|
||||
unset($resource);
|
||||
// check using isset() and empty()
|
||||
var_dump( isset($resource) ); // expected: bool(flase)
|
||||
var_dump( isset($resource) ); // expected: bool(false)
|
||||
var_dump( empty($resource) ); // expected: bool(true)
|
||||
// call isset() with two args, but one set
|
||||
var_dump( isset($resource, $temp_var) ); // expected: bool(false)
|
||||
// uset the temp_var
|
||||
// unset the temp_var
|
||||
unset($temp_var);
|
||||
// now the isset() with both the args as unset
|
||||
var_dump( isset($resource, $temp_var) ); // expected: bool(false);
|
||||
|
|
@ -211,7 +211,7 @@ var_dump($point1); // dump the object
|
|||
// check the object and member that is not set
|
||||
var_dump( isset($point1) ); // expected: bool(true)
|
||||
var_dump( empty($point1) ); // expected: bool(false)
|
||||
var_dump( isset($point1->$lable) ); //expected: bool(flase)
|
||||
var_dump( isset($point1->$lable) ); //expected: bool(false)
|
||||
var_dump( empty($point1->$lable) ); //expected: bool(true)
|
||||
|
||||
//set the member variable lable and check
|
||||
|
|
@ -291,7 +291,7 @@ function test_unset1() {
|
|||
$static_var = 20;
|
||||
echo "value of static_var after new assignment: $static_var\n";
|
||||
}
|
||||
// call the functiont
|
||||
// call the function
|
||||
test_unset1();
|
||||
test_unset1();
|
||||
test_unset1();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #27731 (error_reporing() call inside @ block does not work correctly)
|
||||
Bug #27731 (error_reporting() call inside @ block does not work correctly)
|
||||
--FILE--
|
||||
<?php
|
||||
error_reporting(E_ALL ^ E_NOTICE);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #30162 (Catching exception in constructor couses lose of $this)
|
||||
Bug #30162 (Catching exception in constructor causes lose of $this)
|
||||
--FILE--
|
||||
<?php
|
||||
#[AllowDynamicProperties]
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
Bug #30922 (reflective functions crash PHP when interfaces extend themselves)
|
||||
--FILE--
|
||||
<?php
|
||||
interface RecurisiveFooFar extends RecurisiveFooFar {}
|
||||
class A implements RecurisiveFooFar {}
|
||||
interface RecursiveFooFar extends RecursiveFooFar {}
|
||||
class A implements RecursiveFooFar {}
|
||||
|
||||
$a = new A();
|
||||
var_dump($a instanceOf A);
|
||||
echo "ok\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Uncaught Error: Interface "RecurisiveFooFar" not found in %s:%d
|
||||
Fatal error: Uncaught Error: Interface "RecursiveFooFar" not found in %s:%d
|
||||
Stack trace:
|
||||
#0 {main}
|
||||
thrown in %s on line %d
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class test
|
|||
{
|
||||
echo "Class " . $this -> myname . " destroyed at script end\n";
|
||||
} else {
|
||||
echo "Class " . $this -> myname . " destroyed beforce script end\n";
|
||||
echo "Class " . $this -> myname . " destroyed before script end\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #34467 (foreach + __get + __set incosistency)
|
||||
Bug #34467 (foreach + __get + __set inconsistency)
|
||||
--FILE--
|
||||
<?php
|
||||
class abc {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #36513 (comment will be outputed in last line)
|
||||
Bug #36513 (comment will be output in last line)
|
||||
--FILE--
|
||||
<?php
|
||||
function test($s) {
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ Bug #37707 (clone without assigning leaks memory)
|
|||
<?php
|
||||
class testme {
|
||||
function __clone() {
|
||||
echo "clonned\n";
|
||||
echo "cloned\n";
|
||||
}
|
||||
}
|
||||
clone new testme();
|
||||
echo "NO LEAK\n";
|
||||
?>
|
||||
--EXPECT--
|
||||
clonned
|
||||
cloned
|
||||
NO LEAK
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class ClassName
|
|||
function test (OtherClassName $object) { }
|
||||
|
||||
spl_autoload_register(function ($class) {
|
||||
var_dump("__autload($class)");
|
||||
var_dump("__autoload($class)");
|
||||
});
|
||||
|
||||
$obj = new ClassName;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #39297 (Memory corryption because of indirect modification of overloaded array)
|
||||
Bug #39297 (Memory corruption because of indirect modification of overloaded array)
|
||||
--FILE--
|
||||
<?php
|
||||
function compareByRef(&$first, &$second) {
|
||||
|
|
@ -18,15 +18,15 @@ class MyTree implements ArrayAccess {
|
|||
|
||||
public function offsetSet($offset, $value): void {
|
||||
echo "offsetSet()\n";
|
||||
$cannonicalName = strtolower($offset);
|
||||
$this->children[$cannonicalName] = $value;
|
||||
$canonicalName = strtolower($offset);
|
||||
$this->children[$canonicalName] = $value;
|
||||
$value->parent = $this;
|
||||
}
|
||||
|
||||
public function offsetGet($offset): mixed {
|
||||
echo "offsetGet()\n";
|
||||
$cannonicalName = strtolower($offset);
|
||||
return $this->children[$cannonicalName];
|
||||
$canonicalName = strtolower($offset);
|
||||
return $this->children[$canonicalName];
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #43851 (Memory corrution on reuse of assigned value)
|
||||
Bug #43851 (Memory corruption on reuse of assigned value)
|
||||
--FILE--
|
||||
<?php
|
||||
foo();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #45742 Wrong class array inpretetion using constant indexes
|
||||
Bug #45742 Wrong class array interpretation using constant indexes
|
||||
--FILE--
|
||||
<?php
|
||||
class Constants {
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@ $f = test_2(); $f();
|
|||
function test_3() {
|
||||
static $v = "";
|
||||
$v .= 'b';
|
||||
echo "Outer function catenates 'b' onto \$v to give $v\n";
|
||||
echo "Outer function concatenates 'b' onto \$v to give $v\n";
|
||||
$f = function() use($v) {
|
||||
echo "Inner function reckons \$v is $v\n";
|
||||
};
|
||||
$v .= 'a';
|
||||
echo "Outer function catenates 'a' onto \$v to give $v\n";
|
||||
echo "Outer function concatenates 'a' onto \$v to give $v\n";
|
||||
return $f;
|
||||
}
|
||||
$f = test_3(); $f();
|
||||
|
|
@ -51,9 +51,9 @@ Outer function increments $v to 1
|
|||
Inner function reckons $v is 0
|
||||
Outer function increments $v to 2
|
||||
Inner function reckons $v is 1
|
||||
Outer function catenates 'b' onto $v to give b
|
||||
Outer function catenates 'a' onto $v to give ba
|
||||
Outer function concatenates 'b' onto $v to give b
|
||||
Outer function concatenates 'a' onto $v to give ba
|
||||
Inner function reckons $v is b
|
||||
Outer function catenates 'b' onto $v to give bab
|
||||
Outer function catenates 'a' onto $v to give baba
|
||||
Outer function concatenates 'b' onto $v to give bab
|
||||
Outer function concatenates 'a' onto $v to give baba
|
||||
Inner function reckons $v is bab
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #54043: Remove inconsitency of internal exceptions and user defined exceptions
|
||||
Bug #54043: Remove inconsistency of internal exceptions and user defined exceptions
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Bug #54367 (Use of closure causes problem in ArrayAccess)
|
||||
--FILE--
|
||||
<?php
|
||||
class MyObjet implements ArrayAccess
|
||||
class MyObject implements ArrayAccess
|
||||
{
|
||||
public function offsetSet($offset, $value): void { }
|
||||
public function offsetExists($offset): bool { }
|
||||
|
|
@ -16,7 +16,7 @@ class MyObjet implements ArrayAccess
|
|||
}
|
||||
}
|
||||
|
||||
$a = new MyObjet();
|
||||
$a = new MyObject();
|
||||
echo $a['p']('foo');
|
||||
?>
|
||||
--EXPECT--
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ trait THello1 {
|
|||
}
|
||||
|
||||
// Protected and public are handle more strict with a warning then what is
|
||||
// expected from normal inheritance since they can have easier coliding semantics
|
||||
// expected from normal inheritance since they can have easier colliding semantics
|
||||
echo "PRE-CLASS-GUARD\n";
|
||||
class SameNameInSubClassProducesNotice extends Base {
|
||||
use THello1;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
|
||||
Bug #63219 (Segfault when aliasing trait method when autoloader throws exception)
|
||||
--FILE--
|
||||
<?php
|
||||
trait TFoo {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class C {
|
|||
public function __destruct() {
|
||||
if (isset($GLOBALS["a"])) {
|
||||
unset($GLOBALS["array"]);
|
||||
unset($GLOBALS["a"]); // this will be called in gc_colloct_roots and put $a into gc roots buf
|
||||
unset($GLOBALS["a"]); // this will be called in gc_collect_roots and put $a into gc roots buf
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -36,11 +36,11 @@ while ($i++ < 9998) {
|
|||
}
|
||||
$t = [new C];
|
||||
$t[] = &$t;
|
||||
unset($t); // This is used to trigger C::__destruct while doing gc_colloct_roots
|
||||
unset($t); // This is used to trigger C::__destruct while doing gc_collect_roots
|
||||
|
||||
$e = $a;
|
||||
unset($a); // This one cannot be put into roots buf because it's full, thus gc_colloct_roots will be called,
|
||||
// but C::__destructor which is called in gc_colloct_roots will put $a into buf
|
||||
unset($a); // This one cannot be put into roots buf because it's full, thus gc_collect_roots will be called,
|
||||
// but C::__destructor which is called in gc_collect_roots will put $a into buf
|
||||
// which will make $a be put into gc roots buf twice
|
||||
var_dump(gc_collect_cycles());
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #73987 (Method compatibility check looks to original definition and not parent - nullabilty abstract)
|
||||
Bug #73987 (Method compatibility check looks to original definition and not parent - nullability abstract)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #80811: Function exec without $output but with $restult_code parameter crashes
|
||||
Bug #80811: Function exec without $output but with $result_code parameter crashes
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Ownership of constant expression inhereted from interface should be transfered to class
|
||||
Ownership of constant expression inherited from interface should be tranferred to class
|
||||
--FILE--
|
||||
<?php
|
||||
interface I {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Ownership of constant expression inhereted from immutable class should be transfered to class
|
||||
Ownership of constant expression inherited from immutable class should be tranferred to class
|
||||
--FILE--
|
||||
<?php
|
||||
class A {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ $c = function() { var_dump($this); };
|
|||
$d = $c->bindTo(new stdClass);
|
||||
$d();
|
||||
$rm = new ReflectionFunction($d);
|
||||
var_dump($rm->getClosureScopeClass()->name); //dummy sope is Closure
|
||||
var_dump($rm->getClosureScopeClass()->name); //dummy scope is Closure
|
||||
|
||||
//should have the same effect
|
||||
$d = $c->bindTo(new stdClass, NULL);
|
||||
$d();
|
||||
$rm = new ReflectionFunction($d);
|
||||
var_dump($rm->getClosureScopeClass()->name); //dummy sope is Closure
|
||||
var_dump($rm->getClosureScopeClass()->name); //dummy scope is Closure
|
||||
|
||||
echo "Done.\n";
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ catch (\Throwable $t) {
|
|||
echo "Wrong exception type thrown: ".get_class($t)." : ".$t->getMessage()."\n";
|
||||
}
|
||||
|
||||
echo 'Subclass cannot closure over parant private static method'."\n";
|
||||
echo 'Subclass cannot closure over parent private static method'."\n";
|
||||
try {
|
||||
$subFoo = new SubFoo;
|
||||
$fn = $subFoo->closePrivateStaticInvalid();
|
||||
|
|
@ -205,7 +205,7 @@ Non-existent method should fail
|
|||
Non-existent class should fail
|
||||
Non-existent function should fail
|
||||
Subclass cannot closure over parent private instance method
|
||||
Subclass cannot closure over parant private static method
|
||||
Subclass cannot closure over parent private static method
|
||||
Function scope cannot closure over protected instance method
|
||||
Function scope cannot closure over private instance method
|
||||
Access private instance method of parent object through "self::" to parent method
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Constructor promotiong mixed with other properties, parameters and code
|
||||
Constructor promotion mixed with other properties, parameters and code
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Empty enum with from/tryFrom doens't segfault
|
||||
Empty enum with from/tryFrom doesn't segfault
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Dtor may throw exception furing FE_FETCH assignment
|
||||
Dtor may throw exception during FE_FETCH assignment
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Implicit float to int conversions should not warn for literals in combined assingment operetor if float has a fractional part equal to 0
|
||||
Implicit float to int conversions should not warn for literals in combined assignment operator if float has a fractional part equal to 0
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Implicit float to int conversions should warn for literals in combined assingment operetor
|
||||
Implicit float to int conversions should warn for literals in combined assignment operator
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Implicit float to int conversions should warn for literals in combined assingment operetor
|
||||
Implicit float to int conversions should warn for literals in combined assignment operator
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
sort() functions precerve foreach by reference iterator pointer
|
||||
sort() functions preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
$a = [1,2,3,4,5,0];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
array_walk() function precerve foreach by reference iterator pointer
|
||||
array_walk() function preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
$a = [1,2,3,4,5];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
array_push() function precerve foreach by reference iterator pointer
|
||||
array_push() function preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
$a = [1,2,3];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
array_pop() function precerve foreach by reference iterator pointer
|
||||
array_pop() function preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
$a = [1,2,3];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
array_shift() function precerve foreach by reference iterator pointer
|
||||
array_shift() function preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
$a = [1,2,3,4];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
array_unshift() function precerve foreach by reference iterator pointer
|
||||
array_unshift() function preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
$a = [1,2,3];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
array_splice() function precerve foreach by reference iterator pointer
|
||||
array_splice() function preserve foreach by reference iterator pointer
|
||||
--FILE--
|
||||
<?php
|
||||
/* remove before */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
GC 001: gc_enable()/gc_diable()/gc_enabled()
|
||||
GC 001: gc_enable()/gc_disable()/gc_enabled()
|
||||
--FILE--
|
||||
<?php
|
||||
gc_disable();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
GC 002: gc_enable()/gc_diable() and ini_get()
|
||||
GC 002: gc_enable()/gc_disable() and ini_get()
|
||||
--FILE--
|
||||
<?php
|
||||
gc_disable();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Testing instanceof operator with class and interface inheriteds
|
||||
Testing instanceof operator with class and interface inheritance
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Lazy objects: clone is independant of the original object
|
||||
Lazy objects: clone is independent of the original object
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Lazy objects: clone is independant of the original object
|
||||
Lazy objects: clone is independent of the original object
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Lazy objects: clone is independant of the original object
|
||||
Lazy objects: clone is independent of the original object
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Lazy objects: Convertion to array
|
||||
Lazy objects: Conversion to array
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Lazy objects: destructor of initialized objets is called
|
||||
Lazy objects: destructor of initialized objects is called
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Lazy objects: destructor of lazy objets is not called if not initialized
|
||||
Lazy objects: destructor of lazy objects is not called if not initialized
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
ZE2 Late Static Binding stacking static calleds
|
||||
ZE2 Late Static Binding stacking static calls
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
027: Name ambiguity (class name & part of extertnal namespace name)
|
||||
027: Name ambiguity (class name & part of external namespace name)
|
||||
--FILE--
|
||||
<?php
|
||||
require "ns_027.inc";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
058: Usage of 'namespace' in compound names (out of namespase)
|
||||
058: Usage of 'namespace' in compound names (out of namespace)
|
||||
--FILE--
|
||||
<?php
|
||||
const C = "const ok\n";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
063: Old-style constructors in namesapces (not supported!)
|
||||
063: Old-style constructors in namespaces (not supported!)
|
||||
--FILE--
|
||||
<?php
|
||||
namespace Foo;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Property hooks cannot have explicity visibility
|
||||
Property hooks cannot have explicitly visibility
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #60153 (Interface method prototypes not enforced when implementd via traits.)
|
||||
Bug #60153 (Interface method prototypes not enforced when implemented via traits.)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #63911 (Ignore conflicting trait methods originationg from identical sub traits)
|
||||
Bug #63911 (Ignore conflicting trait methods originating from identical sub traits)
|
||||
--FILE--
|
||||
<?php
|
||||
trait A
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--TEST--
|
||||
Abstract Trait Methods should behave like common abstract methods and
|
||||
implementstion may be provided by other traits. Sorting order shouldn't influence result.
|
||||
implementation may be provided by other traits. Sorting order shouldn't influence result.
|
||||
--FILE--
|
||||
<?php
|
||||
error_reporting(E_ALL);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Traits are flattened recurivly.
|
||||
Traits are flattened recursively.
|
||||
--FILE--
|
||||
<?php
|
||||
error_reporting(E_ALL);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Trait method overriddes base class method
|
||||
Trait method overrides base class method
|
||||
--FILE--
|
||||
<?php
|
||||
error_reporting(E_ALL);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ for ($i = 0; $i < 3; $i ++) {
|
|||
}
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
var_dump("cactched");
|
||||
var_dump("caught");
|
||||
} finally {
|
||||
var_dump("finally");
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@ string(9) "continue1"
|
|||
string(9) "continue2"
|
||||
string(7) "finally"
|
||||
string(9) "continue2"
|
||||
string(8) "cactched"
|
||||
string(6) "caught"
|
||||
string(7) "finally"
|
||||
string(9) "continue2"
|
||||
string(7) "finally"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Valid inheritence - co-variance
|
||||
Valid inheritance - co-variance
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Valid inheritence - co-variance
|
||||
Valid inheritance - co-variance
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
No coercion should be applied to type false even if it's an overide
|
||||
No coercion should be applied to type false even if it's an override
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
No coercion should be applied to type true even if it's an overide
|
||||
No coercion should be applied to type true even if it's an override
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ ZEND_INI_BEGIN()
|
|||
#ifdef ZEND_CHECK_STACK_LIMIT
|
||||
/* The maximum allowed call stack size. 0: auto detect, -1: no limit. For fibers, this is fiber.stack_size. */
|
||||
STD_ZEND_INI_ENTRY("zend.max_allowed_stack_size", "0", ZEND_INI_SYSTEM, OnUpdateMaxAllowedStackSize, max_allowed_stack_size, zend_executor_globals, executor_globals)
|
||||
/* Substracted from the max allowed stack size, as a buffer, when checking for overflow. 0: auto detect. */
|
||||
/* Subtracted from the max allowed stack size, as a buffer, when checking for overflow. 0: auto detect. */
|
||||
STD_ZEND_INI_ENTRY("zend.reserved_stack_size", "0", ZEND_INI_SYSTEM, OnUpdateReservedStackSize, reserved_stack_size, zend_executor_globals, executor_globals)
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -813,7 +813,7 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
|
|||
if (fci_cache) {
|
||||
zend_release_fcall_info_cache(fci_cache);
|
||||
}
|
||||
return SUCCESS; /* we would result in an instable executor otherwise */
|
||||
return SUCCESS; /* we would result in an unstable executor otherwise */
|
||||
}
|
||||
|
||||
ZEND_ASSERT(fci->size == sizeof(zend_fcall_info));
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ END_EXTERN_C()
|
|||
|
||||
The current macros are currently only used on x86 and x86_64 architectures,
|
||||
on every other architecture, these macros expand to NOPs. This assumes that
|
||||
other architectures do not have an internal precision and the operhand types
|
||||
other architectures do not have an internal precision and the operand types
|
||||
define the computational precision of floating point operations. This
|
||||
assumption may be false, in that case, the author is interested in further
|
||||
details on the other platform.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
+----------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
/* Lazy objects are standard zend_object whose initialization is defered until
|
||||
/* Lazy objects are standard zend_object whose initialization is deferred until
|
||||
* one of their properties backing store is accessed for the first time.
|
||||
*
|
||||
* This is implemented by using the same fallback mechanism as __get and __set
|
||||
|
|
@ -303,7 +303,7 @@ ZEND_API zend_object *zend_object_make_lazy(zend_object *obj,
|
|||
}
|
||||
|
||||
/* Objects become non-lazy if all properties are made non-lazy before
|
||||
* initialization is triggerd. If the object has no properties to begin
|
||||
* initialization is triggered. If the object has no properties to begin
|
||||
* with, this happens immediately. */
|
||||
if (UNEXPECTED(!lazy_properties_count)) {
|
||||
return obj;
|
||||
|
|
|
|||
|
|
@ -484,10 +484,10 @@ ZEND_API int ZEND_FASTCALL zend_compare_symbol_tables(HashTable *ht1, HashTable
|
|||
ZEND_API int ZEND_FASTCALL zend_compare_arrays(zval *a1, zval *a2);
|
||||
ZEND_API int ZEND_FASTCALL zend_compare_objects(zval *o1, zval *o2);
|
||||
|
||||
/** Deprecatd in favor of ZEND_STRTOL() */
|
||||
/** Deprecated in favor of ZEND_STRTOL() */
|
||||
ZEND_ATTRIBUTE_DEPRECATED ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, size_t str_len);
|
||||
|
||||
/** Deprecatd in favor of ZEND_STRTOL() */
|
||||
/** Deprecated in favor of ZEND_STRTOL() */
|
||||
ZEND_ATTRIBUTE_DEPRECATED ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, size_t str_len);
|
||||
|
||||
#define convert_to_null_ex(zv) convert_to_null(zv)
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ static void zend_verify_type_inference(zval *value, uint32_t type_mask, uint8_t
|
|||
|
||||
if (Z_TYPE_P(value) == IS_INDIRECT) {
|
||||
if (!(type_mask & MAY_BE_INDIRECT)) {
|
||||
ZEND_VERIFY_TYPE_INFERENCE_ERROR("mask 0x%x mising MAY_BE_INDIRECT", type_mask);
|
||||
ZEND_VERIFY_TYPE_INFERENCE_ERROR("mask 0x%x missing MAY_BE_INDIRECT", type_mask);
|
||||
}
|
||||
value = Z_INDIRECT_P(value);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue