]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 25 Oct 2019 09:25:49 +0000 (11:25 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 25 Oct 2019 09:25:49 +0000 (11:25 +0200)
* PHP-7.4:
  Check class linking in VERIFY_RETURN_TYPE optimization
  Simplify travis setup scripts

1  2 
.travis.yml
ext/opcache/Optimizer/dfa_pass.c

diff --cc .travis.yml
index af2b7afb17877e6d391486eacfd3132cc20a6812,cbc75370fbba267901bc937efc13801b81a166f5..b25be33238dae1fe90e19208e528e1c79f29902b
@@@ -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
Simple merge