-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
- Loading branch information
Showing
67 changed files
with
2,678 additions
and
336 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --TEST-- | ||
| Bug #60833 (self, parent, static behave inconsistently case-sensitive) | ||
| --FILE-- | ||
| <?php | ||
| class A { | ||
| static $x = "A"; | ||
| function testit() { | ||
| $this->v1 = new sELF; | ||
| $this->v2 = new SELF; | ||
| } | ||
| } | ||
|
|
||
| class B extends A { | ||
| static $x = "B"; | ||
| function testit() { | ||
| PARENT::testit(); | ||
| $this->v3 = new sELF; | ||
| $this->v4 = new PARENT; | ||
| $this->v4 = STATIC::$x; | ||
| } | ||
| } | ||
| $t = new B(); | ||
| $t->testit(); | ||
| var_dump($t); | ||
| ?> | ||
| --EXPECTF-- | ||
| object(B)#%d (4) { | ||
| ["v1"]=> | ||
| object(A)#%d (0) { | ||
| } | ||
| ["v2"]=> | ||
| object(A)#%d (0) { | ||
| } | ||
| ["v3"]=> | ||
| object(B)#%d (0) { | ||
| } | ||
| ["v4"]=> | ||
| string(1) "B" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| --TEST-- | ||
| Test script to verify that magic methods should be called only once when accessing an unset property. | ||
| --CREDITS-- | ||
| Marco Pivetta <ocramius@gmail.com> | ||
| --FILE-- | ||
| <?php | ||
| class Test { | ||
| public $publicProperty; | ||
| protected $protectedProperty; | ||
| private $privateProperty; | ||
|
|
||
| public function __construct() { | ||
| unset( | ||
| $this->publicProperty, | ||
| $this->protectedProperty, | ||
| $this->privateProperty | ||
| ); | ||
| } | ||
|
|
||
| function __get($name) { | ||
| echo '__get ' . $name . "\n"; | ||
| return $this->$name; | ||
| } | ||
|
|
||
| function __set($name, $value) { | ||
| echo '__set ' . $name . "\n"; | ||
| $this->$name = $value; | ||
| } | ||
|
|
||
| function __isset($name) { | ||
| echo '__isset ' . $name . "\n"; | ||
| return isset($this->$name); | ||
| } | ||
| } | ||
|
|
||
| $test = new Test(); | ||
|
|
||
| $test->nonExisting; | ||
| $test->publicProperty; | ||
| $test->protectedProperty; | ||
| $test->privateProperty; | ||
| isset($test->nonExisting); | ||
| isset($test->publicProperty); | ||
| isset($test->protectedProperty); | ||
| isset($test->privateProperty); | ||
| $test->nonExisting = 'value'; | ||
| $test->publicProperty = 'value'; | ||
| $test->protectedProperty = 'value'; | ||
| $test->privateProperty = 'value'; | ||
|
|
||
| ?> | ||
|
|
||
| --EXPECTF-- | ||
| __get nonExisting | ||
|
|
||
| Notice: Undefined property: Test::$nonExisting in %s on line %d | ||
| __get publicProperty | ||
|
|
||
| Notice: Undefined property: Test::$publicProperty in %s on line %d | ||
| __get protectedProperty | ||
|
|
||
| Notice: Undefined property: Test::$protectedProperty in %s on line %d | ||
| __get privateProperty | ||
|
|
||
| Notice: Undefined property: Test::$privateProperty in %s on line %d | ||
| __isset nonExisting | ||
| __isset publicProperty | ||
| __isset protectedProperty | ||
| __isset privateProperty | ||
| __set nonExisting | ||
| __set publicProperty | ||
| __set protectedProperty | ||
| __set privateProperty | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| --TEST-- | ||
| class name as scalar from ::class keyword | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| namespace Foo\Bar { | ||
| class One { | ||
| // compile time constants | ||
| const A = self::class; | ||
| const B = Two::class; | ||
| } | ||
| class Two extends One { | ||
| public static function run() { | ||
| var_dump(self::class); // self compile time lookup | ||
| var_dump(static::class); // runtime lookup | ||
| var_dump(parent::class); // runtime lookup | ||
| var_dump(Baz::class); // default compile time lookup | ||
| } | ||
| } | ||
| class Three extends Two { | ||
| // compile time static lookups | ||
| public static function checkCompileTime( | ||
| $one = self::class, | ||
| $two = Baz::class, | ||
| $three = One::A, | ||
| $four = self::B | ||
| ) { | ||
| var_dump($one, $two, $three, $four); | ||
| } | ||
| } | ||
| echo "In NS\n"; | ||
| var_dump(Moo::CLASS); // resolve in namespace | ||
| } | ||
|
|
||
| namespace { | ||
| use Bee\Bop as Moo, | ||
| Foo\Bar\One; | ||
| echo "Top\n"; | ||
| var_dump(One::class); // resolve from use | ||
| var_dump(Boo::class); // resolve in global namespace | ||
| var_dump(Moo::CLASS); // resolve from use as | ||
| var_dump(\Moo::Class); // resolve fully qualified | ||
| $class = One::class; // assign class as scalar to var | ||
| $x = new $class; // create new class from original scalar assignment | ||
| var_dump($x); | ||
| Foo\Bar\Two::run(); // resolve runtime lookups | ||
| echo "Parent\n"; | ||
| Foo\Bar\Three::run(); // resolve runtime lookups with inheritance | ||
| echo "Compile Check\n"; | ||
| Foo\Bar\Three::checkCompileTime(); | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| In NS | ||
| string(11) "Foo\Bar\Moo" | ||
| Top | ||
| string(11) "Foo\Bar\One" | ||
| string(3) "Boo" | ||
| string(7) "Bee\Bop" | ||
| string(3) "Moo" | ||
| object(Foo\Bar\One)#1 (0) { | ||
| } | ||
| string(11) "Foo\Bar\Two" | ||
| string(11) "Foo\Bar\Two" | ||
| string(11) "Foo\Bar\One" | ||
| string(11) "Foo\Bar\Baz" | ||
| Parent | ||
| string(11) "Foo\Bar\Two" | ||
| string(13) "Foo\Bar\Three" | ||
| string(11) "Foo\Bar\One" | ||
| string(11) "Foo\Bar\Baz" | ||
| Compile Check | ||
| string(13) "Foo\Bar\Three" | ||
| string(11) "Foo\Bar\Baz" | ||
| string(11) "Foo\Bar\One" | ||
| string(11) "Foo\Bar\Two" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --TEST-- | ||
| class name as scalar from ::class keyword error using static in class constant | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| namespace Foo\Bar { | ||
| class One { | ||
| const Baz = static::class; | ||
| } | ||
| } | ||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: static::class cannot be used for compile-time class name resolution in %s on line %d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --TEST-- | ||
| class name as scalar from ::class keyword error using parent in class constant | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| namespace Foo\Bar { | ||
| class One { | ||
| const Baz = parent::class; | ||
| } | ||
| } | ||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: parent::class cannot be used for compile-time class name resolution in %s on line %d |
Oops, something went wrong.