summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION71
-rw-r--r--php-pecl-judy.spec142
2 files changed, 90 insertions, 123 deletions
diff --git a/REFLECTION b/REFLECTION
index 8cb5c20..26cd8ce 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #98 judy version 1.0.2 ] {
+Extension [ <persistent> extension #90 judy version 2.1.0 ] {
- Dependencies {
Dependency [ spl (Required) ]
@@ -10,8 +10,16 @@ Extension [ <persistent> extension #98 judy version 1.0.2 ] {
}
}
+ - Constants [1] {
+ Constant [ string JUDY_VERSION ] { 2.1.0 }
+ }
+
- Functions {
Function [ <internal:judy> function judy_version ] {
+
+ - Parameters [0] {
+ }
+ - Return [ string ]
}
Function [ <internal:judy> function judy_type ] {
@@ -25,11 +33,11 @@ Extension [ <persistent> extension #98 judy version 1.0.2 ] {
Class [ <internal:judy> <iterateable> class Judy implements ArrayAccess, Countable ] {
- Constants [5] {
- Constant [ integer BITSET ] { 1 }
- Constant [ integer INT_TO_INT ] { 2 }
- Constant [ integer INT_TO_MIXED ] { 3 }
- Constant [ integer STRING_TO_INT ] { 4 }
- Constant [ integer STRING_TO_MIXED ] { 5 }
+ Constant [ public int BITSET ] { 1 }
+ Constant [ public int INT_TO_INT ] { 2 }
+ Constant [ public int INT_TO_MIXED ] { 3 }
+ Constant [ public int STRING_TO_INT ] { 4 }
+ Constant [ public int STRING_TO_MIXED ] { 5 }
}
- Static properties [0] {
@@ -43,26 +51,52 @@ Extension [ <persistent> extension #98 judy version 1.0.2 ] {
- Methods [20] {
Method [ <internal:judy, ctor> public method __construct ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <required> int $type ]
+ }
}
- Method [ <internal:judy, dtor> public method __destruct ] {
+ Method [ <internal:judy> public method __destruct ] {
+
+ - Parameters [0] {
+ }
}
Method [ <internal:judy> public method getType ] {
+
+ - Parameters [0] {
+ }
+ - Return [ int ]
}
Method [ <internal:judy> public method free ] {
+
+ - Parameters [0] {
+ }
+ - Return [ int ]
}
Method [ <internal:judy> public method memoryUsage ] {
+
+ - Parameters [0] {
+ }
+ - Return [ ?int ]
}
- Method [ <internal:judy, prototype Countable> public method count ] {
+ Method [ <internal:judy> public method size ] {
- Parameters [2] {
- Parameter #0 [ <optional> $index_start ]
- Parameter #1 [ <optional> $index_end ]
+ Parameter #0 [ <optional> $index_start = <default> ]
+ Parameter #1 [ <optional> $index_end = <default> ]
+ }
+ }
+
+ Method [ <internal:judy, prototype Countable> public method count ] {
+
+ - Parameters [0] {
}
+ - Return [ int ]
}
Method [ <internal:judy> public method byCount ] {
@@ -131,33 +165,34 @@ Extension [ <persistent> extension #98 judy version 1.0.2 ] {
Method [ <internal:judy, prototype ArrayAccess> public method offsetSet ] {
- Parameters [2] {
- Parameter #0 [ <required> $offset ]
- Parameter #1 [ <required> $value ]
+ Parameter #0 [ <required> mixed $offset ]
+ Parameter #1 [ <required> mixed $value ]
}
+ - Return [ void ]
}
Method [ <internal:judy, prototype ArrayAccess> public method offsetUnset ] {
- Parameters [1] {
- Parameter #0 [ <required> $offset ]
+ Parameter #0 [ <required> mixed $offset ]
}
+ - Return [ void ]
}
Method [ <internal:judy, prototype ArrayAccess> public method offsetGet ] {
- Parameters [1] {
- Parameter #0 [ <required> $offset ]
+ Parameter #0 [ <required> mixed $offset ]
}
+ - Return [ mixed ]
}
Method [ <internal:judy, prototype ArrayAccess> public method offsetExists ] {
- Parameters [1] {
- Parameter #0 [ <required> $offset ]
+ Parameter #0 [ <required> mixed $offset ]
}
- }
-
- Method [ <internal:judy> public method size ] {
+ - Return [ bool ]
}
}
}
diff --git a/php-pecl-judy.spec b/php-pecl-judy.spec
index 11164c3..fc168fc 100644
--- a/php-pecl-judy.spec
+++ b/php-pecl-judy.spec
@@ -3,87 +3,47 @@
#
# Fedora spec file for php-pecl-judy
#
-# Copyright (c) 2013-2017 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
-%if 0%{?scl:1}
-%if "%{scl}" == "rh-php56"
-%global sub_prefix more-php56-
-%else
-%global sub_prefix %{scl_prefix}
-%endif
-%endif
%{?scl: %scl_package php-pecl-judy}
%global with_zts 0%{?__ztsphp:1}
+%global pie_vend orieg
+%global pie_proj judy
%global pecl_name Judy
%global ext_name judy
-%if "%{php_version}" < "5.6"
-%global ini_name %{ext_name}.ini
-%else
%global ini_name 40-%{ext_name}.ini
-%endif
Summary: PHP Judy implements sparse dynamic arrays
-Name: %{?sub_prefix}php-pecl-judy
-Version: 1.0.2
-Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License: PHP
+Name: %{?scl_prefix}php-pecl-judy
+Version: 2.1.0
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+License: PHP-3.01
Group: Development/Languages
-URL: http://pecl.php.net/package/%{pecl_name}
-Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+URL: https://pecl.php.net/package/%{pecl_name}
+Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: %{?scl_prefix}php-devel > 5.3
+BuildRequires: make
+BuildRequires: %{?dtsprefix}gcc
+BuildRequires: %{?scl_prefix}php-devel >= 8.0
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: Judy-devel
-BuildRequires: pcre-devel
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
Requires: %{?scl_prefix}php-spl%{?_isa}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-
-Provides: %{?scl_prefix}php-%{ext_name} = %{version}
-Provides: %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl-%{ext_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{ext_name}%{?_isa} = %{version}-%{release}
-
-# Package have been renamed
-Obsoletes: %{?scl_prefix}php-pecl-Judy < 1.0.1
-Provides: %{?scl_prefix}php-pecl-Judy = %{version}-%{release}
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes: php53-pecl-%{ext_name} <= %{version}
-Obsoletes: php53u-pecl-%{ext_name} <= %{version}
-Obsoletes: php54-pecl-%{ext_name} <= %{version}
-Obsoletes: php54w-pecl-%{ext_name} <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{ext_name} <= %{version}
-Obsoletes: php55w-pecl-%{ext_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes: php56u-pecl-%{ext_name} <= %{version}
-Obsoletes: php56w-pecl-%{ext_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes: php70u-pecl-%{ext_name} <= %{version}
-Obsoletes: php70w-pecl-%{ext_name} <= %{version}
-%endif
-%endif
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
+Provides: %{?scl_prefix}php-%{ext_name} = %{version}
+Provides: %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
%description
@@ -113,7 +73,7 @@ These are the files needed to compile programs using %{name}.
%setup -q -c
mv %{pecl_name}-%{version} NTS
-%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
+sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
cd NTS
# Sanity check, really often broken
@@ -138,27 +98,25 @@ EOF
%build
cd NTS
-%{_bindir}/phpize
+%{__phpize}
%configure \
--with-libdir=%{_lib} \
- --with-php-config=%{_bindir}/php-config
+ --with-php-config=%{__phpconfig}
make %{?_smp_mflags}
%if %{with_zts}
cd ../ZTS
-%{_bindir}/zts-phpize
+%{__ztsphpize}
%configure \
--with-libdir=%{_lib} \
- --with-php-config=%{_bindir}/zts-php-config
+ --with-php-config=%{__ztsphpconfig}
make %{?_smp_mflags}
%endif
%install
-rm -rf %{buildroot}
-
make -C NTS install INSTALL_ROOT=%{buildroot}
# install config file
@@ -182,26 +140,6 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%check
: Minimal load test for NTS extension
cd NTS
@@ -209,12 +147,11 @@ cd NTS
--define extension=modules/%{ext_name}.so \
--modules | grep %{ext_name}
+sed -e 's/available"/available\\n"/' -i tests/001.phpt
+
: Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{ext_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{_bindir}/php -n run-tests.php
+%{__php} -n run-tests.php -q --show-diff
%if %{with_zts}
@@ -223,23 +160,11 @@ cd ../ZTS
%{__ztsphp} --no-php-ini \
--define extension=modules/%{ext_name}.so \
--modules | grep %{ext_name}
-
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{ext_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
-%{?_licensedir:%license NTS/LICENSE}
+%license NTS/LICENSE
%doc %{pecl_docdir}/%{pecl_name}
%exclude %{pecl_docdir}/%{pecl_name}/examples
%{pecl_xmldir}/%{name}.xml
@@ -254,7 +179,6 @@ rm -rf %{buildroot}
%files devel
-%defattr(-,root,root,-)
%doc %{pecl_testdir}/%{pecl_name}
%doc %{pecl_docdir}/%{pecl_name}/examples
%{php_incldir}/ext/%{ext_name}
@@ -265,6 +189,14 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+- re-license spec file to CECILL-2.1
+- add pie virtual provides (orieg/judy)
+
+* Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 1.0.2-6
+- cleanup for EL-8
+
* Wed Mar 9 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-5
- adapt for F24