Merge pull request #2 from php/master

merge

Author: chopins

.travis.yml

@@ -1,7 +1,7 @@
 git:
   quiet: true
 
-dist: xenial
+dist: bionic
 language: c
 os: linux
 addons:
@@ -74,8 +74,9 @@ jobs:
           arch: amd64
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
-        #- env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
-        # arch: s390x
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
+          arch: s390x
+          if: type = cron
 
 before_script:
     - ccache --version

NEWS

@@ -2,6 +2,15 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.0.0rc1
 
+- Core:
+  . Implement #[Attr] Attribute syntax as per final vote in RFC
+    https://wiki.php.net/rfc/shorter_attribute_syntax_change
+  . Fixed bug #80045 (memleak after two set_exception_handler calls with
+    __call). (Nikita)
+
+- Date:
+  . Fixed bug #80057 (DateTimeImmutable::createFromFormat() does not populate
+    time). (Derick)
 
 03 Sep 2020, PHP 8.0.0beta3
 

UPGRADING

@@ -81,10 +81,10 @@ PHP 8.0 UPGRADE NOTES
     Additionally, care should be taken that error messages are not displayed in
     production environments, which can result in information leaks. Please
     ensure that display_errors=Off is used in conjunction with error logging.
-  . Adding more than one @ operator to an expression is no longer supported,
-    since this syntax is now used for attributes (previously extra @ operators
-    had no effect).
-    RFC: https://wiki.php.net/rfc/shorter_attribute_syntax
+  . Following the hash comment operator # immediately with an opening bracket
+    is not supported as a comment anymore since this syntax is now used for
+    attributes.
+    RFC: https://wiki.php.net/rfc/shorter_attribute_syntax_change
   . Inheritance errors due to incompatible method signatures (LSP violations)
     will now always generate a fatal error. Previously a warning was generated
     in some cases.
@@ -576,6 +576,9 @@ PHP 8.0 UPGRADE NOTES
 
         $ctx = stream_context_create(['http' => ['protocol_version' => '1.0']]);
         echo file_get_contents('http://example.org', false, $ctx);
+  . Calling crypt() without an explicit salt is no longer supported. If you
+    would like to produce a strong hash with an auto-generated salt, use
+    password_hash() instead.
 
 - Sysvmsg:
   . msg_get_queue() will now return an SysvMessageQueue object rather than a
@@ -687,6 +690,7 @@ PHP 8.0 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/attributes_v2
     RFC: https://wiki.php.net/rfc/attribute_amendments
     RFC: https://wiki.php.net/rfc/shorter_attribute_syntax
+    RFC: https://wiki.php.net/rfc/shorter_attribute_syntax_change
   . Added support for constructor property promotion (declaring properties in
     the constructor signature).
     RFC: https://wiki.php.net/rfc/constructor_promotion

UPGRADING.INTERNALS

@@ -309,7 +309,7 @@ PHP 8.0 INTERNALS UPGRADE NOTES
         - zend_multibyte_set_filter()
         - zend_lex_tstring()
         - _zend_module_entry module_startup_func, module_shutdown_func,
-          request_startup_func, and request_shutdown_func function pointers
+          request_startup_func, request_shutdown_func, and post_deactivate_func function pointers
         - (*zend_encoding_list_parser) typedef
         - (*zend_encoding_internal_encoding_setter) typedef
         - zend_multibyte_set_functions()

Zend/tests/attributes/001_placement.phpt

@@ -3,27 +3,27 @@ Attributes can be placed on all supported elements.
 --FILE--
 <?php
 
