Letargie
478f3d57e6
Last few changes :
...
. force the nls_date_format
. add the scale to the return of the function
. add tests on some function return
. removing unused variables
2018-09-26 13:19:29 +02:00
Letargie
f185ab7daf
Merge branch 'master' of https://github.com/php/php-src into feature-getcolumnmeta
2018-09-26 11:41:50 +02:00
Peter Kokot
ab1ce6058a
Make ext/session/mod_files.sh executable
...
Making shell script executable makes it possible to run like
`ext/session/mod_files.sh` and avoids error permission denied.
2018-09-26 06:11:13 +02:00
Peter Kokot
e3293ad35d
Remove unused ext/exif/tests/test6.jpg
...
Added via 569c69ba36 and then removed via
fb5da94c1b
2018-09-25 22:50:17 +02:00
Sara Golemon
70f3504ae0
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Bump version
2018-09-25 16:44:16 -04:00
Sara Golemon
c431b45fe4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Bump version
2018-09-25 16:43:40 -04:00
Sara Golemon
5f29e3fb6e
Bump version
2018-09-25 16:39:25 -04:00
Peter Kokot
981e5e17fa
Remove unused ext/enchant/tests files
...
- ext/enchant/tests/hindi_correct.txt
- ext/enchant/tests/hindi_incorrect.txt
Added via 5956f9a398 but never used.
2018-09-25 22:30:22 +02:00
Nikita Popov
74ade095db
Remove unused "dummy" member in reflection_object
2018-09-25 21:47:16 +02:00
Nikita Popov
45bb95c036
Reformat macros in php_reflection.c
2018-09-25 21:47:14 +02:00
Sara Golemon
ffc7f8ae52
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 12:10:33 -04:00
Sara Golemon
913c20e61f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 12:10:21 -04:00
Sara Golemon
4baf4964ad
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 12:09:38 -04:00
Sara Golemon
b5d0eb44c0
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 11:18:24 -04:00
Dmitry Stogov
5edaa6f947
Removed unused function
2018-09-25 15:44:56 +03:00
Christoph M. Becker
368ca8e090
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Update NEWS wrt. php-7.3.0RC2 tagging
2018-09-25 11:29:50 +02:00
Christoph M. Becker
36092b2354
Update NEWS wrt. php-7.3.0RC2 tagging
2018-09-25 11:29:01 +02:00
Christopher Jones
029a8c9882
Merge branch 'PHP-7.3'
2018-09-24 20:53:42 +10:00
Christopher Jones
1d67577f4d
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 20:53:31 +10:00
Christopher Jones
682d0f8325
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 20:53:11 +10:00
Christopher Jones
9e56a3373e
Terminate smart string correctly
...
This is related to Zend VM regression bug #75881 . The regression was fixed in the VM, so there is no user visible change from the termination correction.
2018-09-24 20:52:58 +10:00
Christopher Jones
54b8dab8fe
Merge branch 'PHP-7.3'
2018-09-24 20:14:16 +10:00
Christopher Jones
e6fae9e6f9
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 20:14:05 +10:00
Christopher Jones
4ba1fc0a11
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 20:06:05 +10:00
Christopher Jones
91954c24da
Make usable for PECL OCI8 release for PHP 7.x
2018-09-24 20:05:54 +10:00
Christopher Jones
45f9849207
Merge branch 'PHP-7.3'
2018-09-24 17:07:12 +10:00
Christopher Jones
3413e7d1d8
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 17:07:06 +10:00
Christopher Jones
28b89afca1
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 17:06:59 +10:00
Christopher Jones
57eb25b393
Backport master branch comment typo fix
2018-09-24 17:06:29 +10:00
Christopher Jones
eb77030e1f
Merge branch 'PHP-7.3'
2018-09-24 17:03:09 +10:00
Christopher Jones
28ecd4e1c7
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 17:02:36 +10:00
Christopher Jones
d7b060e995
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 17:01:20 +10:00
Christopher Jones
3d497f884f
Make tests portable across PHP 7.x versions
2018-09-24 17:01:13 +10:00
Christopher Jones
db1d7a9871
Merge branch 'PHP-7.3'
2018-09-24 16:52:40 +10:00
Christopher Jones
f291a36659
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 16:52:33 +10:00
Christopher Jones
a370e7d0ad
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:52:26 +10:00
Christopher Jones
338802b543
Remove $id from phpinfo as already done in PHP-7.3
2018-09-24 16:52:17 +10:00
Christopher Jones
c86e19a31d
Merge branch 'PHP-7.3'
2018-09-24 16:41:48 +10:00
Christopher Jones
d7b87cd995
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 16:41:35 +10:00
Christopher Jones
fc296a27db
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:38:47 +10:00
Christopher Jones
37652336c7
And strip trailing tabs too...
2018-09-24 16:38:39 +10:00
Christopher Jones
6af467e08e
Merge branch 'PHP-7.3'
2018-09-24 16:02:31 +10:00
Christopher Jones
aae4ccb030
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 16:02:19 +10:00
Christopher Jones
d2b04c1749
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:00:04 +10:00
Christopher Jones
bdd67d8175
Sync EXPECT usage with PHP-7.3
2018-09-24 15:59:52 +10:00
Christopher Jones
cdb9dd1938
Merge branch 'PHP-7.3'
2018-09-24 13:34:28 +10:00
Christopher Jones
45ab3d3ad3
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 13:33:54 +10:00
Christopher Jones
f396d297aa
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 13:27:35 +10:00
Christopher Jones
a2c0f8722b
Remove trailing whitespace to help keep branches in sync
2018-09-24 13:27:27 +10:00
Christopher Jones
3bbb0c3887
Merge branch 'PHP-7.3'
2018-09-24 09:57:37 +10:00