Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix PDO tests to match SQL standard syntax and pass Firebird tests.

2 files changed, 3 insertions, 3 deletions

diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index 80e3453287..57430ae20d 100644
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -71,7 +71,7 @@ $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(20)
 $db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); 
 $db->exec('INSERT INTO classtypes VALUES(1, \'TestBase\')'); 
 $db->exec('INSERT INTO classtypes VALUES(2, \'TestDerived\')'); 
-$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int NULL, val VARCHAR(255) NULL)');
+$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(255))');
 
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
diff --git a/ext/pdo_firebird/tests/bug_72931.phpt b/ext/pdo_firebird/tests/bug_72931.phpt
index ecbde6a109..4f8a1a1746 100644
--- a/ext/pdo_firebird/tests/bug_72931.phpt
+++ b/ext/pdo_firebird/tests/bug_72931.phpt
@@ -10,7 +10,7 @@ $C->exec('create table tablea (id integer)');
 $S = $C->prepare('insert into tablea (id) values (1) returning id');
 $S->execute();
 $D = $S->fetch(PDO::FETCH_NUM);
-echo $D[0][0];
+echo $D[0];
 unset($S);
 unset($C);
 ?>
@@ -18,7 +18,7 @@ unset($C);
 <?php
 require 'testdb.inc';
 $C = new PDO('firebird:dbname='.$test_base, $user, $password) or die;
-$C->exec('DROP table tablea');
+$C->exec('drop table tablea');
 ?>
 --EXPECT--
 1