diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 62 | ||||
| -rw-r--r-- | php-pecl-yaf.spec | 51 | ||||
| -rw-r--r-- | yaf-upstream.patch | 62 |
4 files changed, 65 insertions, 112 deletions
@@ -2,7 +2,7 @@ yaf yaf support => enabled -Version => 3.3.6 +Version => 3.3.7 Supports => http://pecl.php.net/package/yaf Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #98 yaf version 3.3.6 ] { +Extension [ <persistent> extension #126 yaf version 3.3.7 ] { - Dependencies { Dependency [ spl (Required) ] @@ -37,7 +37,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { } - Constants [13] { - Constant [ string YAF_VERSION ] { 3.3.6 } + Constant [ string YAF_VERSION ] { 3.3.7 } Constant [ string YAF_ENVIRON ] { product } Constant [ int YAF_ERR_STARTUP_FAILED ] { 512 } Constant [ int YAF_ERR_ROUTE_FAILED ] { 513 } @@ -1795,7 +1795,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Parameters [2] { Parameter #0 [ <required> string $tpl ] - Parameter #1 [ <optional> array $parameters = NULL ] + Parameter #1 [ <optional> ?array $parameters = NULL ] } - Return [ string|bool|null ] } @@ -1804,7 +1804,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Parameters [2] { Parameter #0 [ <required> string $tpl ] - Parameter #1 [ <optional> array $parameters = NULL ] + Parameter #1 [ <optional> ?array $parameters = NULL ] } - Return [ ?bool ] } @@ -1847,7 +1847,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { Method [ <internal:yaf> public method initView ] { - Parameters [1] { - Parameter #0 [ <optional> array $options = NULL ] + Parameter #0 [ <optional> ?array $options = NULL ] } - Return [ ?object ] } @@ -1949,7 +1949,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Parameters [2] { Parameter #0 [ <required> string $tpl ] - Parameter #1 [ <optional> array $parameters = NULL ] + Parameter #1 [ <optional> ?array $parameters = NULL ] } - Return [ string|bool|null ] } @@ -1958,7 +1958,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Parameters [2] { Parameter #0 [ <required> string $tpl ] - Parameter #1 [ <optional> array $parameters = NULL ] + Parameter #1 [ <optional> ?array $parameters = NULL ] } - Return [ ?bool ] } @@ -2001,7 +2001,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method initView ] { - Parameters [1] { - Parameter #0 [ <optional> array $options = NULL ] + Parameter #0 [ <optional> ?array $options = NULL ] } - Return [ ?object ] } @@ -2243,24 +2243,24 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Return [ bool ] } - Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetGet ] { + Method [ <internal:yaf> public method __set ] { - - Parameters [1] { + - Parameters [2] { Parameter #0 [ <required> mixed $name ] + Parameter #1 [ <required> mixed $value ] } - - Return [ mixed ] + - Return [ void ] } - Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetSet ] { + Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetGet ] { - - Parameters [2] { + - Parameters [1] { Parameter #0 [ <required> mixed $name ] - Parameter #1 [ <required> mixed $value ] } - - Return [ void ] + - Return [ mixed ] } - Method [ <internal:yaf> public method __set ] { + Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetSet ] { - Parameters [2] { Parameter #0 [ <required> mixed $name ] @@ -2535,7 +2535,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Parameters [2] { Parameter #0 [ <required> string $tpl ] - Parameter #1 [ <optional> array $tpl_vars = NULL ] + Parameter #1 [ <optional> ?array $tpl_vars = NULL ] } } @@ -2543,7 +2543,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Parameters [2] { Parameter #0 [ <required> string $tpl ] - Parameter #1 [ <optional> array $tpl_vars = NULL ] + Parameter #1 [ <optional> ?array $tpl_vars = NULL ] } } @@ -2576,19 +2576,19 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Properties [0] { } - - Methods [12] { + - Methods [13] { Method [ <internal:yaf, ctor> final public method __construct ] { - Parameters [2] { Parameter #0 [ <required> string $tempalte_dir ] - Parameter #1 [ <optional> array $options = NULL ] + Parameter #1 [ <optional> ?array $options = NULL ] } } Method [ <internal:yaf> public method get ] { - Parameters [1] { - Parameter #0 [ <optional> string $name = NULL ] + Parameter #0 [ <optional> ?string $name = NULL ] } - Return [ mixed ] } @@ -2632,7 +2632,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { Method [ <internal:yaf> public method assignRef ] { - Parameters [2] { - Parameter #0 [ <required> string $name ] + Parameter #0 [ <required> ?string $name ] Parameter #1 [ <required> mixed &$value ] } - Return [ ?object ] @@ -2641,7 +2641,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { Method [ <internal:yaf> public method clear ] { - Parameters [1] { - Parameter #0 [ <optional> string $name = NULL ] + Parameter #0 [ <optional> ?string $name = NULL ] } - Return [ ?object ] } @@ -2661,12 +2661,12 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { - Return [ ?string ] } - Method [ <internal:yaf> public method __get ] { + Method [ <internal:yaf> public method __isset ] { - Parameters [1] { - Parameter #0 [ <optional> string $name = NULL ] + Parameter #0 [ <required> string $name ] } - - Return [ mixed ] + - Return [ bool ] } Method [ <internal:yaf> public method __set ] { @@ -2677,6 +2677,14 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { } - Return [ void ] } + + Method [ <internal:yaf> public method __get ] { + + - Parameters [1] { + Parameter #0 [ <required> string $name ] + } + - Return [ mixed ] + } } } @@ -3213,7 +3221,7 @@ Extension [ <persistent> extension #98 yaf version 3.3.6 ] { Method [ <internal:yaf> public method get ] { - Parameters [1] { - Parameter #0 [ <optional> string $name = NULL ] + Parameter #0 [ <optional> ?string $name = NULL ] } - Return [ mixed ] } diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec index 50109f8..1511647 100644 --- a/php-pecl-yaf.spec +++ b/php-pecl-yaf.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-yaf # -# Copyright (c) 2012-2024 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2012-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -23,20 +23,17 @@ Summary: Yet Another Framework Name: %{?scl_prefix}php-pecl-yaf -Version: 3.3.6 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.3.7 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 URL: https://pecl.php.net/package/yaf Source0: https://pecl.php.net/get/%{sources}%{?prever}.tgz Source1: %{pecl_name}.ini -Patch0: %{pecl_name}-upstream.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear -BuildRequires: pcre-devel # for tests BuildRequires: %{?scl_prefix}php-json @@ -65,8 +62,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h ) if test "x${extver}" != "x%{version}"; then @@ -84,17 +79,21 @@ mkdir ZTS %build %{?dtsenable} +export CFLAGS="%{optflags} -Wno-duplicate-decl-specifier" + cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure --with-php-config=%{__phpconfig} -make %{?_smp_mflags} +%make_build %if %{with_zts} cd ../ZTS %configure --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} +%make_build %endif @@ -102,12 +101,12 @@ make %{?_smp_mflags} %{?dtsenable} # Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} # Install the ZTS stuff %if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -145,14 +144,6 @@ REPORT_EXIT_STATUS=1 \ %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' - -%if %{with tests} -: Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="$OPTS -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php -q --show-diff -%endif %endif @@ -171,6 +162,22 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Jul 29 2025 Remi Collet <remi@remirepo.net> - 3.3.7-1 +- update to 3.3.7 +- drop patches merged upstream + +* Fri Jul 18 2025 Remi Collet <remi@remirepo.net> - 3.3.6-5 +- fix PHP 8.5.0alpha2 build using patch from + https://github.com/laruence/yaf/pull/594 +- re-license spec file to CECILL-2.1 + +* Tue Nov 26 2024 Remi Collet <remi@remirepo.net> - 3.3.6-4 +- drop BR on pcre-devel + +* Tue Oct 1 2024 Remi Collet <remi@remirepo.net> - 3.3.6-3 +- fix PHP 8.4 build using patch from + https://github.com/laruence/yaf/pull/594 + * Wed Jul 10 2024 Remi Collet <remi@remirepo.net> - 3.3.6-2 - add upstream patch for PHP 8.4 diff --git a/yaf-upstream.patch b/yaf-upstream.patch deleted file mode 100644 index 0b40a13..0000000 --- a/yaf-upstream.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b1d252c944a8d70f0dc28415b3d67a7b3bbbf7ce Mon Sep 17 00:00:00 2001 -From: Xinchen Hui <laruence@gmail.com> -Date: Tue, 25 Jun 2024 11:39:59 +0800 -Subject: [PATCH] Fixed build with trunk(8.4) - ---- - routes/yaf_route_regex.c | 9 ++++++++- - routes/yaf_route_rewrite.c | 9 ++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/routes/yaf_route_regex.c b/routes/yaf_route_regex.c -index 45410804..9dd0e2fe 100644 ---- a/routes/yaf_route_regex.c -+++ b/routes/yaf_route_regex.c -@@ -204,13 +204,20 @@ static int yaf_route_regex_match(yaf_route_regex_object *regex, const char *uri, - #if PHP_VERSION_ID < 70400 - php_pcre_match_impl(pce_regexp, (char*)uri, len, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); --#else -+#elif PHP_VERSION_ID < 80400 - { - zend_string *tmp = zend_string_init(uri, len, 0); - php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); - zend_string_release(tmp); - } -+#else -+ { -+ zend_string *tmp = zend_string_init(uri, len, 0); -+ php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, -+ 0/* global */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); -+ zend_string_release(tmp); -+ } - #endif - - if (!zend_hash_num_elements(Z_ARRVAL(subparts))) { -diff --git a/routes/yaf_route_rewrite.c b/routes/yaf_route_rewrite.c -index 716ae6fd..b7b4200a 100644 ---- a/routes/yaf_route_rewrite.c -+++ b/routes/yaf_route_rewrite.c -@@ -209,13 +209,20 @@ static int yaf_route_rewrite_match(yaf_route_rewrite_object *rewrite, const char - #if PHP_VERSION_ID < 70400 - php_pcre_match_impl(pce_regexp, (char*)uri, len, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); --#else -+#elif PHP_VERSION_ID <80400 - { - zend_string *tmp = zend_string_init(uri, len, 0); - php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); - zend_string_release(tmp); - } -+#else -+ { -+ zend_string *tmp = zend_string_init(uri, len, 0); -+ php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, -+ 0/* global */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); -+ zend_string_release(tmp); -+ } - #endif - - if (!zend_hash_num_elements(Z_ARRVAL(subparts))) { |