v5.7.0preview

5 files changed, 11 insertions, 37 deletions

diff --git a/1013.patch b/1013.patch
deleted file mode 100644
index 581ef14..0000000
--- a/1013.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c0ee075892d8d38f0f47981f8e4db214a4a86d1a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 24 Jul 2019 07:30:26 +0200
-Subject: [PATCH] fix for 7.4.0beta1
-
----
- source/shared/core_stream.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/source/shared/core_stream.cpp b/source/shared/core_stream.cpp
-index d822d4a85..559498b8e 100644
---- a/source/shared/core_stream.cpp
-+++ b/source/shared/core_stream.cpp
-@@ -44,7 +44,11 @@ int sqlsrv_stream_close( _Inout_ php_stream* stream, int /*close_handle*/ TSRMLS
- // read from a sqlsrv stream into the buffer provided by Zend.  The parameters for binary vs. char are
- // set when sqlsrv_get_field is called by the user specifying which field type they want.
- 
-+#if PHP_VERSION_ID < 70400
- size_t sqlsrv_stream_read( _Inout_ php_stream* stream, _Out_writes_bytes_(count) char* buf, _Inout_ size_t count TSRMLS_DC )
-+#else
-+ssize_t sqlsrv_stream_read( _Inout_ php_stream* stream, _Out_writes_bytes_(count) char* buf, _Inout_ size_t count TSRMLS_DC )
-+#endif
- {
- 	SQLLEN read = 0;
-     SQLSMALLINT c_type = SQL_C_CHAR;
diff --git a/Makefile b/Makefile
index 05bf722..900892a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,5 @@ NAME := $(shell basename $(SRCDIR))
 include ../../common/Makefile
 
 refl:
-	php --re "ionCube loader"  > REFLECTION
+	php --ri sqlsrv  > PHPINFO
+	php --re sqlsrv  > REFLECTION
diff --git a/PHPINFO b/PHPINFO
index fb3a71c..0ab4371 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 sqlsrv
 
 sqlsrv support => enabled
-ExtensionVer => 5.6.1
+ExtensionVer => 5.7.0-preview
 
 Directive => Local Value => Master Value
 sqlsrv.WarningsReturnAsErrors => On => On
diff --git a/REFLECTION b/REFLECTION
index 16e15ce..b6155a5 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #145 sqlsrv version 5.6.1 ] {
+Extension [ <persistent> extension #145 sqlsrv version 5.7.0-preview ] {
 
   - INI {
     Entry [ sqlsrv.WarningsReturnAsErrors <ALL> ]
@@ -263,7 +263,7 @@ Extension [ <persistent> extension #145 sqlsrv version 5.6.1 ] {
     Function [ <internal:sqlsrv> function sqlsrv_free_stmt ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $conn ]
+        Parameter #0 [ <required> $stmt ]
       }
     }
     Function [ <internal:sqlsrv> function sqlsrv_field_metadata ] {
diff --git a/php-sqlsrv.spec b/php-sqlsrv.spec
index 7ac1665..168d9f0 100644
--- a/php-sqlsrv.spec
+++ b/php-sqlsrv.spec
@@ -21,13 +21,13 @@
 %global with_zts     0%{!?_without_zts:%{?__ztsphp:1}}
 # After 20-pdo.ini
 %global ininame      40-%{extname}.ini
-%global msodbcsqlver 17.3
+%global msodbcsqlver 17.4
 
 Name:          %{?scl_prefix}php-sqlsrv
 Summary:       Microsoft Drivers for PHP for SQL Server
-%global tarversion 5.6.1
-Version:       5.6.1
-Release:       5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+%global tarversion 5.7.0preview
+Version:       5.7.0~preview
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       MIT
 
 URL:           https://github.com/Microsoft/msphpsql
@@ -38,8 +38,6 @@ Source1:       http://pecl.php.net/get/pdo_%{extname}-%{tarversion}.tgz
 Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 %endif
 
-Patch0:        https://patch-diff.githubusercontent.com/raw/microsoft/msphpsql/pull/1013.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?dtsprefix}gcc-c++
 BuildRequires: %{?scl_prefix}php-devel > 7.1
@@ -132,9 +130,9 @@ mv %{gh_project}-%{gh_commit}/LICENSE .
 
 cd NTS
 cd %{extname}
-%patch0 -p2
+: no patch
 cd ../pdo_%{extname}
-%patch0 -p2
+: no patch
 cd ..
 
 # Sanity check, really often broken