Merge branch 'bpo/2.9/#3702' into 2.9

doctrine · Oct 27, 2019 · d389f32 · d389f32
2 parents 94b1ea2 + 5ac70f6
commit d389f32
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,9 +41,6 @@ after_script:
     fi
 
 jobs:
-  allow_failures:
-    - php: 7.4snapshot
-
   include:
     - stage: Test
       php: 7.1

diff --git a/tests/travis/install-mssql-pdo_sqlsrv.sh b/tests/travis/install-mssql-pdo_sqlsrv.sh
@@ -4,8 +4,4 @@ set -ex
 
 echo "Installing extension"
 
-if [ "$TRAVIS_PHP_VERSION" == "7.3" ] || [ "$TRAVIS_PHP_VERSION" == "nightly" ] ; then
-  pecl install pdo_sqlsrv-5.4.0preview
-else
-  pecl install pdo_sqlsrv
-fi
+pecl install pdo_sqlsrv-5.7.0preview
diff --git a/tests/travis/install-mssql-sqlsrv.sh b/tests/travis/install-mssql-sqlsrv.sh
@@ -4,8 +4,4 @@ set -ex
 
 echo "Installing extension"
 
-if [ "$TRAVIS_PHP_VERSION" == "7.3" ] || [ "$TRAVIS_PHP_VERSION" == "nightly" ] ; then
-  pecl install sqlsrv-5.4.0preview
-else
-  pecl install sqlsrv
-fi
+pecl install sqlsrv-5.7.0preview