summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-11-12 08:11:11 +0100
committerRemi Collet <remi@remirepo.net>2018-11-12 08:11:11 +0100
commit49eee5d48346ed93c94126f839da01204d45c3c4 (patch)
tree6869b97fff8eaa29d77527142bf99accf1614e9f
parent83dfd48f0a445b0ccf4d988084072b5f1d50d59d (diff)
update to 0.8.3
raise dependency on PHP 5.6
-rw-r--r--53.patch24
-rw-r--r--PHPINFO23
-rw-r--r--REFLECTION8
-rw-r--r--php-pecl-handlebars.spec15
4 files changed, 34 insertions, 36 deletions
diff --git a/53.patch b/53.patch
deleted file mode 100644
index 576a39d..0000000
--- a/53.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b7e8e93b8fe5dab20757e23e5c33577e6a545304 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 26 Jun 2018 09:35:53 +0200
-Subject: [PATCH] switch to zend_register_class_alias, fix for PHP 7.3
-
----
- registry.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/registry.c b/registry.c
-index 1749989..77da738 100644
---- a/registry.c
-+++ b/registry.c
-@@ -31,8 +31,8 @@ PHP_MINIT_FUNCTION(handlebars_registry)
- zend_class_implements(HandlebarsDefaultRegistry_ce_ptr TSRMLS_CC, 1, HandlebarsRegistry_ce_ptr);
-
- // Add aliases for old class names
-- zend_register_class_alias_ex(ZEND_STRL("Handlebars\\Registry\\Registry"), HandlebarsRegistry_ce_ptr TSRMLS_CC);
-- zend_register_class_alias_ex(ZEND_STRL("Handlebars\\Registry\\DefaultRegistry"), HandlebarsDefaultRegistry_ce_ptr TSRMLS_CC);
-+ zend_register_class_alias("Handlebars\\Registry\\Registry", HandlebarsRegistry_ce_ptr TSRMLS_CC);
-+ zend_register_class_alias("Handlebars\\Registry\\DefaultRegistry", HandlebarsDefaultRegistry_ce_ptr TSRMLS_CC);
-
- return SUCCESS;
- }
diff --git a/PHPINFO b/PHPINFO
new file mode 100644
index 0000000..ee54e86
--- /dev/null
+++ b/PHPINFO
@@ -0,0 +1,23 @@
+
+handlebars
+
+Version => 0.8.3
+Released => 2018-11-11
+Authors => John Boehr <jbboehr@gmail.com> (lead)
+Spec Version => 4.0.5
+libhandlebars Version => 0.6.4
+libhandlebars Handlebars Spec Version => 4.0.5
+libhandlebars Mustache Spec Version => 1.1.3
+PSR support => active
+Local memory usage => 48
+
+Directive => Local Value => Master Value
+handlebars.pool_size => 128k => 128k
+handlebars.cache.enable => On => On
+handlebars.cache.enable_cli => Off => Off
+handlebars.cache.backend => mmap => mmap
+handlebars.cache.max_size => 67108864 => 67108864
+handlebars.cache.max_entries => 349529 => 349529
+handlebars.cache.max_age => -1 => -1
+handlebars.cache.save_path => /tmp/php-handlebars-cache => /tmp/php-handlebars-cache
+handlebars.cache.stat => On => On
diff --git a/REFLECTION b/REFLECTION
index 4b5bb87..b6a1183 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #181 handlebars version 0.8.2 ] {
+Extension [ <persistent> extension #188 handlebars version 0.8.3 ] {
- Dependencies {
Dependency [ psr (Optional) ]
@@ -36,7 +36,7 @@ Extension [ <persistent> extension #181 handlebars version 0.8.2 ] {
- Constants [4] {
Constant [ integer Handlebars\PSR ] { 1 }
- Constant [ string Handlebars\VERSION ] { 0.8.2 }
+ Constant [ string Handlebars\VERSION ] { 0.8.3 }
Constant [ string Handlebars\LIBVERSION ] { 0.6.4 }
Constant [ null Handlebars\CACHE_BACKEND ] { }
}
@@ -752,8 +752,8 @@ Extension [ <persistent> extension #181 handlebars version 0.8.2 ] {
Method [ <internal:SPL, inherits ArrayObject, ctor> public method __construct ] {
- Parameters [3] {
- Parameter #0 [ <optional> $array ]
- Parameter #1 [ <optional> $ar_flags ]
+ Parameter #0 [ <optional> $input ]
+ Parameter #1 [ <optional> $flags ]
Parameter #2 [ <optional> $iterator_class ]
}
}
diff --git a/php-pecl-handlebars.spec b/php-pecl-handlebars.spec
index 6644954..ee00b33 100644
--- a/php-pecl-handlebars.spec
+++ b/php-pecl-handlebars.spec
@@ -21,22 +21,19 @@
%endif
%global with_tests 0%{!?_without_tests:1}
-%global upstream_version 0.8.2
+%global upstream_version 0.8.3
#global upstream_prever RC2
Summary: Handlebars templating language
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-Patch0: https://patch-diff.githubusercontent.com/raw/jbboehr/php-handlebars/pull/53.patch
-
BuildRequires: %{?dtsprefix}gcc
-# package.xml state 5.6, but upstream is ok with ignoring it
-BuildRequires: %{?scl_prefix}php-devel
+BuildRequires: %{?scl_prefix}php-devel >= 5.6
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: libhandlebars-devel
BuildRequires: libtalloc-devel
@@ -116,8 +113,6 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
cd NTS
-%patch0 -p1 -b .pr53
-
# Sanity check, really often broken
extver=$(sed -n '/PHP_HANDLEBARS_VERSION/{s/.* "//;s/".*$//;p}' php_handlebars.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -280,6 +275,10 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Mon Nov 12 2018 Remi Collet <remi@remirepo.net> - 0.8.3-1
+- update to 0.8.3
+- raise dependency on PHP 5.6
+
* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 0.8.2-4
- rebuild for 7.3.0beta2 new ABI