]> granicus.if.org Git - php/log
php
7 years agoFix #74922 - Try to resolve constants when importing trait properties
Pedro Magalhães [Wed, 27 Sep 2017 00:31:03 +0000 (01:31 +0100)]
Fix #74922 - Try to resolve constants when importing trait properties

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Thu, 2 Nov 2017 19:56:48 +0000 (20:56 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Thu, 2 Nov 2017 19:56:35 +0000 (20:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 2 Nov 2017 19:56:25 +0000 (20:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix ext/soap/tests/bug69137.phpt
Nikita Popov [Thu, 2 Nov 2017 19:55:10 +0000 (20:55 +0100)]
Fix ext/soap/tests/bug69137.phpt

Switch to example.org. Also mark it as an online test.

7 years agoDon't dup after fetch_dimension_const
Nikita Popov [Thu, 2 Nov 2017 18:20:14 +0000 (19:20 +0100)]
Don't dup after fetch_dimension_const

Any duplication that may be necessary must have happened earlier
already. Also I'm not sure what the IS_REF branch was there for
originally, but it does not appear to be relevant anymore.

7 years agoSmall browscap cleanup
Nikita Popov [Thu, 2 Nov 2017 12:56:35 +0000 (13:56 +0100)]
Small browscap cleanup

Directly use interned "" and "1" strings.

7 years agoUse persistent strings for preloaded phar files
Dmitry Stogov [Thu, 2 Nov 2017 16:28:34 +0000 (19:28 +0300)]
Use persistent strings for preloaded phar files

7 years agoNote to UPGRADING about Spoofchecker::setRestrictionLevel()
Anatol Belski [Thu, 2 Nov 2017 12:34:58 +0000 (13:34 +0100)]
Note to UPGRADING about Spoofchecker::setRestrictionLevel()

7 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Thu, 2 Nov 2017 11:41:01 +0000 (14:41 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Sync and fix tests for ICU 60.1 compat

7 years agoAdded exceptions for ZEND_RC_DEBUG
Dmitry Stogov [Thu, 2 Nov 2017 11:40:28 +0000 (14:40 +0300)]
Added exceptions for ZEND_RC_DEBUG

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 2 Nov 2017 11:39:34 +0000 (12:39 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Sync and fix tests for ICU 60.1 compat

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 2 Nov 2017 11:39:04 +0000 (12:39 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync and fix tests for ICU 60.1 compat

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 2 Nov 2017 11:38:32 +0000 (12:38 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Sync and fix tests for ICU 60.1 compat

7 years agoSync and fix tests for ICU 60.1 compat
Anatol Belski [Thu, 2 Nov 2017 11:37:04 +0000 (12:37 +0100)]
Sync and fix tests for ICU 60.1 compat

7 years agoAdded exceptions for ZEND_RC_DEBUG
Dmitry Stogov [Thu, 2 Nov 2017 11:13:28 +0000 (14:13 +0300)]
Added exceptions for ZEND_RC_DEBUG

7 years agoUse interned strins for output handler aliases and conflict checkers names.
Dmitry Stogov [Thu, 2 Nov 2017 11:11:56 +0000 (14:11 +0300)]
Use interned strins for output handler aliases and conflict checkers names.

7 years agoUse interned strings for browscap files parsed at MINIT
Dmitry Stogov [Thu, 2 Nov 2017 11:10:40 +0000 (14:10 +0300)]
Use interned strings for browscap files parsed at MINIT

7 years agoOverlad functions once in MINIT (instead of on each requestr in RINIT)
Dmitry Stogov [Thu, 2 Nov 2017 11:09:06 +0000 (14:09 +0300)]
Overlad functions once in MINIT (instead of on each requestr in RINIT)

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 2 Nov 2017 08:24:46 +0000 (09:24 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Yet one /nologo

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 2 Nov 2017 08:24:22 +0000 (09:24 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Yet one /nologo

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 2 Nov 2017 08:22:25 +0000 (09:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Yet one /nologo

7 years agoYet one /nologo
Anatol Belski [Thu, 2 Nov 2017 08:21:22 +0000 (09:21 +0100)]
Yet one /nologo

7 years agoRC manipulation cleanup 2
Xinchen Hui [Thu, 2 Nov 2017 04:13:35 +0000 (12:13 +0800)]
RC manipulation cleanup 2

7 years agoRevert "Use zend_get_executed_filename_ex"
Xinchen Hui [Thu, 2 Nov 2017 04:12:40 +0000 (12:12 +0800)]
Revert "Use zend_get_executed_filename_ex"

This reverts commit 2a37625c20032d54af55a88d54d1a3a1ecc068d1.

7 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Thu, 2 Nov 2017 02:40:45 +0000 (10:40 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Made "result", "statement" and "last_message" to always use Zend MM heap. (even for persistent connections these entities don't relive request boundary)
  Fixed memory leaks
  Use interned strings for "magic" property of internal classes. (not copyied into SHM)
  Reverted incomplete fix and too strict asserts.
  Mark persistent connection related data as "thread-local".
  Persistent resources are "thread-local". Register persistent resources through new functions zend_register_persistent_resource()/zend_register_persistent_resource_ex().
  PCRE cache is "thread-local"
  Allow reference-counting on "thread-local" persistent zvals

7 years agoMade "result", "statement" and "last_message" to always use Zend MM heap. (even for...
Dmitry Stogov [Thu, 2 Nov 2017 00:27:25 +0000 (03:27 +0300)]
Made "result", "statement" and "last_message" to always use Zend MM heap. (even for persistent connections these entities don't relive request boundary)

7 years agoFixed memory leaks
Dmitry Stogov [Thu, 2 Nov 2017 00:04:27 +0000 (03:04 +0300)]
Fixed memory leaks

7 years agoUse interned strings for "magic" property of internal classes. (not copyied into...
Dmitry Stogov [Wed, 1 Nov 2017 16:04:54 +0000 (19:04 +0300)]
Use interned strings for "magic" property of internal classes. (not copyied into SHM)

7 years agoReverted incomplete fix and too strict asserts.
Dmitry Stogov [Wed, 1 Nov 2017 13:18:13 +0000 (16:18 +0300)]
Reverted incomplete fix and too strict asserts.

7 years agoMark persistent connection related data as "thread-local".
Dmitry Stogov [Wed, 1 Nov 2017 12:21:21 +0000 (15:21 +0300)]
Mark persistent connection related data as "thread-local".

7 years agoPersistent resources are "thread-local".
Dmitry Stogov [Wed, 1 Nov 2017 12:19:31 +0000 (15:19 +0300)]
Persistent resources are "thread-local".
Register persistent resources through new functions zend_register_persistent_resource()/zend_register_persistent_resource_ex().

7 years agoPCRE cache is "thread-local"
Dmitry Stogov [Wed, 1 Nov 2017 12:13:49 +0000 (15:13 +0300)]
PCRE cache is "thread-local"

7 years agoAllow reference-counting on "thread-local" persistent zvals
Dmitry Stogov [Wed, 1 Nov 2017 12:11:52 +0000 (15:11 +0300)]
Allow reference-counting on "thread-local" persistent zvals

7 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 1 Nov 2017 10:42:12 +0000 (18:42 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Fixed string interning during constants substitution

7 years agoFixed string interning during constants substitution
Dmitry Stogov [Wed, 1 Nov 2017 07:56:37 +0000 (10:56 +0300)]
Fixed string interning during constants substitution

7 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 1 Nov 2017 07:41:41 +0000 (15:41 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Revert "Fixed string interning during constants substitution"
  Fixed string interning during constants substitution

7 years agoUse zend_get_executed_filename_ex
Xinchen Hui [Wed, 1 Nov 2017 07:30:41 +0000 (15:30 +0800)]
Use zend_get_executed_filename_ex

7 years agoRevert "Fixed string interning during constants substitution"
Dmitry Stogov [Wed, 1 Nov 2017 07:39:47 +0000 (10:39 +0300)]
Revert "Fixed string interning during constants substitution"

This reverts commit e0924c52fc7c69b483b5416c609ce7f008584845.

7 years agoFixed string interning during constants substitution
Dmitry Stogov [Wed, 1 Nov 2017 07:34:39 +0000 (10:34 +0300)]
Fixed string interning during constants substitution

7 years agoRC manipulation cleanup
Xinchen Hui [Wed, 1 Nov 2017 02:25:10 +0000 (10:25 +0800)]
RC manipulation cleanup

7 years agoUse interned strings for hash algorithm names (not copyied into SHM)
Dmitry Stogov [Tue, 31 Oct 2017 23:40:39 +0000 (02:40 +0300)]
Use interned strings for hash algorithm names (not copyied into SHM)

7 years agoUse interned strings for stream transports
Dmitry Stogov [Tue, 31 Oct 2017 23:39:09 +0000 (02:39 +0300)]
Use interned strings for stream transports

7 years agoUse Zend MM heap
Dmitry Stogov [Tue, 31 Oct 2017 23:38:26 +0000 (02:38 +0300)]
Use Zend MM heap

7 years agoAvoid reference counting (the value may be a persistent string)
Dmitry Stogov [Tue, 31 Oct 2017 22:31:47 +0000 (01:31 +0300)]
Avoid reference counting (the value may be a persistent string)

7 years agoFixed few inconsistent ZVALs in AST produced by compiler (REFCOUNTED and INTERNED...
Dmitry Stogov [Tue, 31 Oct 2017 22:10:21 +0000 (01:10 +0300)]
Fixed few inconsistent ZVALs in AST produced by compiler (REFCOUNTED and INTERNED strings)

7 years agoFix #74243: allow locales.conf to drive datetime format
fandrieu [Tue, 31 Oct 2017 21:33:10 +0000 (17:33 -0400)]
Fix #74243: allow locales.conf to drive datetime format

Add a driver attribute, PDO::DBLIB_ATTR_DATETIME_CONVERT, to control.

7 years agoUse size_t instead of int, use more specific format string
Adam Baratz [Tue, 31 Oct 2017 20:43:26 +0000 (16:43 -0400)]
Use size_t instead of int, use more specific format string

7 years agoUse interned strings for persistent stream wrappers and filters
Dmitry Stogov [Tue, 31 Oct 2017 15:51:35 +0000 (18:51 +0300)]
Use interned strings for persistent stream wrappers and filters

7 years agoUse known strings for reflection properties
Nikita Popov [Tue, 31 Oct 2017 14:20:34 +0000 (15:20 +0100)]
Use known strings for reflection properties

7 years agoRemove decade-old commented-out code
Sammy Kaye Powers [Mon, 30 Oct 2017 20:06:33 +0000 (15:06 -0500)]
Remove decade-old commented-out code

7 years agoChange checks that should be always true into ZEND_ASSERT() (some edge cases may...
Dmitry Stogov [Tue, 31 Oct 2017 12:41:51 +0000 (15:41 +0300)]
Change checks that should be always true into ZEND_ASSERT() (some edge cases may be trapped here).

7 years agoWorkaroud for inconsistent ZVALs in AST produced by compiler (strings may be REFCOUNT...
Dmitry Stogov [Tue, 31 Oct 2017 12:39:39 +0000 (15:39 +0300)]
Workaroud for inconsistent ZVALs in AST produced by compiler (strings may be REFCOUNTED and INTERNED at the same time).

7 years agoIntern file names and class constants in first place (they may be interned later...
Dmitry Stogov [Tue, 31 Oct 2017 12:36:55 +0000 (15:36 +0300)]
Intern file names and class constants in first place (they may be interned later during constant substitution)

7 years agoAlways calculate calculate string hash value on attempt of interning
Dmitry Stogov [Tue, 31 Oct 2017 12:35:44 +0000 (15:35 +0300)]
Always calculate calculate string hash value on attempt of interning

7 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 31 Oct 2017 12:35:14 +0000 (15:35 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix year
  Add /nologo
  These functions are always available, exif can't be cross version compiled anyway

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 31 Oct 2017 09:38:54 +0000 (10:38 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix year
  Add /nologo

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix year
  Add /nologo

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 31 Oct 2017 09:35:59 +0000 (10:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix year
  Add /nologo

7 years agoFix year
Anatol Belski [Tue, 31 Oct 2017 09:25:15 +0000 (10:25 +0100)]
Fix year

7 years agoAdd /nologo
Anatol Belski [Tue, 31 Oct 2017 09:24:34 +0000 (10:24 +0100)]
Add /nologo

7 years agosingle check is enough
Dmitry Stogov [Tue, 31 Oct 2017 08:07:42 +0000 (11:07 +0300)]
single check is enough

7 years agoThese functions are always available, exif can't be cross version compiled anyway
Kalle Sommer Nielsen [Tue, 31 Oct 2017 07:50:30 +0000 (08:50 +0100)]
These functions are always available, exif can't be cross version compiled anyway

7 years agoAdded zend_hash_add_new_mem/zend_hash_str_add_new_mem. Use them to add new elements...
Dmitry Stogov [Tue, 31 Oct 2017 07:43:10 +0000 (10:43 +0300)]
Added zend_hash_add_new_mem/zend_hash_str_add_new_mem. Use them to add new elements into PCRE cache (we checked the existance before).

7 years agoImproved zend_hash_str_add/update functions
Dmitry Stogov [Tue, 31 Oct 2017 07:35:28 +0000 (10:35 +0300)]
Improved zend_hash_str_add/update functions

7 years agoUse internet strings for EG(ini_entries)
Dmitry Stogov [Mon, 30 Oct 2017 23:16:46 +0000 (02:16 +0300)]
Use internet strings for EG(ini_entries)

7 years agoFixed use-after free introduced in fcc08ce19f39f7ab1381ecc8a010037d41819329
Dmitry Stogov [Mon, 30 Oct 2017 22:20:38 +0000 (01:20 +0300)]
Fixed use-after free introduced in fcc08ce19f39f7ab1381ecc8a010037d41819329

7 years agoFix gc_029_zts.phpt test
Nikita Popov [Mon, 30 Oct 2017 22:05:53 +0000 (23:05 +0100)]
Fix gc_029_zts.phpt test

ZTS and NTS now behave the same here, so reduce this back to a
single test.

7 years agoRemove some unnecessary duplications
Nikita Popov [Mon, 30 Oct 2017 21:48:20 +0000 (22:48 +0100)]
Remove some unnecessary duplications

7 years agoRemove zend_get_parameters(_ex) APIs
Nikita Popov [Mon, 30 Oct 2017 21:00:42 +0000 (22:00 +0100)]
Remove zend_get_parameters(_ex) APIs

zend_get_parameters_ex() has been marked as deprecated for a long
time already. What zend_get_paramers() does is even more
questionable under PHP7. Both functions are obsoleted by the ZPP
mechanism, so I'm dropping them.

7 years agoPrevent reference-counting on persistent zvals (internal constants, default propertie...
Dmitry Stogov [Mon, 30 Oct 2017 20:13:10 +0000 (23:13 +0300)]
Prevent reference-counting on persistent zvals (internal constants, default properties and constants of internal classes).
New macro ZVAL_COPY_OR_DUP() is used perform duplication, if necessary.
This should eliminate related race-coditions in ZTS build and prevent reference-counting bugs after unclean shutdown.

7 years agoImplemented request #62055 (Make run-tests.php support --CGI-- sections)
Christoph M. Becker [Mon, 30 Oct 2017 20:04:59 +0000 (21:04 +0100)]
Implemented request #62055 (Make run-tests.php support --CGI-- sections)

Not regarding the CGI section might even been seen as a bug, and since
server-tests.php appears to broken, anway[1][2], we implement it for
run-tests.php in the way as described[3] for server-tests.php, i.e.
respective tests are skipped if no CGI executable is found.

[1] <https://github.com/php/php-src/pull/222#commitcomment-2064387>
[2] <https://github.com/php/php-src/pull/1811#issuecomment-256677997>
[3] <https://qa.php.net/phpt_details.php#cgi_section>

7 years agoRethink the version checks
Anatol Belski [Mon, 30 Oct 2017 18:48:21 +0000 (19:48 +0100)]
Rethink the version checks

As the actual behavior change happens with ICU >= 58, the new
functionality should stay same in the lower versions. This comply also
with lower PHP versions so far.

7 years agoFix typo
Anatol Belski [Mon, 30 Oct 2017 17:28:39 +0000 (18:28 +0100)]
Fix typo

7 years agoProper ICU version check for restriction levels availability
Anatol Belski [Mon, 30 Oct 2017 17:21:14 +0000 (18:21 +0100)]
Proper ICU version check for restriction levels availability

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 30 Oct 2017 17:17:20 +0000 (18:17 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Add missing ICU version check

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 30 Oct 2017 17:16:47 +0000 (18:16 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add missing ICU version check

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 17:16:03 +0000 (18:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add missing ICU version check

7 years agoAdd missing ICU version check
Anatol Belski [Mon, 30 Oct 2017 17:15:26 +0000 (18:15 +0100)]
Add missing ICU version check

7 years agoMerge branch 'PHP-7.2'
Jakub Zelenka [Mon, 30 Oct 2017 16:44:33 +0000 (16:44 +0000)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Mon, 30 Oct 2017 16:43:36 +0000 (16:43 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Mon, 30 Oct 2017 16:42:23 +0000 (16:42 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoPrevent leaking x509 and csr resources if it is not requested
Jakub Zelenka [Mon, 30 Oct 2017 16:36:38 +0000 (16:36 +0000)]
Prevent leaking x509 and csr resources if it is not requested

All functions using php_openssl_x509_from_zval or php_openssl_csr_from_zval
with makeresource equal to 0 do not deref the resource which means there
is a leak till the end of the request. This can cause issues for long
running apps. It is a generic solution for bug #75363 which also covers
other functions.

7 years agoExtend and speed up pkey export tests
Jakub Zelenka [Mon, 30 Oct 2017 16:05:00 +0000 (16:05 +0000)]
Extend and speed up pkey export tests

7 years agoRewrite openssl_csr_get_subject test to improve coverage
Jakub Zelenka [Mon, 30 Oct 2017 14:29:05 +0000 (14:29 +0000)]
Rewrite openssl_csr_get_subject test to improve coverage

7 years agoAdd openssl_csr_get_public_key test
Jakub Zelenka [Mon, 30 Oct 2017 14:28:18 +0000 (14:28 +0000)]
Add openssl_csr_get_public_key test

7 years agoExtend openssl_pkcs7_* tests to cover resource cert
Jakub Zelenka [Mon, 30 Oct 2017 14:16:03 +0000 (14:16 +0000)]
Extend openssl_pkcs7_* tests to cover resource cert

7 years agoFix cleaning tmp output file in openssl_csr_export_to_file test
Jakub Zelenka [Mon, 30 Oct 2017 14:15:23 +0000 (14:15 +0000)]
Fix cleaning tmp output file in openssl_csr_export_to_file test

7 years agoopenssl: add basic openssl_csr_export_to_file tests
Jelle van der Waa [Fri, 11 Aug 2017 22:58:59 +0000 (00:58 +0200)]
openssl: add basic openssl_csr_export_to_file tests

Add a basic test for openssl_csr_export_to_file.

7 years agoExtend openssl_csr_sign test to cover cert resource
Jakub Zelenka [Mon, 30 Oct 2017 13:57:51 +0000 (13:57 +0000)]
Extend openssl_csr_sign test to cover cert resource

7 years agoSet different invalid path in openssl_pkcs12_export so it is more unlikely to exist
Jakub Zelenka [Mon, 30 Oct 2017 13:40:06 +0000 (13:40 +0000)]
Set different invalid path in openssl_pkcs12_export so it is more unlikely to exist

7 years agoExtend openssl_x509_parse to cover cert resource
Jakub Zelenka [Mon, 30 Oct 2017 13:36:32 +0000 (13:36 +0000)]
Extend openssl_x509_parse to cover cert resource

7 years agoRename and test resource cert in openssl_x509_checkpurpose test
Jakub Zelenka [Mon, 30 Oct 2017 13:17:32 +0000 (13:17 +0000)]
Rename and test resource cert in openssl_x509_checkpurpose test

7 years agoExtend openssl_x509_check_private_key to test resource cert
Jakub Zelenka [Mon, 30 Oct 2017 13:01:27 +0000 (13:01 +0000)]
Extend openssl_x509_check_private_key to test resource cert

7 years agoExtend openssl_x509_fingerprint test to cover resource cert with sha1
Jakub Zelenka [Mon, 30 Oct 2017 12:55:29 +0000 (12:55 +0000)]
Extend openssl_x509_fingerprint test to cover resource cert with sha1

7 years agoFixed test
Dmitry Stogov [Mon, 30 Oct 2017 15:37:03 +0000 (18:37 +0300)]
Fixed test

7 years agoRevert array_slice passthrough optimization
Sara Golemon [Mon, 30 Oct 2017 15:07:16 +0000 (11:07 -0400)]
Revert array_slice passthrough optimization

This reverts commit fabb5b7a7421280b43e6f11c59d9446f6b21e3e6.
This reverts commit e751e6cebad959592f223f99ffd2a60cdf51bed0.

7 years agoMerge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
Joe Watkins [Mon, 30 Oct 2017 14:16:38 +0000 (14:16 +0000)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2

* 'PHP-7.2' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Use abbrev
  Catch with the latest AppVeyor unzip errors
  Fixed type inference

7 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Mon, 30 Oct 2017 14:16:27 +0000 (14:16 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Use abbrev
  Catch with the latest AppVeyor unzip errors
  Fixed type inference

7 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Joe Watkins [Mon, 30 Oct 2017 14:16:16 +0000 (14:16 +0000)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Catch with the latest AppVeyor unzip errors