From 44bc05b0c1cf6a02338a68b578817df20571381e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Dec 2018 13:56:21 +0100 Subject: update to 2.2.0 raise dependency on PHP 7.0 switch to oracle client library 18.3 --- PHPINFO | 23 +++++++++++++++++++++++ REFLECTION | 41 ++++++++++++++++++++++++++++++++++++++-- php-pecl-oci8.spec | 55 +++++++++++++++++++++++++----------------------------- 3 files changed, 87 insertions(+), 32 deletions(-) create mode 100644 PHPINFO diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..76df586 --- /dev/null +++ b/PHPINFO @@ -0,0 +1,23 @@ + +oci8 + +OCI8 Support => enabled +OCI8 DTrace Support => enabled +OCI8 Version => 2.2.0 +Oracle Run-time Client Library Version => 18.3.0.0.0 +Oracle Compile-time Instant Client Version => 18.3 + +Directive => Local Value => Master Value +oci8.max_persistent => -1 => -1 +oci8.persistent_timeout => -1 => -1 +oci8.ping_interval => 60 => 60 +oci8.privileged_connect => Off => Off +oci8.statement_cache_size => 20 => 20 +oci8.default_prefetch => 100 => 100 +oci8.old_oci_close_semantics => Off => Off +oci8.connection_class => no value => no value +oci8.events => Off => Off + +Statistics => +Active Persistent Connections => 0 +Active Connections => 0 diff --git a/REFLECTION b/REFLECTION index 0dcf318..712740a 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #37 oci8 version 2.0.11 ] { +Extension [ extension #122 oci8 version 2.2.0 ] { - INI { Entry [ oci8.max_persistent ] @@ -30,7 +30,7 @@ Extension [ extension #37 oci8 version 2.0.11 ] { } } - - Constants [63] { + - Constants [73] { Constant [ integer OCI_DEFAULT ] { 0 } Constant [ integer OCI_SYSOPER ] { 4 } Constant [ integer OCI_SYSDBA ] { 2 } @@ -94,6 +94,16 @@ Extension [ extension #37 oci8 version 2.0.11 ] { Constant [ integer OCI_D_ROWID ] { 54 } Constant [ integer OCI_TEMP_CLOB ] { 2 } Constant [ integer OCI_TEMP_BLOB ] { 1 } + Constant [ integer OCI_FO_END ] { 1 } + Constant [ integer OCI_FO_ABORT ] { 2 } + Constant [ integer OCI_FO_REAUTH ] { 4 } + Constant [ integer OCI_FO_BEGIN ] { 8 } + Constant [ integer OCI_FO_ERROR ] { 16 } + Constant [ integer OCI_FO_NONE ] { 1 } + Constant [ integer OCI_FO_SESSION ] { 2 } + Constant [ integer OCI_FO_SELECT ] { 4 } + Constant [ integer OCI_FO_TXNAL ] { 8 } + Constant [ integer OCI_FO_RETRY ] { 25410 } } - Functions { @@ -520,6 +530,20 @@ Extension [ extension #37 oci8 version 2.0.11 ] { Parameter #1 [ $client_identifier ] } } + Function [ function oci_set_db_operation ] { + + - Parameters [2] { + Parameter #0 [ $connection_resource ] + Parameter #1 [ $action ] + } + } + Function [ function oci_set_call_timeout ] { + + - Parameters [2] { + Parameter #0 [ $connection_resource ] + Parameter #1 [ $call_timeout ] + } + } Function [ function oci_set_edition ] { - Parameters [1] { @@ -618,6 +642,19 @@ Extension [ extension #37 oci8 version 2.0.11 ] { Parameter #2 [ $schema_name ] } } + Function [ function oci_register_taf_callback ] { + + - Parameters [2] { + Parameter #0 [ $connection_resource ] + Parameter #1 [ $function_name ] + } + } + Function [ function oci_unregister_taf_callback ] { + + - Parameters [1] { + Parameter #0 [ $connection_resource ] + } + } Function [ function oci_free_cursor ] { - Parameters [1] { diff --git a/php-pecl-oci8.spec b/php-pecl-oci8.spec index 8e0910d..07f0f1d 100644 --- a/php-pecl-oci8.spec +++ b/php-pecl-oci8.spec @@ -12,26 +12,17 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name oci8 %global with_tests 0%{?_with_tests:1} -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else %global ini_name 40-%{pecl_name}.ini -%endif -%global oraclever 12.1 -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%global oraclever 18.3 %global with_dtrace 1 -%else -%global with_dtrace 0 -%endif Summary: Extension for Oracle Database Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 2.0.12 +Version: 2.2.0 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz @@ -39,7 +30,7 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: %{pecl_name}-2.0.8-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.2 +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: oracle-instantclient-devel >= %{oraclever} %if %{with_dtrace} @@ -58,19 +49,26 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.0" +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -186,10 +184,8 @@ cp -pr NTS ZTS %build %if %{with_dtrace} -%if "%{php_version}" > "5.5" export PHP_DTRACE=yes %endif -%endif peclconf() { %configure \ @@ -215,7 +211,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -268,7 +263,7 @@ make test %endif -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -288,12 +283,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -308,6 +298,11 @@ rm -rf %{buildroot} %changelog +* Mon Dec 10 2018 Remi Collet - 2.2.0-1 +- update to 2.2.0 +- raise dependency on PHP 7.0 +- switch to oracle client library 18.3 + * Thu Sep 01 2016 Remi Collet - 2.0.12-1 - Update to 2.0.12 -- cgit