-@@A1(1)
+#[A1(1)]
 class Foo
 {
-    @@A1(2)
+    #[A1(2)]
     public const FOO = 'foo';
-    
-    @@A1(3)
+
+    #[A1(3)]
     public $x;
-    
-    @@A1(4)
-    public function foo(@@A1(5) $a, @@A1(6) $b) { }
+
+    #[A1(4)]
+    public function foo(#[A1(5)] $a, #[A1(6)] $b) { }
 }
 
-$object = new @@A1(7) class () { };
+$object = new #[A1(7)] class () { };
 
-@@A1(8)
+#[A1(8)]
 function f1() { }
 
-$f2 = @@A1(9) function () { };
+$f2 = #[A1(9)] function () { };
 
-$f3 = @@A1(10) fn () => 1;
+$f3 = #[A1(10)] fn () => 1;
 
 $ref = new \ReflectionClass(Foo::class);
 
@@ -43,11 +43,11 @@ $sources = [
 foreach ($sources as $r) {
 	$attr = $r->getAttributes();
 	var_dump(get_class($r), count($attr));
-	
+
     foreach ($attr as $a) {
         var_dump($a->getName(), $a->getArguments());
     }
-    
+
     echo "\n";
 }
 

Zend/tests/attributes/002_rfcexample.phpt

@@ -6,7 +6,7 @@ Attributes: Example from Attributes RFC
 namespace My\Attributes {
     use Attribute;
 
-    @@Attribute
+    #[Attribute]
     class SingleArgument {
         public $argumentValue;
 
@@ -19,7 +19,7 @@ namespace My\Attributes {
 namespace {
     use My\Attributes\SingleArgument;
 
-    @@SingleArgument("Hello World")
+    #[SingleArgument("Hello World")]
     class Foo {
     }
 

Zend/tests/attributes/003_ast_nodes.phpt

@@ -5,7 +5,7 @@ Attributes can deal with AST nodes.
 
 define('V1', strtoupper(php_sapi_name()));
 
-@@A1([V1 => V1])
+#[A1([V1 => V1])]
 class C1
 {
 	public const BAR = 'bar';
@@ -20,7 +20,7 @@ var_dump(count($args), $args[0][V1] === V1);
 
 echo "\n";
 
-@@A1(V1, 1 + 2, C1::class)
+#[A1(V1, 1 + 2, C1::class)]
 class C2 { }
 
 $ref = new \ReflectionClass(C2::class);
@@ -35,7 +35,7 @@ var_dump($args[2] === C1::class);
 
 echo "\n";
 
-@@A1(self::FOO, C1::BAR)
+#[A1(self::FOO, C1::BAR)]
 class C3
 {
 	private const FOO = 'foo';
@@ -52,20 +52,20 @@ var_dump($args[1] === C1::BAR);
 
 echo "\n";
 
-@@ExampleWithShift(4 >> 1)
+#[ExampleWithShift(4 >> 1)]
 class C4 {}
 $ref = new \ReflectionClass(C4::class);
 var_dump($ref->getAttributes()[0]->getArguments());
 
 echo "\n";
 
-@@Attribute
+#[Attribute]
 class C5
 {
 	public function __construct() { }
 }
 
-$ref = new \ReflectionFunction(@@C5(MissingClass::SOME_CONST) function () { });
+$ref = new \ReflectionFunction(#[C5(MissingClass::SOME_CONST)] function () { });
 $attr = $ref->getAttributes();
 var_dump(count($attr));
 

Zend/tests/attributes/004_name_resolution.phpt

@@ -25,11 +25,11 @@ namespace Foo {
     use Doctrine\ORM\Mapping as ORM;
     use Doctrine\ORM\Attributes;
 
-    @@Entity("imported class")
-    @@ORM\Entity("imported namespace")
-    @@\Doctrine\ORM\Mapping\Entity("absolute from namespace")
-    @@\Entity("import absolute from global")
-    @@Attributes\Table()
+    #[Entity("imported class")]
+    #[ORM\Entity("imported namespace")]
+    #[\Doctrine\ORM\Mapping\Entity("absolute from namespace")]
+    #[\Entity("import absolute from global")]
+    #[Attributes\Table()]
     function foo() {
     }
 }

Zend/tests/attributes/005_objects.phpt

@@ -3,7 +3,7 @@ Attributes can be converted into objects.
 --FILE--
 <?php
 
-@@Attribute(Attribute::TARGET_FUNCTION)
+#[Attribute(Attribute::TARGET_FUNCTION)]
 class A1
 {
 	public string $name;
@@ -16,7 +16,7 @@ class A1
 	}
 }
 
-$ref = new \ReflectionFunction(@@A1('test') function () { });
+$ref = new \ReflectionFunction(#[A1('test')] function () { });
 
 foreach ($ref->getAttributes() as $attr) {
 	$obj = $attr->newInstance();
@@ -26,7 +26,7 @@ foreach ($ref->getAttributes() as $attr) {
 
 echo "\n";
 
-$ref = new \ReflectionFunction(@@A1 function () { });
+$ref = new \ReflectionFunction(#[A1] function () { });
 
 try {
 	$ref->getAttributes()[0]->newInstance();
@@ -36,7 +36,7 @@ try {
 
 echo "\n";
 
-$ref = new \ReflectionFunction(@@A1([]) function () { });
+$ref = new \ReflectionFunction(#[A1([])] function () { });
 
 try {
 	$ref->getAttributes()[0]->newInstance();
@@ -46,7 +46,7 @@ try {
 
 echo "\n";
 
-$ref = new \ReflectionFunction(@@A2 function () { });
+$ref = new \ReflectionFunction(#[A2] function () { });
 
 try {
 	$ref->getAttributes()[0]->newInstance();
@@ -56,13 +56,13 @@ try {
 
 echo "\n";
 
-@@Attribute
+#[Attribute]
 class A3
 {
 	private function __construct() { }
 }
 
-$ref = new \ReflectionFunction(@@A3 function () { });
+$ref = new \ReflectionFunction(#[A3] function () { });
 
 try {
 	$ref->getAttributes()[0]->newInstance();
@@ -72,10 +72,10 @@ try {
 
 echo "\n";
 
-@@Attribute
+#[Attribute]
 class A4 { }
 
-$ref = new \ReflectionFunction(@@A4(1) function () { });
+$ref = new \ReflectionFunction(#[A4(1)] function () { });
 
 try {
 	$ref->getAttributes()[0]->newInstance();
@@ -87,7 +87,7 @@ echo "\n";
 
 class A5 { }
 
-$ref = new \ReflectionFunction(@@A5 function () { });
+$ref = new \ReflectionFunction(#[A5] function () { });
 
 try {
 	$ref->getAttributes()[0]->newInstance();

Zend/tests/attributes/006_filter.phpt

@@ -3,17 +3,17 @@ Attributes can be filtered by name and base type.
 --FILE--
 <?php
 
-$ref = new \ReflectionFunction(@@A1 @@A2 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] function () { });
 $attr = $ref->getAttributes(A3::class);
 
 var_dump(count($attr));
 
-$ref = new \ReflectionFunction(@@A1 @@A2 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] function () { });
 $attr = $ref->getAttributes(A2::class);
 
 var_dump(count($attr), $attr[0]->getName());
 
-$ref = new \ReflectionFunction(@@A1 @@A2 @@A2 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] #[A2] function () { });
 $attr = $ref->getAttributes(A2::class);
 
 var_dump(count($attr), $attr[0]->getName(), $attr[1]->getName());
@@ -25,27 +25,27 @@ class A1 implements Base { }
 class A2 implements Base { }
 class A3 extends A2 { }
 
-$ref = new \ReflectionFunction(@@A1 @@A2 @@A5 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] #[A5] function () { });
 $attr = $ref->getAttributes(\stdClass::class, \ReflectionAttribute::IS_INSTANCEOF);
 var_dump(count($attr));
 print_r(array_map(fn ($a) => $a->getName(), $attr));
 
-$ref = new \ReflectionFunction(@@A1 @@A2 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] function () { });
 $attr = $ref->getAttributes(A1::class, \ReflectionAttribute::IS_INSTANCEOF);
 var_dump(count($attr));
 print_r(array_map(fn ($a) => $a->getName(), $attr));
 
-$ref = new \ReflectionFunction(@@A1 @@A2 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] function () { });
 $attr = $ref->getAttributes(Base::class, \ReflectionAttribute::IS_INSTANCEOF);
 var_dump(count($attr));
 print_r(array_map(fn ($a) => $a->getName(), $attr));
 
-$ref = new \ReflectionFunction(@@A1 @@A2 @@A3 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] #[A3] function () { });
 $attr = $ref->getAttributes(A2::class, \ReflectionAttribute::IS_INSTANCEOF);
 var_dump(count($attr));
 print_r(array_map(fn ($a) => $a->getName(), $attr));
 
-$ref = new \ReflectionFunction(@@A1 @@A2 @@A3 function () { });
+$ref = new \ReflectionFunction(#[A1] #[A2] #[A3] function () { });
 $attr = $ref->getAttributes(Base::class, \ReflectionAttribute::IS_INSTANCEOF);
 var_dump(count($attr));
 print_r(array_map(fn ($a) => $a->getName(), $attr));

Zend/tests/attributes/008_wrong_attribution.phpt

@@ -3,7 +3,7 @@ Attributes: Prevent Attribute on non classes
 --FILE--
 <?php
 
-@@Attribute
+#[Attribute]
 function foo() {}
 ?>
 --EXPECTF--