From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 25 Oct 2019 09:25:49 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=711e2a1216b4a2c68d52752906ca1f0e51832e01;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Check class linking in VERIFY_RETURN_TYPE optimization
  Simplify travis setup scripts
---

711e2a1216b4a2c68d52752906ca1f0e51832e01
diff --cc .travis.yml
index af2b7afb17,cbc75370fb..b25be33238
--- 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