From aa736d3073ee4b41535525f6fdf911f409676dcc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Jul 2017 09:49:56 +0200 Subject: v3.2.1 --- REFLECTION | 43 +++++++++++++++++++++++++++---------------- php-phalcon3.spec | 32 ++++++++++---------------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/REFLECTION b/REFLECTION index ac715bf..52e37d8 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #174 phalcon version 3.2.0 ] { +Extension [ extension #175 phalcon version 3.2.1 ] { - INI { Entry [ phalcon.db.escape_identifiers ] @@ -14205,7 +14205,7 @@ Extension [ extension #174 phalcon version 3.2.0 ] { Property [ protected $_implicitOutput ] } - - Methods [25] { + - Methods [26] { Method [ public method __construct ] { - Parameters [1] { @@ -14326,6 +14326,14 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } + Method [ public method collectionResourcesByType ] { + + - Parameters [2] { + Parameter #0 [ array $resources ] + Parameter #1 [ $type ] + } + } + Method [ public method output ] { - Parameters [3] { @@ -18355,6 +18363,15 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } + Method [ public method addForeignKey ] { + + - Parameters [3] { + Parameter #0 [ $tableName ] + Parameter #1 [ $schemaName ] + Parameter #2 [ Phalcon\Db\ReferenceInterface $reference ] + } + } + Method [ public method __construct ] { - Parameters [1] { @@ -18723,15 +18740,6 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } - Method [ public method addForeignKey ] { - - - Parameters [3] { - Parameter #0 [ $tableName ] - Parameter #1 [ $schemaName ] - Parameter #2 [ Phalcon\Db\ReferenceInterface $reference ] - } - } - Method [ public method dropForeignKey ] { - Parameters [3] { @@ -20034,7 +20042,7 @@ Extension [ extension #174 phalcon version 3.2.0 ] { Property [ protected $_escapeChar ] } - - Methods [62] { + - Methods [63] { Method [ public method getColumnDefinition ] { - Parameters [1] { @@ -20236,6 +20244,9 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } + Method [ public method getForeignKeyChecks ] { + } + Method [ public method registerCustomFunction ] { - Parameters [2] { @@ -35978,7 +35989,7 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } - Method [ private method _conditionBetween ] { + Method [ protected method _conditionBetween ] { - Parameters [5] { Parameter #0 [ $clause ] @@ -35989,7 +36000,7 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } - Method [ private method _conditionNotBetween ] { + Method [ protected method _conditionNotBetween ] { - Parameters [5] { Parameter #0 [ $clause ] @@ -36000,7 +36011,7 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } - Method [ private method _conditionIn ] { + Method [ protected method _conditionIn ] { - Parameters [4] { Parameter #0 [ $clause ] @@ -36010,7 +36021,7 @@ Extension [ extension #174 phalcon version 3.2.0 ] { } } - Method [ private method _conditionNotIn ] { + Method [ protected method _conditionNotIn ] { - Parameters [4] { Parameter #0 [ $clause ] diff --git a/php-phalcon3.spec b/php-phalcon3.spec index 7f1d3aa..b0b36bb 100644 --- a/php-phalcon3.spec +++ b/php-phalcon3.spec @@ -13,7 +13,7 @@ %global pkg_name %{name} %endif -%global gh_commit 084fbce9f88c970a4fee64d22911f44dc720f944 +%global gh_commit 2d3aa171588d2d82ed26ade076c70d77ca07e2a3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phalcon %global gh_project cphalcon @@ -29,7 +29,7 @@ %endif Name: %{?sub_prefix}php-phalcon3 -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Phalcon Framework @@ -49,7 +49,7 @@ BuildRequires: %{?scl_prefix}php-devel > 5.5 BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-pdo # For sources generation -BuildRequires: %{?scl_prefix}zephir >= 0.9.8 +BuildRequires: %{?scl_prefix}zephir >= 0.9.9 BuildRequires: %{?scl_prefix}php-gd BuildRequires: %{?scl_prefix}php-libsodium BuildRequires: %{?scl_prefix}php-mbstring @@ -103,12 +103,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ ext/phalcon/assets/filters/ -%if "%{php_version}" < "7" -# https://github.com/phalcon/cphalcon/issues/12909 -sed -e 's/zend_error_noreturn/zend_error/' \ - -i ext/kernel/extended/fcall.c ext/kernel/object.c -%endif - # Sanity check, really often broken extver=$(sed -n '/#define PHP_PHALCON_VERSION/{s/.* "//;s/".*$//;p}' ext/php_phalcon.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -168,12 +162,6 @@ cp -r build/NTS build/ZTS : Build NTS extension cd build/NTS -%if "%{php_version}" < "7" -# https://github.com/phalcon/cphalcon/issues/12909 -sed -e 's/zend_error_noreturn/zend_error/' \ - -i phalcon.zep.c -%endif - %{_bindir}/phpize peclconf %{_bindir}/php-config make %{?_smp_mflags} @@ -181,12 +169,6 @@ make %{?_smp_mflags} %if %{with_zts} : Build ZTS extension cd ../ZTS -%if "%{php_version}" < "7" -# https://github.com/phalcon/cphalcon/issues/12909 -sed -e 's/zend_error_noreturn/zend_error/' \ - -i phalcon.zep.c -%endif - %{_bindir}/zts-phpize peclconf %{_bindir}/zts-php-config make %{?_smp_mflags} @@ -244,7 +226,7 @@ REPORT_EXIT_STATUS=1 \ %files %{!?_licensedir:%global license %%doc} -%license LICENSE.txt +%license LICENSE*.txt %doc *.md %config(noreplace) %{php_inidir}/%{ini_name} @@ -259,6 +241,12 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Jul 11 2017 Remi Collet - 3.2.1-1 +- Update to 3.2.1 + +* Wed Jun 21 2017 Remi Collet - 3.2.0-2 +- test build with zephir 0.9.9 + * Mon Jun 19 2017 Remi Collet - 3.2.0-1 - Update to 3.2.0 - open https://github.com/phalcon/cphalcon/issues/12909 - PHP 5 compat -- cgit