com php-src: Merge branch 'PHP-7.4': .travis.yml ext/opcache/Op timizer/dfa_pass.c
| From: | Nikita Popov | Date: | Fri, 25 Oct 2019 09:25:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': .travis.yml ext/opcache/Op timizer/dfa_pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109056@lists.php.net to get a copy of this message | ||
Commit: 711e2a1216b4a2c68d52752906ca1f0e51832e01
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 25 Oct 2019 11:25:49 +0200
Parents: c858d17f06179aa25f6e8aa06965313fd519d8e9 f07565b0ebdfc5b8210bbf58d994ebd319014e67
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=711e2a1216b4a2c68d52752906ca1f0e51832e01
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Check class linking in VERIFY_RETURN_TYPE optimization
Simplify travis setup scripts
Changed paths:
MM .travis.yml
MM ext/opcache/Optimizer/dfa_pass.c
Diff:
diff --cc .travis.yml
index af2b7afb178,cbc75370fbb..b25be33238d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -51,10 -51,11 +51,11 @@@ env
- PDO_MYSQL_TEST_USER=travis
- PDO_MYSQL_TEST_PASS=
- PDO_MYSQL_TEST_HOST=127.0.0.1
+ - PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres
password="
- REPORT_EXIT_STATUS=1
matrix:
- - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
- - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
+ - ENABLE_ZTS=0 ENABLE_DEBUG=0
+ - ENABLE_ZTS=1 ENABLE_DEBUG=1
before_script:
- ccache --version