Merge pull request #3702 from morozov/sqlsrv-5.7.0preview

Updated SQL Server extensions to fix build failures on PHP 7.4
doctrine · Oct 17, 2019 · cc405b8 · cc405b8
2 parents 8012286 + 0dab22f
commit cc405b8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,9 +37,6 @@ after_script:
     fi
 
 jobs:
-  allow_failures:
-    - php: 7.4snapshot
-
   include:
 
     - stage: Smoke Testing

diff --git a/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php b/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
@@ -340,7 +340,9 @@ public function listTableDetails($tableName) : Table
 
         $tableOptions = $this->_conn->fetchAssoc($sql);
 
-        $table->addOption('comment', $tableOptions['table_comment']);
+        if ($tableOptions !== false) {
+            $table->addOption('comment', $tableOptions['table_comment']);
+        }
 
         return $table;
     }

diff --git a/tests/travis/install-mssql-pdo_sqlsrv.sh b/tests/travis/install-mssql-pdo_sqlsrv.sh
@@ -4,4 +4,4 @@ set -ex
 
 echo "Installing extension"
 
-pecl install pdo_sqlsrv
+pecl install pdo_sqlsrv-5.7.0preview
diff --git a/tests/travis/install-mssql-sqlsrv.sh b/tests/travis/install-mssql-sqlsrv.sh
@@ -4,4 +4,4 @@ set -ex
 
 echo "Installing extension"
 
-pecl install sqlsrv
+pecl install sqlsrv-5.7.0preview
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ set -ex

		echo "Installing extension"

		pecl install pdo_sqlsrv
		pecl install pdo_sqlsrv-5.7.0preview