Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.1.1 #31

Closed
wants to merge 6 commits into from
Closed

Release/2.1.1 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f141e8e
Merge branch 'release/2.1.0' into develop
trasher Jun 7, 2024
127a088
Checker configuration
trasher Jun 7, 2024
ee24a1b
CI config
trasher Jun 7, 2024
cbd67f2
Fix tests
trasher Jun 7, 2024
251ca6c
Quick & dirty hack (again) to fix composer checker
trasher Jun 18, 2024
26525e4
Bump version
trasher Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .composer-require-checker.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"GALETTE_DOWNLOADS_URI",
"GALETTE_EXPORTS_PATH",
"GALETTE_FILES_PATH",
"GALETTE_HOSTED",
"GALETTE_IMPORTS_PATH",
"GALETTE_LOGS_PATH",
"GALETTE_MODE",
Expand All @@ -58,6 +59,7 @@
"GALETTE_MARIADB_MIN",
"GALETTE_PGSQL_MIN",
"GALETTE_DISPLAY_VERSION",
"GALETTE_TESTS",
"GALETTE_PHP_MIN",

"// Galette db constants (not detected as they are dynamically declared)",
Expand Down Expand Up @@ -102,7 +104,8 @@
"DI\\Attribute\\Inject",

"// Not detected, do not know why.",
"Psr\\Http\\Server\\RequestHandlerInterface"
"Psr\\Http\\Server\\RequestHandlerInterface",
"Install"
],
"scan-files": [
"*.php",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ jobs:
cd galette-core/galette/plugins/plugin-maps
composer require maglnet/composer-require-checker -W
vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
if: matrix.php-versions == '8.3'

- name: PHPStan checks
run: |
cd galette-core/galette/plugins/plugin-maps
../../vendor/bin/phpstan analyze --ansi --memory-limit=2G --no-interaction --no-progress
if: matrix.php-versions == '8.1'

- name: Headers checks
run: |
Expand Down
4 changes: 2 additions & 2 deletions _define.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'Galette Maps', //Name
'Maps features', //Short description
'Johan Cwiklinski', //Author
'2.1.0', //Version
'2.1.1', //Version
'1.1.0', //Galette compatible version
'maps', //routing name and translation domain
'2024-06-08', //Release date
'2024-07-06', //Release date
[ //Permissions needed
'maps_localize_member' => 'member',
'maps_mymap' => 'member',
Expand Down
4 changes: 2 additions & 2 deletions tests/GaletteMaps/tests/units/Coordinates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ public function testCoordinates(): void

//set coordinates for member one
$this->assertTrue($coords->setCoords($member->id, 50.362038,3.472998));
$this->assertSame(
$this->assertEquals(
[
'id_adh' => $member->id,
'latitude' => '50.362038',
'longitude' => '3.472998'
],
(array)$coords->getCoords($member->id)
);
$this->assertSame(
$this->assertEquals(
[
[
'id_adh' => $member->id,
Expand Down