diff options
| -rw-r--r-- | PHPINFO | 3 | ||||
| -rw-r--r-- | REFLECTION | 245 | ||||
| -rw-r--r-- | fastchart-rpm.patch | 2 | ||||
| -rw-r--r-- | fastchart-tests.patch | 25 | ||||
| -rw-r--r-- | php-iliaal-fastchart.spec | 28 |
5 files changed, 235 insertions, 68 deletions
@@ -2,11 +2,12 @@ fastchart fastchart support => enabled -fastchart version => 1.2.0 +fastchart version => 1.3.0 FreeType => 2.13.3 libpng => 1.6.58 libjpeg => 3.1.3 (turbo) libwebp => 1.6.0 +PDF output (pdfio) => enabled plutovg => 1.3.3 plutosvg => 0.0.8 Default font => /usr/share/fonts/dejavu-sans-fonts/DejaVuSans.ttf @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { +Extension [ <persistent> extension #83 fastchart version 1.3.0 ] { - Classes [31] { Class [ <internal:fastchart> abstract class FastChart\Chart ] { @@ -109,7 +109,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [71] { + - Methods [72] { Method [ <internal:fastchart, ctor> public method __construct ] { - Parameters [2] { @@ -682,6 +682,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart> public method drawSvgFragment ] { - Parameters [0] { @@ -822,7 +829,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [75] { + - Methods [76] { Method [ <internal:fastchart> public method setSeries ] { - Parameters [1] { @@ -1427,6 +1434,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -1567,7 +1581,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [75] { + - Methods [76] { Method [ <internal:fastchart> public method setSeries ] { - Parameters [1] { @@ -2172,6 +2186,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -2314,7 +2335,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [76] { + - Methods [77] { Method [ <internal:fastchart> public method setSeries ] { - Parameters [1] { @@ -2927,6 +2948,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -3067,7 +3095,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [77] { + - Methods [78] { Method [ <internal:fastchart> public method setSlices ] { - Parameters [1] { @@ -3689,6 +3717,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -3829,7 +3864,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [76] { + - Methods [77] { Method [ <internal:fastchart> public method setPoints ] { - Parameters [1] { @@ -4444,6 +4479,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -4587,7 +4629,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [86] { + - Methods [87] { Method [ <internal:fastchart> public method setOhlcv ] { - Parameters [1] { @@ -5287,6 +5329,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -5427,7 +5476,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [74] { + - Methods [75] { Method [ <internal:fastchart> public method setSeries ] { - Parameters [1] { @@ -6024,6 +6073,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -6164,7 +6220,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [72] { + - Methods [73] { Method [ <internal:fastchart> public method setPoints ] { - Parameters [1] { @@ -6745,6 +6801,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -6885,7 +6948,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [73] { + - Methods [74] { Method [ <internal:fastchart> public method setGrid ] { - Parameters [1] { @@ -7475,6 +7538,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -7615,7 +7685,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [75] { + - Methods [76] { Method [ <internal:fastchart> public method setValue ] { - Parameters [1] { @@ -8221,6 +8291,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -8361,7 +8438,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [74] { + - Methods [75] { Method [ <internal:fastchart> public method setTasks ] { - Parameters [1] { @@ -8959,6 +9036,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -9099,7 +9183,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [73] { + - Methods [74] { Method [ <internal:fastchart> public method setBoxes ] { - Parameters [1] { @@ -9688,6 +9772,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -9830,7 +9921,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [77] { + - Methods [78] { Method [ <internal:fastchart> public method setSeries ] { - Parameters [1] { @@ -10451,6 +10542,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -10591,7 +10689,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [74] { + - Methods [75] { Method [ <internal:fastchart> public method setGrid ] { - Parameters [1] { @@ -11188,6 +11286,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -11328,7 +11433,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [73] { + - Methods [74] { Method [ <internal:fastchart> public method setItems ] { - Parameters [1] { @@ -11917,6 +12022,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -12060,7 +12172,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [73] { + - Methods [74] { Method [ <internal:fastchart> public method setStages ] { - Parameters [1] { @@ -12649,6 +12761,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -12789,7 +12908,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [75] { + - Methods [76] { Method [ <internal:fastchart> public method setBars ] { - Parameters [1] { @@ -13394,6 +13513,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -13534,7 +13660,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [72] { + - Methods [73] { Method [ <internal:fastchart> public method setGrid ] { - Parameters [1] { @@ -14115,6 +14241,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -14257,7 +14390,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [76] { + - Methods [77] { Method [ <internal:fastchart> public method setRange ] { - Parameters [2] { @@ -14871,6 +15004,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -15011,7 +15151,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [76] { + - Methods [77] { Method [ <internal:fastchart> public method setRange ] { - Parameters [2] { @@ -15625,6 +15765,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -15765,7 +15912,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [74] { + - Methods [75] { Method [ <internal:fastchart> public method setBars ] { - Parameters [1] { @@ -16362,6 +16509,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -16502,7 +16656,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [72] { + - Methods [73] { Method [ <internal:fastchart> public method setData ] { - Parameters [1] { @@ -17083,6 +17237,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -17223,7 +17384,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [72] { + - Methods [73] { Method [ <internal:fastchart> public method setHierarchy ] { - Parameters [1] { @@ -17804,6 +17965,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -17944,7 +18112,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [73] { + - Methods [74] { Method [ <internal:fastchart> public method setNodes ] { - Parameters [1] { @@ -18533,6 +18701,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -18673,7 +18848,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [72] { + - Methods [73] { Method [ <internal:fastchart> public method setColumns ] { - Parameters [1] { @@ -19254,6 +19429,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { @@ -19394,7 +19576,7 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Properties [0] { } - - Methods [72] { + - Methods [73] { Method [ <internal:fastchart> public method setVectors ] { - Parameters [1] { @@ -19975,6 +20157,13 @@ Extension [ <persistent> extension #83 fastchart version 1.2.0 ] { - Return [ string ] } + Method [ <internal:fastchart, inherits FastChart\Chart> public method renderPdf ] { + + - Parameters [0] { + } + - Return [ string ] + } + Method [ <internal:fastchart, inherits FastChart\Chart> public method drawSvgFragment ] { - Parameters [0] { diff --git a/fastchart-rpm.patch b/fastchart-rpm.patch index 431ad19..a6ac782 100644 --- a/fastchart-rpm.patch +++ b/fastchart-rpm.patch @@ -1,7 +1,7 @@ diff -up ./fastchart.c.rpm ./fastchart.c --- ./fastchart.c.rpm 2026-05-21 16:46:56.682594380 +0200 +++ ./fastchart.c 2026-05-21 16:47:36.271977657 +0200 -@@ -1961,14 +1961,10 @@ FASTCHART_DEFINE_LIFECYCLE(vector, fa +@@ -1975,14 +1975,10 @@ FASTCHART_DEFINE_LIFECYCLE(vector, fa * NULL, so without a Windows entry every * chart renders blank text. */ static const char *FASTCHART_DEFAULT_FONT_CANDIDATES[] = { diff --git a/fastchart-tests.patch b/fastchart-tests.patch deleted file mode 100644 index a091ae6..0000000 --- a/fastchart-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e373460b0f970bd908b26e041bdb37f04fe900cb Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 12 Jun 2026 08:19:02 +0200 -Subject: [PATCH] Relax test expectation - ---- - tests/187_svg_dims_int_max_boundary.phpt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/187_svg_dims_int_max_boundary.phpt b/tests/187_svg_dims_int_max_boundary.phpt -index 5d47cec..99c1604 100644 ---- a/tests/187_svg_dims_int_max_boundary.phpt -+++ b/tests/187_svg_dims_int_max_boundary.phpt -@@ -50,8 +50,8 @@ foreach (['2147483520', '2147483648'] as $dim) { - } - - ?> ----EXPECT-- -+--EXPECTF-- - 2.147483648e9: ValueError (intrinsic-dims) - 1e10: ValueError (intrinsic-dims) --2147483520: ValueError (cap) --2147483648: ValueError (cap) -+2147483520: ValueError (%s) -+2147483648: ValueError (%s) diff --git a/php-iliaal-fastchart.spec b/php-iliaal-fastchart.spec index 8f3b4ab..605b114 100644 --- a/php-iliaal-fastchart.spec +++ b/php-iliaal-fastchart.spec @@ -6,13 +6,12 @@ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%scl_package php-iliaal-fastchart -%else -%global pkg_name %{name} -%endif +%{?scl:%scl_package php-iliaal-fastchart} -%bcond_without tests +%bcond_without tests +# On Fedora >= 44 +# In remirepo for others +%bcond_without pdfio %global gh_owner iliaal %global gh_project fastchart @@ -30,7 +29,7 @@ Summary: Native C PHP extension for fast chart rendering # Extension is BSD-3-Clause # Libraries are MIT License: BSD-3-Clause AND MIT -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} %forgemeta URL: %{forgeurl} @@ -38,8 +37,6 @@ Source0: %{forgesource} # RPM font path first and remove Windows fonts Patch0: %{pie_proj}-rpm.patch -# https://github.com/iliaal/fastchart/pull/9 -Patch1: %{pie_proj}-tests.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -48,6 +45,9 @@ BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libwebp) +%if %{with pdfio} +BuildRequires: pkgconfig(pdfio) +%endif # for tests # See list in tests/_font_candidates.inc.php # /usr/share/fonts/lato-fonts/Lato-Regular.ttf @@ -69,9 +69,6 @@ Provides: bundled(qrcodegen) # Extension Provides: %{?scl_prefix}php-%{ext_name} = %{version} Provides: %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version} -# PECL -Provides: %{?scl_prefix}php-pecl-%{ext_name} = %{version} -Provides: %{?scl_prefix}php-pecl-%{ext_name}%{?_isa} = %{version} # PIE Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} @@ -97,7 +94,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %forgesetup %patch -P0 -p1 -b .rpm -%patch -P1 -p1 -b .pr cp vendor/qrcodegen/LICENSE qrcodegen_LICENSE cp vendor/plutovg/LICENSE plutovg_LICENSE @@ -126,6 +122,9 @@ sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global %configure \ --with-php-config=%{__phpconfig} \ --with-libdir=%{_lib} \ +%if %{with pdfio} + --with-pdfio \ +%endif --enable-fastchart %make_build @@ -168,6 +167,9 @@ TEST_PHP_ARGS="-n -d extension=gd -d extension=simplexml -d extension=%{buildroo %changelog +* Tue Jun 16 2026 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 + * Fri Jun 12 2026 Remi Collet <remi@remirepo.net> - 1.2.0-1 - update to 1.2.0 - open https://github.com/iliaal/fastchart/pull/9 relax test expectations |
