Skip to content

Commit 3fc5458

Browse files
trashertrasher
committed
Merge branch 'release/2.2.1'
2 parents c0fb5ef + f996204 commit 3fc5458

File tree

21 files changed

+105
-103
lines changed

21 files changed

+105
-103
lines changed

‎.github/workflows/ci-linux.yml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
strategy:
2727
matrix:
28-
php-versions: [ '8.1', '8.4' ]
28+
php-versions: [ '8.2', '8.5' ]
2929
coverage: [none]
3030
fail-fast: false
3131

@@ -83,13 +83,6 @@ jobs:
8383
cd galette-core/galette/plugins/plugin-objectslend
8484
../../vendor/bin/twigcs templates/default --severity error --display blocking
8585
86-
- name: Check missing symbols
87-
run: |
88-
cd galette-core/galette/plugins/plugin-objectslend
89-
composer require maglnet/composer-require-checker -W
90-
vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
91-
if: matrix.php-versions == '8.4'
92-
9386
- name: PHPStan checks
9487
run: |
9588
cd galette-core/galette/plugins/plugin-objectslend
@@ -109,19 +102,19 @@ jobs:
109102
#always tests higher stable php version with lower db version
110103
#enable coverage on higher stable php version with higher postrgesql version
111104
#lower php version
112-
- { php-version: "8.1", db-image: "mysql:5.7", coverage: none, always: false }
113-
- { php-version: "8.1", db-image: "mysql:8.1", coverage: none, always: false }
114-
- { php-version: "8.1", db-image: "mariadb:10.4", coverage: none, always: false }
115-
- { php-version: "8.1", db-image: "mariadb:11", coverage: none, always: false }
116-
- { php-version: "8.1", db-image: "postgres:11", coverage: none, always: false }
117-
- { php-version: "8.1", db-image: "postgres:16", coverage: none, always: false }
105+
- { php-version: "8.2", db-image: "mysql:5.7", coverage: none, always: false }
106+
- { php-version: "8.2", db-image: "mysql:8.1", coverage: none, always: false }
107+
- { php-version: "8.2", db-image: "mariadb:10.4", coverage: none, always: false }
108+
- { php-version: "8.2", db-image: "mariadb:11", coverage: none, always: false }
109+
- { php-version: "8.2", db-image: "postgres:11", coverage: none, always: false }
110+
- { php-version: "8.2", db-image: "postgres:16", coverage: none, always: false }
118111
#higher stable php version
119-
- { php-version: "8.4", db-image: "mysql:5.7", coverage: none, always: true }
120-
- { php-version: "8.4", db-image: "mysql:8.1", coverage: none, always: false }
121-
- { php-version: "8.4", db-image: "mariadb:10.4", coverage: none, always: true }
122-
- { php-version: "8.4", db-image: "mariadb:11", coverage: none, always: false }
123-
- { php-version: "8.4", db-image: "postgres:11", coverage: none, always: true }
124-
- { php-version: "8.4", db-image: "postgres:16", coverage: none, always: true }
112+
- { php-version: "8.5", db-image: "mysql:5.7", coverage: none, always: true }
113+
- { php-version: "8.5", db-image: "mysql:8.1", coverage: none, always: false }
114+
- { php-version: "8.5", db-image: "mariadb:10.4", coverage: none, always: true }
115+
- { php-version: "8.5", db-image: "mariadb:11", coverage: none, always: false }
116+
- { php-version: "8.5", db-image: "postgres:11", coverage: none, always: true }
117+
- { php-version: "8.5", db-image: "postgres:16", coverage: none, always: true }
125118
fail-fast: false
126119

127120
env:

‎ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
* 2025-12-08 - 2.2.1
2+
3+
* 2025-10-09 - 2.2.0
4+
5+
* 2024-10-20 - 2.1.2
6+
7+
* 2024-07-06 - 2.1.1
8+
9+
* 2024-06-07 - 2.1.0
10+
11+
* 2023-11-29 - 2.0.0
12+
113
* 2021-11-29 - 1.2.0
214
* Galette 0.9.6 compatible
315
* Few fixes

