Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Convert CRLF line endings to LF

1 files changed, 28 insertions, 28 deletions

diff --git a/ext/spl/tests/bug77298.phpt b/ext/spl/tests/bug77298.phpt
index 46eab670ff..0b24cfff48 100644
--- a/ext/spl/tests/bug77298.phpt
+++ b/ext/spl/tests/bug77298.phpt
@@ -1,28 +1,28 @@
---TEST--

-Bug #77298 (segfault occurs when add property to unserialized ArrayObject)

---FILE--

-<?php

-$o = new ArrayObject();

-$o2 = unserialize(serialize($o));

-$o2[1]=123;

-var_dump($o2);

-

-$o3 = new ArrayObject();

-$o3->unserialize($o->serialize());

-$o3['xm']=456;

-var_dump($o3);

---EXPECT--

-object(ArrayObject)#2 (1) {

-  ["storage":"ArrayObject":private]=>

-  array(1) {

-    [1]=>

-    int(123)

-  }

-}

-object(ArrayObject)#3 (1) {

-  ["storage":"ArrayObject":private]=>

-  array(1) {

-    ["xm"]=>

-    int(456)

-  }

-}
\ No newline at end of file
+--TEST--
+Bug #77298 (segfault occurs when add property to unserialized ArrayObject)
+--FILE--
+<?php
+$o = new ArrayObject();
+$o2 = unserialize(serialize($o));
+$o2[1]=123;
+var_dump($o2);
+
+$o3 = new ArrayObject();
+$o3->unserialize($o->serialize());
+$o3['xm']=456;
+var_dump($o3);
+--EXPECT--
+object(ArrayObject)#2 (1) {
+  ["storage":"ArrayObject":private]=>
+  array(1) {
+    [1]=>
+    int(123)
+  }
+}
+object(ArrayObject)#3 (1) {
+  ["storage":"ArrayObject":private]=>
+  array(1) {
+    ["xm"]=>
+    int(456)
+  }
+}