Skip to content

Commit 8fbe1f8

Browse files
committed
Support PHP 8.4
1 parent d03fc8e commit 8fbe1f8

File tree

14 files changed

+68
-54
lines changed

14 files changed

+68
-54
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
phpReport 3.6
2+
=============
3+
4+
This is the last version which runs with PHP 8.3 and later.
5+
Next version requires PHP 8.4
6+
7+
8+
Changes
9+
-------
10+
* Support PHP 8.4
11+
* Remove $isLastDim from Dimension class and handle last dimension ID in Report class.
12+
13+
114
phpReport 3.5
215
=============
316

@@ -24,7 +37,7 @@ phpReport 3.4
2437
New features
2538
------------
2639

27-
* Improved configruation. Two naming pattern sets are available.
40+
* Improved configuration. Two naming pattern sets are available.
2841
* Configuration can be set on a global level by extendig report class.
2942
* Actions use Action Enum instead of strings
3043
* Data dimensions got additional name. Related method names can make use of the name.

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ More parameters can be used to configure the current phpReport instance.
6464

6565
Declaration
6666
-----------
67-
With just four declaration methods you'll setup the skeleton of your application.
67+
With just five declaration methods you'll setup the skeleton of your application.
6868

6969
The **group()** method declares a new data group and instantiates a group counter.
7070
phpReport will then compare group values between data rows, execute actions
@@ -74,8 +74,10 @@ The **compute()** method lets phpReport know that you want use aggregate functio
7474
sum(), min(), max() or that you'll ask for not null and not zero counters.
7575

7676
The **sheet()** method lets you compute multiple values in a spreadsheet like format.
77-
Sheets can have a fixed number of columns indexed by pre-declared column names or
78-
a variable number of columns based on data values.
77+
The number of colums is variable and depends on the values in the key parameter.
78+
79+
The **fixedSheet()** is similar to the sheet() method but has a fixed number of
80+
columns indexed by pre-declared column names.
7981

8082
With the **join()** method multiple data sources will be combined. Call the other
8183
declaration methods after the join() method when they belong to the joined data.
@@ -282,7 +284,7 @@ This is also the time to uncomment the two prototype calls made above.
282284
Requirements
283285
------------
284286

285-
The only requirement for **phpReport** is PHP 8.0 or later.
287+
The only requirement for **phpReport** is PHP 8.1 or later.
286288

287289

288290

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ colorama==0.4.1
66
docutils==0.15.2
77
idna==3.7
88
imagesize==1.1.0
9-
Jinja2==3.1.3
9+
Jinja2==3.1.4
1010
MarkupSafe==1.1.1
1111
packaging==19.2
1212
Pygments==2.15.0

docs/source/actions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Actions
22
=======
33

44
Calling the run() method starts the execution and |project_name| takes control over the
5-
program flow. At several points during program events occurs and related action will be invoked.
5+
program flow. Whenever defined events are detected related action will be invoked.
66

77
Typical actions are:
88

docs/source/collector.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Collector
22
=========
33

4-
A collector class is designed to hold and manage multiple items. An item can
4+
A collector class manage multiple items. An item can
55
be an other collector or an calculator object.
66

77
.. include:: defaultCollectors.rst

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
copyright = '2021-2024, Günter Pöhl'
2222
author = 'Günter Pöhl'
2323

24-
version ='3.4.0'
24+
version ='3.6.0'
2525
# The full version, including alpha/beta/rc tags
26-
release = '3.4.0'
26+
release = '3.6.0'
2727

2828

2929
# -- General configuration ---------------------------------------------------

docs/source/group.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ and group footers) will be executed.
3030

3131
:param mixed $source: Source of the group value. Defaults to the name.
3232
Use the attribute name when data row is an object or the key name when data row is an array.
33-
It's also possiblbe to use a callable (a closure or an array having
34-
class and method parameters) expecting $row and $rowKey as parameters.
33+
It's also possiblbe to use a callable (a closure or an array having
34+
class and method parameters) expecting $row and $rowKey as parameters.
3535

36-
:param iterable|null $actions: Array of group related actions to replace configurated actions.
36+
:param iterable|null $actions: Array of group related actions to replace configurated actions.
3737

3838
:param mixed $params: Variadic parameters to be passed to callables declared
3939
with value parameter.

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
phpReport Manual
22
================
33

4-
Edition for phpReport 3.0
4+
Edition for phpReport 3.6
55

66
by Günter Pöhl
77

docs/source/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ the compute function but requires an additional field to be used as a key.
3939
->group ('year', fn($row) => substr($row->orderDate, 0, 4));
4040
->sheet ('orderValue', fn($row) => substr($row->orderDate, 4, 2), 'oderAmount')
4141
42-
The snippet obove declares a group for the year of the orderDate and cumulates
42+
The snippet above declares a group for the year of the orderDate and cumulates
4343
the 'orderAmount' in an collector indexed by the month of the orderDate.
4444

4545
Cumulated values provides totals and subtotals at any time for all declared groups.

docs/source/methods.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ Overview of methods and properties
44
Methods to instantiate report class
55
-----------------------------------
66

7-
:php:meth:`data` Describe data input
7+
:php:meth:`join` Declare next level of data to be joined or linked
88

99
:php:meth:`group` Declare a group to monitor changes between data rows
1010

11-
:php:meth:`aggregate` Declare variable to provide aggregate functons (sum, count, min, max)
11+
:php:meth:`compute` Declare variable to provide aggregate functons (sum, count, min, max)
1212

1313
:php:meth:`sheet` Declare variable to be aggregated horizontally (having key and value)
1414

15+
:php:meth:`fixedSheet` Like sheet but with pre-defined keys
16+
1517

1618
Methods for data handling
1719
-------------------------

0 commit comments

Comments
 (0)