‎_define.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
'Galette Objects Lend', //Name
2626
'Manage rent/lend of object', //Short description
2727
'Mélissa Djebel, Johan Cwiklinski', //Author
28-
'2.2.0', //Version
28+
'2.2.1', //Version
2929
'1.2.0', //Galette version compatibility
3030
'objectslend', //routing name and translation domain
31-
'2025-10-09', //Date
31+
'2025-12-08', //Date
3232
[
3333
'objectslend_preferences' => 'admin',
3434
'store_objectlend_preferences' => 'admin',

‎lang/ca.utf8/LC_MESSAGES/objectslend.mo‎

29 Bytes
Binary file not shown.

‎lang/it_IT.utf8/LC_MESSAGES/objectslend.mo‎

-2 Bytes
Binary file not shown.

‎lang/objectslend_ca.utf8.po‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# Sineline <sineline@gmail.com>, 2022.
22
# Arnau Isern <arnauisern84@gmail.com>, 2022.
3-
# Johan Cwiklinski <trasher@x-tnd.be>, 2022, 2023.
3+
# Johan Cwiklinski <trasher@x-tnd.be>, 2022, 2023, 2025.
44
# Sotski Eugene <jekakmail@gmail.com>, 2025.
55
msgid ""
66
msgstr ""
77
"Project-Id-Version: PACKAGE VERSION\n"
88
"Report-Msgid-Bugs-To: translations@galette.eu\n"
99
"POT-Creation-Date: 2024-02-08 22:16+0100\n"
10-
"PO-Revision-Date: 2025-04-28 16:03+0000\n"
11-
"Last-Translator: Sotski Eugene <jekakmail@gmail.com>\n"
10+
"PO-Revision-Date: 2025-10-21 08:40+0000\n"
11+
"Last-Translator: Johan Cwiklinski <trasher@x-tnd.be>\n"
1212
"Language-Team: Catalan <https://hosted.weblate.org/projects/galette/"
1313
"objectslend-plugin/ca/>\n"
1414
"Language: ca\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19-
"X-Generator: Weblate 5.12-dev\n"
19+
"X-Generator: Weblate 5.14-dev\n"
2020

2121
#. TRANS: this is a filename
2222
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:58
@@ -156,7 +156,7 @@ msgstr ""
156156
#: ../tempcache/objects_list.html.twig:200
157157
#: ../tempcache/objects_list.html.twig:644
158158
msgid "Status"
159-
msgstr ""
159+
msgstr "Estat"
160160

161161
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:195
162162
#: ../tempcache/objects_edit.html.twig:342

‎lang/objectslend_it_IT.utf8.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: translations@galette.eu\n"
1111
"POT-Creation-Date: 2024-02-08 22:16+0100\n"
12-
"PO-Revision-Date: 2025-02-18 13:46+0000\n"
12+
"PO-Revision-Date: 2025-10-13 11:07+0000\n"
1313
"Last-Translator: Marco Ciampa <ciampix@posteo.net>\n"
1414
"Language-Team: Italian <https://hosted.weblate.org/projects/galette/"
1515
"objectslend-plugin/it/>\n"
@@ -18,7 +18,7 @@ msgstr ""
1818
"Content-Type: text/plain; charset=UTF-8\n"
1919
"Content-Transfer-Encoding: 8bit\n"
2020
"Plural-Forms: nplurals=2; plural=n != 1;\n"
21-
"X-Generator: Weblate 5.10.1-dev\n"
21+
"X-Generator: Weblate 5.14-dev\n"
2222

2323
#. TRANS: this is a filename
2424
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:58
@@ -31,7 +31,7 @@ msgstr "Tessera oggetto"
3131

3232
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:72
3333
msgid "Labels"
34-
msgstr "Etichetta"
34+
msgstr "Etichette"
3535

3636
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:136
3737
#: ../lib/GaletteObjectsLend/IO/PdfObjects.php:159

‎lib/GaletteObjectsLend/Controllers/Crud/CategoriesController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ public function doAdd(Request $request, Response $response): Response
8282
/**
8383
* List page
8484
*
85-
* @param Request $request PSR Request
86-
* @param Response $response PSR Response
87-
* @param string|null $option One of 'page' or 'order'
88-
* @param integer|string|null $value Value of the option
85+
* @param Request $request PSR Request
86+
* @param Response $response PSR Response
87+
* @param string|null $option One of 'page' or 'order'
88+
* @param int|string|null $value Value of the option
8989
*
9090
* @return Response
9191
*/
@@ -350,7 +350,7 @@ public function confirmRemoveTitle(array $args): string
350350
* @param array<string,mixed> $args Route arguments
351351
* @param array<string,mixed> $post POST values
352352
*
353-
* @return boolean
353+
* @return bool
354354
*/
355355
protected function doDelete(array $args, array $post): bool
356356
{

‎lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public function doAdd(Request $request, Response $response): Response
9292
/**
9393
* List page
9494
*
95-
* @param Request $request PSR Request
96-
* @param Response $response PSR Response
97-
* @param string|null $option One of 'page' or 'order'
98-
* @param integer|string|null $value Value of the option
95+
* @param Request $request PSR Request
96+
* @param Response $response PSR Response
97+
* @param string|null $option One of 'page' or 'order'
98+
* @param int|string|null $value Value of the option
9999
*
100100
* @return Response
101101
*/
@@ -983,7 +983,7 @@ public function formUri(array $args): string
983983
* @param array<string,mixed> $args Request arguments
984984
* @param ?array<string,mixed> $post POST values
985985
*
986-
* @return null|integer|integer[]
986+
* @return null|int|int[]
987987
*/
988988
protected function getIdsToRemove(array &$args, ?array $post): array|int|null
989989
{
@@ -1028,7 +1028,7 @@ public function confirmRemoveTitle(array $args): string
10281028
* @param array<string,mixed> $args Route arguments
10291029
* @param array<string,mixed> $post POST values
10301030
*
1031-
* @return boolean
1031+
* @return bool
10321032
*/
10331033
protected function doDelete(array $args, array $post): bool
10341034
{

‎lib/GaletteObjectsLend/Controllers/Crud/StatusController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public function doAdd(Request $request, Response $response): Response
8080
/**
8181
* List page
8282
*
83-
* @param Request $request PSR Request
84-
* @param Response $response PSR Response
85-
* @param string|null $option One of 'page' or 'order'
86-
* @param integer|string|null $value Value of the option
83+
* @param Request $request PSR Request
84+
* @param Response $response PSR Response
85+
* @param string|null $option One of 'page' or 'order'
86+
* @param int|string|null $value Value of the option
8787
*
8888
* @return Response
8989
*/
@@ -357,7 +357,7 @@ public function confirmRemoveTitle(array $args): string
357357
* @param array<string,mixed> $args Route arguments
358358
* @param array<string,mixed> $post POST values
359359
*
360-
* @return boolean
360+
* @return bool
361361
*/
362362
protected function doDelete(array $args, array $post): bool
363363
{

0 commit comments

Comments
 (0)