Skip to content

Commit 0608003

Browse files
trashertrasher
committed
Merge branch 'release/2.2.1' into develop
2 parents 6097ac9 + 2cdf0ea commit 0608003

17 files changed

Lines changed: 90 additions & 76 deletions

‎ChangeLog‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
* 2025-12-08 - 2.2.1
2+
3+
* 2025-10-09 - 2.2.0
4+
5+
* 2024-10-21 - 2.1.3
6+
7+
* 2024-10-20 - 2.1.2
8+
9+
* 2024-07-06 - 2.1.1
10+
11+
* 2024-06-07 - 2.1.0
12+
13+
* 2023-12-07 - 2.0.0
14+
115
* 2021-11-29 - 1.8.0
216
* Galette 0.9.6 compatible
317
* Few bugfixes

‎_define.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
'Galette Auto', //Name
2626
'Plugin to manage Automobile clubs', //Short description
2727
'Johan Cwiklinski', //Author
28-
'2.2.0', //Version
28+
'2.2.1', //Version
2929
'1.2.0', //Galette compatible version
3030
'auto', //routing name
31-
'2025-10-09', //Release date
31+
'2025-12-08', //Release date
3232
[ //routes permissions
3333
'vehiclesList' => 'groupmanager',
3434
'memberVehiclesList' => 'groupmanager',

‎lib/GaletteAuto/AbstractObject.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ abstract class AbstractObject
5555
/**
5656
* Default constructor
5757
*
58-
* @param Db $zdb Database instance
59-
* @param string $table table name
60-
* @param string $pk primary key field
61-
* @param string $field main field name
62-
* @param string $name name
63-
* @param ?integer $id id to load. Defaults to null
58+
* @param Db $zdb Database instance
59+
* @param string $table table name
60+
* @param string $pk primary key field
61+
* @param string $field main field name
62+
* @param string $name name
63+
* @param ?int $id id to load. Defaults to null
6464
*/
6565
public function __construct(Db $zdb, string $table, string $pk, string $field, string $name, ?int $id = null)
6666
{
@@ -102,9 +102,9 @@ public function getList(): array
102102
/**
103103
* Loads a record
104104
*
105-
* @param integer $id id of the record
105+
* @param int $id id of the record
106106
*
107-
* @return boolean
107+
* @return bool
108108
*/
109109
public function load(int $id): bool
110110
{
@@ -137,9 +137,9 @@ public function load(int $id): bool
137137
/**
138138
* Store current record
139139
*
140-
* @param boolean $new New record or existing one
140+
* @param bool $new New record or existing one
141141
*
142-
* @return boolean
142+
* @return bool
143143
*/
144144
public function store(bool $new = false): bool
145145
{
@@ -183,7 +183,7 @@ public function store(bool $new = false): bool
183183
*
184184
* @param int[] $ids Array of records id to delete
185185
*
186-
* @return boolean
186+
* @return bool
187187
*/
188188
public function delete(array $ids): bool
189189
{
@@ -255,7 +255,7 @@ public function __get(string $name): mixed
255255
*
256256
* @param string $name name of the property we want to retrieve
257257
*
258-
* @return boolean
258+
* @return bool
259259
*/
260260
public function __isset(string $name): bool
261261
{
@@ -419,7 +419,7 @@ private function proceedCount(Select $select): void
419419
/**
420420
* Get count for list
421421
*
422-
* @return integer
422+
* @return int
423423
*/
424424
public function getCount(): int
425425
{

‎lib/GaletteAuto/Auto.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
*
3838
* @author Johan Cwiklinski <johan@x-tnd.be>
3939
*
40-
* @property integer $id
40+
* @property int $id
4141
* @property string $registration
4242
* @property string $name
4343
* @property string $first_registration_date
4444
* @property string $first_circulation_date
45-
* @property integer $mileage
45+
* @property int $mileage
4646
* @property string $comment
4747
* @property string $chassis_number
48-
* @property integer $seats
49-
* @property integer $horsepower
50-
* @property integer $engine_size
48+
* @property int $seats
49+
* @property int $horsepower
50+
* @property int $engine_size
5151
* @property string $creation_date
52-
* @property integer $fuel
52+
* @property int $fuel
5353
* @property Color $color
5454
* @property Body $body
5555
* @property State $state
@@ -209,9 +209,9 @@ public function __construct(Plugins $plugins, Db $zdb, ?ArrayObject $args = null
209209
/**
210210
* Loads a car from its id
211211
*
212-
* @param integer $id the identifiant for the car to load
212+
* @param int $id the identifiant for the car to load
213213
*
214-
* @return boolean
214+
* @return bool
215215
*/
216216
public function load(int $id): bool
217217
{
@@ -305,10 +305,10 @@ public function listFuels(): array
305305
/**
306306
* Stores the vehicle in the database
307307
*
308-
* @param boolean $new true if it's a new record, false to update on
309-
* that already exists. Defaults to false
308+
* @param bool $new true if it's a new record, false to update on
309+
* that already exists. Defaults to false
310310
*
311-
* @return boolean
311+
* @return bool
312312
*/
313313
public function store(bool $new = false): bool
314314
{
@@ -454,8 +454,8 @@ public function store(bool $new = false): bool
454454
/**
455455
* List object's properties
456456
*
457-
* @param boolean $restrict true to exclude $this->internals from returned
458-
* result, false otherwise. Default to false
457+
* @param bool $restrict true to exclude $this->internals from returned
458+
* result, false otherwise. Default to false
459459
*
460460
* @return array
461461
*/
@@ -492,7 +492,7 @@ public function getProperties(): array
492492
/**
493493
* Does the current car has a picture?
494494
*
495-
* @return boolean
495+
* @return bool
496496
*/
497497
public function hasPicture(): bool
498498
{
@@ -637,7 +637,7 @@ public function __set(string $name, mixed $value): void
637637
*
638638
* @param string $name name of the property we want to retrieve
639639
*
640-
* @return boolean
640+
* @return bool
641641
*/
642642
public function __isset(string $name): bool
643643
{
@@ -660,7 +660,7 @@ public function __isset(string $name): bool
660660
* @param array $post All values to check, basically the $_POST array
661661
* after sending the form
662662
*
663-
* @return boolean
663+
* @return bool
664664
*/
665665
public function check(array $post): bool
666666
{

‎lib/GaletteAuto/Autos.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public function __construct(Plugins $plugins, Db $zdb)
6161
/**
6262
* Remove specified vehicles
6363
*
64-
* @param integer|array $ids Vehicles identifiers to delete
64+
* @param int|array $ids Vehicles identifiers to delete
6565
*
66-
* @return boolean
66+
* @return bool
6767
*/
6868
public function removeVehicles(int|array $ids): bool
6969
{
@@ -166,14 +166,14 @@ public function getMemberList(int $id_adh, ?AutosList $filters): array
166166
/**
167167
* Get the list of all vehicles
168168
*
169-
* @param boolean $as_autos return the results as an array of Auto object.
169+
* @param bool $as_autos return the results as an array of Auto object.
170170
* When true, fields are not relevant
171-
* @param boolean $mine show only current logged member cars
171+
* @param bool $mine show only current logged member cars
172172
* @param ?array $fields field(s) name(s) to get.
173173
* or an array. If null, all fields will be returned
174174
* @param ?AutosList $filters Filters
175175
* @param ?int $id_adh Member id
176-
* @param boolean $public Get public list
176+
* @param bool $public Get public list
177177
*
178178
* @return array<int, Autos>|ResultSet
179179
*/
@@ -314,7 +314,7 @@ private function proceedCount(Select $select, ?AutosList $filters): void
314314
/**
315315
* Get count for list
316316
*
317-
* @return integer
317+
* @return int
318318
*/
319319
public function getCount(): int
320320
{

‎lib/GaletteAuto/Body.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class Body extends AbstractObject
4040
/**
4141
* Default constructor
4242
*
43-
* @param Db $zdb Database instance
44-
* @param ?integer $id body's id to load. Defaults to null
43+
* @param Db $zdb Database instance
44+
* @param ?int $id body's id to load. Defaults to null
4545
*/
4646
public function __construct(Db $zdb, ?int $id = null)
4747
{

‎lib/GaletteAuto/Brand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @link https://galette.eu
3838
* @since Available since 0.7dev - 2009-03-16
3939
*
40-
* @property integer $id
40+
* @property int $id
4141
*/
4242
class Brand extends AbstractObject
4343
{
@@ -49,8 +49,8 @@ class Brand extends AbstractObject
4949
/**
5050
* Default constructor
5151
*
52-
* @param Db $zdb Database instance
53-
* @param ?integer $id brand's id to load. Defaults to null
52+
* @param Db $zdb Database instance
53+
* @param ?int $id brand's id to load. Defaults to null
5454
*/
5555
public function __construct(Db $zdb, ?int $id = null)
5656
{

‎lib/GaletteAuto/Color.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class Color extends AbstractObject
4040
/**
4141
* Default constructor
4242
*
43-
* @param Db $zdb Database instance
44-
* @param ?integer $id state's id to load. Defaults to null
43+
* @param Db $zdb Database instance
44+
* @param ?int $id state's id to load. Defaults to null
4545
*/
4646
public function __construct(Db $zdb, ?int $id = null)
4747
{

‎lib/GaletteAuto/Controllers/Controller.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class Controller extends AbstractPluginController
6161
* Check ACLs for specific member
6262
*
6363
* @param Response $response Response
64-
* @param integer $id_adh Members id to check right for
64+
* @param int $id_adh Members id to check right for
6565
* @param string|false|null $redirect Path to redirect to (myVehiclesList per default)
6666
*
6767
* @return bool|Response
@@ -106,7 +106,7 @@ protected function checkAclsFor(Response $response, int $id_adh, string|false|nu
106106
*
107107
* @param Request $request PSR Request
108108
* @param Response $response PSR Response
109-
* @param ?integer $id Vehicle id
109+
* @param ?int $id Vehicle id
110110
*
111111
* @return Response
112112
*/
@@ -498,7 +498,7 @@ public function doAddEditVehicle(Request $request, Response $response, string $a
498498
*
499499
* @param Request $request Request
500500
* @param Response $response Response
501-
* @param integer $id Vehicle id
501+
* @param int $id Vehicle id
502502
*
503503
* @return Response
504504
*/
@@ -558,7 +558,7 @@ public function ajaxModels(Request $request, Response $response): Response
558558
*
559559
* @param Request $request Request
560560
* @param Response $response Response
561-
* @param integer $id Vehicle ID
561+
* @param int $id Vehicle ID
562562
*
563563
* @return Response
564564
*/

‎lib/GaletteAuto/Controllers/Crud/ModelsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ public function confirmRemoveTitle(array $args): string
370370
* @param array $args Route arguments
371371
* @param array $post POST values
372372
*
373-
* @return boolean
373+
* @return bool
374374
*/
375375
protected function doDelete(array $args, array $post): bool
376376
{

0 commit comments

Comments
 (0)