From c1d8e4abb3d90e29329793b6ec3d9ca1f40338e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 20 Apr 2018 07:19:02 +0200 Subject: v8.0.11 (stable) --- REFLECTION | 411 +++++++------------------------------------- mysql_xdevapi-build.patch | 13 -- php-pecl-mysql-xdevapi.spec | 30 +++- 3 files changed, 88 insertions(+), 366 deletions(-) delete mode 100644 mysql_xdevapi-build.patch diff --git a/REFLECTION b/REFLECTION index 09f68b4..ce65d01 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,8 +1,9 @@ -Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { +Extension [ extension #117 mysql_xdevapi version 8.0.11 ] { - Dependencies { Dependency [ standard (Required) ] Dependency [ mysqlnd (Required) ] + Dependency [ hash (Required) ] Dependency [ json (Required) ] } @@ -27,7 +28,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - - Constants [35] { + - Constants [38] { Constant [ integer MYSQLX_CLIENT_SSL ] { 2048 } Constant [ integer MYSQLX_TYPE_DECIMAL ] { 0 } Constant [ integer MYSQLX_TYPE_TINY ] { 1 } @@ -63,6 +64,9 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { Constant [ integer MYSQLX_TYPE_JSON ] { 245 } Constant [ integer MYSQLX_TYPE_NEWDECIMAL ] { 246 } Constant [ integer MYSQLX_TYPE_BIT ] { 16 } + Constant [ integer MYSQLX_LOCK_DEFAULT ] { 0 } + Constant [ integer MYSQLX_LOCK_NOWAIT ] { 1 } + Constant [ integer MYSQLX_LOCK_SKIP_LOCKED ] { 2 } } - Functions { @@ -79,7 +83,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - - Classes [36] { + - Classes [34] { Interface [ interface mysql_xdevapi\DatabaseObject ] { - Constants [0] { @@ -179,53 +183,6 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Interface [ interface mysql_xdevapi\Session ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [5] { - Method [ abstract public method getSchemas ] { - - - Parameters [0] { - } - } - - Method [ abstract public method getSchema ] { - - - Parameters [0] { - } - } - - Method [ abstract public method createSchema ] { - - - Parameters [0] { - } - } - - Method [ abstract public method dropSchema ] { - - - Parameters [0] { - } - } - - Method [ abstract public method close ] { - - - Parameters [0] { - } - } - } - } - Interface [ interface mysql_xdevapi\CrudOperationBindable ] { - Constants [0] { @@ -488,7 +445,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { Class [ final class mysql_xdevapi\Driver ] { - Constants [1] { - Constant [ public string version ] { 8.0.4 } + Constant [ public string version ] { 8.0.11 } } - Static properties [0] { @@ -506,7 +463,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\BaseSession implements mysql_xdevapi\Session ] { + Class [ class mysql_xdevapi\XSession ] { - Constants [0] { } @@ -520,247 +477,13 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { - Properties [0] { } - - Methods [18] { + - Methods [1] { Method [ private method __construct ] { } - - Method [ public method getServerVersion ] { - - - Parameters [0] { - } - } - - Method [ public method getClientId ] { - - - Parameters [0] { - } - } - - Method [ public method generateUUID ] { - - - Parameters [0] { - } - } - - Method [ public method quoteName ] { - - - Parameters [1] { - Parameter #0 [ string $name ] - } - } - - Method [ public method getSchemas ] { - - - Parameters [0] { - } - } - - Method [ public method getSchema ] { - - - Parameters [0] { - } - } - - Method [ public method createSchema ] { - - - Parameters [0] { - } - } - - Method [ public method dropSchema ] { - - - Parameters [0] { - } - } - - Method [ public method startTransaction ] { - - - Parameters [0] { - } - } - - Method [ public method commit ] { - - - Parameters [0] { - } - } - - Method [ public method rollback ] { - - - Parameters [0] { - } - } - - Method [ public method setSavepoint ] { - - - Parameters [1] { - Parameter #0 [ $name ] - } - } - - Method [ public method rollbackTo ] { - - - Parameters [1] { - Parameter #0 [ string $name ] - } - } - - Method [ public method releaseSavepoint ] { - - - Parameters [1] { - Parameter #0 [ string $name ] - } - } - - Method [ public method listClients ] { - - - Parameters [0] { - } - } - - Method [ public method killClient ] { - - - Parameters [1] { - Parameter #0 [ integer $client_id ] - } - } - - Method [ public method close ] { - - - Parameters [0] { - } - } - } - } - - Class [ class mysql_xdevapi\XSession extends mysql_xdevapi\BaseSession implements mysql_xdevapi\Session ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [18] { - Method [ private method __construct ] { - } - - Method [ public method getServerVersion ] { - - - Parameters [0] { - } - } - - Method [ public method getClientId ] { - - - Parameters [0] { - } - } - - Method [ public method generateUUID ] { - - - Parameters [0] { - } - } - - Method [ public method quoteName ] { - - - Parameters [1] { - Parameter #0 [ string $name ] - } - } - - Method [ public method getSchemas ] { - - - Parameters [0] { - } - } - - Method [ public method getSchema ] { - - - Parameters [0] { - } - } - - Method [ public method createSchema ] { - - - Parameters [0] { - } - } - - Method [ public method dropSchema ] { - - - Parameters [0] { - } - } - - Method [ public method startTransaction ] { - - - Parameters [0] { - } - } - - Method [ public method commit ] { - - - Parameters [0] { - } - } - - Method [ public method rollback ] { - - - Parameters [0] { - } - } - - Method [ public method setSavepoint ] { - - - Parameters [1] { - Parameter #0 [ $name ] - } - } - - Method [ public method rollbackTo ] { - - - Parameters [1] { - Parameter #0 [ string $name ] - } - } - - Method [ public method releaseSavepoint ] { - - - Parameters [1] { - Parameter #0 [ string $name ] - } - } - - Method [ public method listClients ] { - - - Parameters [0] { - } - } - - Method [ public method killClient ] { - - - Parameters [1] { - Parameter #0 [ integer $client_id ] - } - } - - Method [ public method close ] { - - - Parameters [0] { - } - } } } - Class [ class mysql_xdevapi\NodeSession extends mysql_xdevapi\BaseSession implements mysql_xdevapi\Session ] { + Class [ class mysql_xdevapi\Session ] { - Constants [0] { } @@ -775,7 +498,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } - Methods [20] { - Method [ private method __construct ] { + Method [ private method __construct ] { } Method [ public method executeSql ] { @@ -788,108 +511,108 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Method [ public method quoteName ] { + Method [ public method quoteName ] { - Parameters [1] { Parameter #0 [ string $name ] } } - Method [ public method getServerVersion ] { + Method [ public method getServerVersion ] { - Parameters [0] { } } - Method [ public method getClientId ] { + Method [ public method getClientId ] { - Parameters [0] { } } - Method [ public method generateUUID ] { + Method [ public method generateUUID ] { - Parameters [0] { } } - Method [ public method getSchemas ] { + Method [ public method createSchema ] { - Parameters [0] { } } - Method [ public method getSchema ] { + Method [ public method dropSchema ] { - Parameters [0] { } } - Method [ public method createSchema ] { + Method [ public method getSchemas ] { - Parameters [0] { } } - Method [ public method dropSchema ] { + Method [ public method getSchema ] { - Parameters [0] { } } - Method [ public method startTransaction ] { + Method [ public method startTransaction ] { - Parameters [0] { } } - Method [ public method commit ] { + Method [ public method commit ] { - Parameters [0] { } } - Method [ public method rollback ] { + Method [ public method rollback ] { - Parameters [0] { } } - Method [ public method setSavepoint ] { + Method [ public method setSavepoint ] { - Parameters [1] { Parameter #0 [ $name ] } } - Method [ public method rollbackTo ] { + Method [ public method rollbackTo ] { - Parameters [1] { Parameter #0 [ string $name ] } } - Method [ public method releaseSavepoint ] { + Method [ public method releaseSavepoint ] { - Parameters [1] { Parameter #0 [ string $name ] } } - Method [ public method listClients ] { + Method [ public method listClients ] { - Parameters [0] { } } - Method [ public method killClient ] { + Method [ public method killClient ] { - Parameters [1] { Parameter #0 [ integer $client_id ] } } - Method [ public method close ] { + Method [ public method close ] { - Parameters [0] { } @@ -897,7 +620,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeSchema implements mysql_xdevapi\DatabaseObject ] { + Class [ class mysql_xdevapi\Schema implements mysql_xdevapi\DatabaseObject ] { - Constants [0] { } @@ -983,7 +706,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeCollection implements mysql_xdevapi\SchemaObject, mysql_xdevapi\DatabaseObject ] { + Class [ class mysql_xdevapi\Collection implements mysql_xdevapi\SchemaObject, mysql_xdevapi\DatabaseObject ] { - Constants [0] { } @@ -1107,7 +830,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeCollectionAdd implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\CollectionAdd implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -1133,7 +856,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeCollectionFind implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSortable ] { + Class [ class mysql_xdevapi\CollectionFind implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSortable ] { - Constants [0] { } @@ -1202,13 +925,15 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { Method [ public method lockShared ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ integer $lock_waiting_option ] } } Method [ public method lockExclusive ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ integer $lock_waiting_option ] } } @@ -1220,7 +945,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeCollectionModify implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSkippable, mysql_xdevapi\CrudOperationSortable ] { + Class [ class mysql_xdevapi\CollectionModify implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSkippable, mysql_xdevapi\CrudOperationSortable ] { - Constants [0] { } @@ -1334,7 +1059,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeCollectionRemove implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSortable ] { + Class [ class mysql_xdevapi\CollectionRemove implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSortable ] { - Constants [0] { } @@ -1381,7 +1106,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeStatement ] { + Class [ class mysql_xdevapi\Statement ] { - Constants [2] { Constant [ public integer EXECUTE_ASYNC ] { 1 } @@ -1421,7 +1146,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeSqlStatement ] { + Class [ class mysql_xdevapi\SqlStatement ] { - Constants [2] { Constant [ public integer EXECUTE_ASYNC ] { 1 } @@ -1472,7 +1197,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Interface [ interface mysql_xdevapi\NodeBaseResult ] { + Interface [ interface mysql_xdevapi\BaseResult ] { - Constants [0] { } @@ -1501,7 +1226,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeDocResult implements mysql_xdevapi\NodeBaseResult, Traversable ] { + Class [ class mysql_xdevapi\DocResult implements mysql_xdevapi\BaseResult, Traversable ] { - Constants [0] { } @@ -1531,13 +1256,13 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Method [ public method getWarningCount ] { + Method [ public method getWarningCount ] { - Parameters [0] { } } - Method [ public method getWarnings ] { + Method [ public method getWarnings ] { - Parameters [0] { } @@ -1545,7 +1270,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeResult implements mysql_xdevapi\NodeBaseResult, Traversable ] { + Class [ class mysql_xdevapi\Result implements mysql_xdevapi\BaseResult, Traversable ] { - Constants [0] { } @@ -1559,7 +1284,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { - Properties [0] { } - - Methods [7] { + - Methods [6] { Method [ private method __construct ] { } @@ -1575,25 +1300,19 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Method [ public method getDocumentId ] { + Method [ public method getGeneratedIds ] { - Parameters [0] { } } - Method [ public method getDocumentIds ] { + Method [ public method getWarningCount ] { - Parameters [0] { } } - Method [ public method getWarningCount ] { - - - Parameters [0] { - } - } - - Method [ public method getWarnings ] { + Method [ public method getWarnings ] { - Parameters [0] { } @@ -1601,7 +1320,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeRowResult implements mysql_xdevapi\NodeBaseResult, Traversable ] { + Class [ class mysql_xdevapi\RowResult implements mysql_xdevapi\BaseResult, Traversable ] { - Constants [0] { } @@ -1631,13 +1350,13 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Method [ public method getWarningCount ] { + Method [ public method getWarningCount ] { - Parameters [0] { } } - Method [ public method getWarnings ] { + Method [ public method getWarnings ] { - Parameters [0] { } @@ -1663,7 +1382,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeSqlStatementResult implements mysql_xdevapi\NodeBaseResult, Traversable ] { + Class [ class mysql_xdevapi\SqlStatementResult implements mysql_xdevapi\BaseResult, Traversable ] { - Constants [0] { } @@ -1711,19 +1430,19 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Method [ public method getDocumentId ] { + Method [ public method getGeneratedIds ] { - Parameters [0] { } } - Method [ public method getWarningCount ] { + Method [ public method getWarningCount ] { - Parameters [0] { } } - Method [ public method getWarnings ] { + Method [ public method getWarnings ] { - Parameters [0] { } @@ -1847,7 +1566,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeTable implements mysql_xdevapi\SchemaObject, mysql_xdevapi\DatabaseObject ] { + Class [ class mysql_xdevapi\Table implements mysql_xdevapi\SchemaObject, mysql_xdevapi\DatabaseObject ] { - Constants [0] { } @@ -1928,7 +1647,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeTableDelete implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\TableDelete implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -1989,7 +1708,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeTableInsert implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\TableInsert implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -2022,7 +1741,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeTableSelect implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\TableSelect implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -2091,13 +1810,15 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { Method [ public method lockShared ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ integer $lock_waiting_option ] } } Method [ public method lockExclusive ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ integer $lock_waiting_option ] } } @@ -2109,7 +1830,7 @@ Extension [ extension #116 mysql_xdevapi version 8.0.4 ] { } } - Class [ class mysql_xdevapi\NodeTableUpdate implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\TableUpdate implements mysql_xdevapi\Executable ] { - Constants [0] { } diff --git a/mysql_xdevapi-build.patch b/mysql_xdevapi-build.patch deleted file mode 100644 index 74af55c..0000000 --- a/mysql_xdevapi-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up ./config.m4.old ./config.m4 ---- ./config.m4.old 2017-03-14 08:58:13.000000000 +0100 -+++ ./config.m4 2017-03-14 08:58:19.000000000 +0100 -@@ -22,6 +22,9 @@ PHP_ARG_ENABLE(mysql-xdevapi-message-cla - [ --enable-mysql-xdevapi-message-classes - Enable support for the experimental message classes in mysql-xdevapi], yes, no) - -+PHP_ARG_WITH(openssl, for OpenSSL support, -+[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 1.0.1)]) -+ - dnl If some extension uses mysql-xdevapi it will get compiled in PHP core - if test "$PHP_MYSQL_XDEVAPI" != "no" || test "$PHP_MYSQL_XDEVAPI_ENABLED" = "yes"; then - PHP_REQUIRE_CXX diff --git a/php-pecl-mysql-xdevapi.spec b/php-pecl-mysql-xdevapi.spec index 819bb7e..06855db 100644 --- a/php-pecl-mysql-xdevapi.spec +++ b/php-pecl-mysql-xdevapi.spec @@ -1,11 +1,15 @@ # remirepo spec file for php-pecl-mysql-xdevapi # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + %if 0%{?scl:1} %global sub_prefix %{scl_prefix} %scl_package php-pecl-mysql-xdevapi @@ -20,7 +24,7 @@ Summary: MySQL database access functions Name: %{?sub_prefix}php-pecl-mysql-xdevapi -Version: 8.0.3 +Version: 8.0.11 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP @@ -28,11 +32,11 @@ Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -# Workaround for out-of-tree build -Patch0: %{pecl_name}-build.patch - +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?dtsprefix}gcc-c++ BuildRequires: %{?scl_prefix}php-devel > 7.1 BuildRequires: %{?scl_prefix}php-mysqlnd +BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-pear BuildRequires: protobuf-devel @@ -48,6 +52,7 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-mysqlnd%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} +Requires: %{?scl_prefix}php-hash%{?_isa} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} @@ -101,6 +106,9 @@ data. * Modern practices and syntax styles are used to get away from traditional SQL-String-Building. See Chapter 10, Building Expressions. +Documentation: http://php.net/mysql-xdevapi + + Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. @@ -114,8 +122,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .old - # Check version as upstream often forget to update this extver=$(sed -n '/#define PHP_MYSQL_XDEVAPI_VERSION/{s/.* "//;s/".*$//;p}' php_mysql_xdevapi.h) if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then @@ -151,6 +157,8 @@ EOF peclconf() { %configure \ --enable-mysql-xdevapi \ + --with-boost \ + --with-protobuf \ --with-php-config=$1 } @@ -266,7 +274,7 @@ exit $RET %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 @@ -301,6 +309,12 @@ fi %changelog +* Fri Apr 20 2018 Remi Collet - 8.0.11-1 +- update to 8.0.11 (stable) + +* Thu Feb 1 2018 Remi Collet - 8.0.4-1 +- Update to 8.0.4 (alpha) + * Fri Nov 3 2017 Remi Collet - 8.0.3-1 - Update to 8.0.3 (alpha) -- cgit