Skip to content

Fix github workflow #7

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

Merged
gagnieray merged 1 commit into from
Oct 17, 2025
Merged

Fix github workflow #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .composer-require-checker.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"GALETTE_NIGHTLY",
"GALETTE_PHOTOS_PATH",
"GALETTE_PLUGINS_PATH",
"GALETTE_PLUGINS_DATA_PATH",
"GALETTE_ROOT",
"GALETTE_TELEMETRY_URI",
"GALETTE_TEMPIMAGES_PATH",
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
php-versions: [ '8.1', '8.4' ]
php-versions: [ '8.2', '8.4' ]
coverage: [none]
fail-fast: false

Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
../../vendor/bin/phpcs lib/ ./*.php

- name: CS Fixer
if: matrix.php-versions == '8.1'
if: matrix.php-versions == '8.2'
run: |
cd galette-core/galette/plugins/plugin-legalnotices
../../vendor/bin/php-cs-fixer check --show-progress=dots --verbose --diff
Expand Down Expand Up @@ -106,22 +106,20 @@ jobs:
strategy:
matrix:
include:
#always tests higher stable php version with lower db version
#enable coverage on higher stable php version with higher postrgesql version
#higher stable php version
- { php-version: "8.4", db-image: "postgres:13", coverage: none, always: true }
- { php-version: "8.4", db-image: "postgres:17", coverage: none, always: true }
- { php-version: "8.4", db-image: "postgres:18", coverage: none, always: true }
- { php-version: "8.4", db-image: "mysql:8.0", coverage: none, always: true }
- { php-version: "8.4", db-image: "mysql:9.1", coverage: none, always: false }
- { php-version: "8.4", db-image: "mariadb:10.5", coverage: none, always: true }
- { php-version: "8.4", db-image: "mariadb:11.6", coverage: none, always: false }
- { php-version: "8.4", db-image: "mysql:9.4", coverage: none, always: true }
- { php-version: "8.4", db-image: "mariadb:10.6", coverage: none, always: true }
- { php-version: "8.4", db-image: "mariadb:12.0", coverage: none, always: true }
#lower php version
- { php-version: "8.1", db-image: "postgres:13", coverage: none, always: false }
- { php-version: "8.1", db-image: "postgres:17", coverage: none, always: false }
- { php-version: "8.1", db-image: "mysql:8.0", coverage: none, always: false }
- { php-version: "8.1", db-image: "mysql:9.1", coverage: none, always: false }
- { php-version: "8.1", db-image: "mariadb:10.5", coverage: none, always: false }
- { php-version: "8.1", db-image: "mariadb:11.6", coverage: none, always: false }
- { php-version: "8.2", db-image: "postgres:13", coverage: none, always: true }
- { php-version: "8.2", db-image: "postgres:18", coverage: none, always: true }
- { php-version: "8.2", db-image: "mysql:8.0", coverage: none, always: true }
- { php-version: "8.2", db-image: "mysql:9.4", coverage: none, always: true }
- { php-version: "8.2", db-image: "mariadb:10.6", coverage: none, always: true }
- { php-version: "8.2", db-image: "mariadb:12.0", coverage: none, always: true }
fail-fast: false

env:
Expand Down
24 changes: 12 additions & 12 deletions lib/GaletteLegalNotices/Entity/Pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ public function getPages(string $name, string $lang): ArrayObject

if ($is_lang_ok !== true) {
Analog::log(
'Language ' . $lang .
' does not exists. Falling back to default Galette lang.',
'Language ' . $lang
. ' does not exists. Falling back to default Galette lang.',
Analog::ERROR
);
$lang = $i18n->getID();
Expand Down Expand Up @@ -368,15 +368,15 @@ public function getPages(string $name, string $lang): ArrayObject
return $this->getPages($name, $lang);
} catch (Throwable $e) {
Analog::log(
'Unable to add missing requested page "' . $name .
' (' . $lang . ') | ' . $e->getMessage(),
'Unable to add missing requested page "' . $name
. ' (' . $lang . ') | ' . $e->getMessage(),
Analog::WARNING
);
}
} else {
Analog::log(
'Unable to find missing requested page "' . $name .
' (' . $lang . ')',
'Unable to find missing requested page "' . $name
. ' (' . $lang . ')',
Analog::WARNING
);
}
Expand All @@ -385,8 +385,8 @@ public function getPages(string $name, string $lang): ArrayObject
return $this->current_page;
} catch (Throwable $e) {
Analog::log(
'Cannot get page `' . $name . '` for lang `' . $lang . '` | ' .
$e->getMessage(),
'Cannot get page `' . $name . '` for lang `' . $lang . '` | '
. $e->getMessage(),
Analog::WARNING
);
throw $e;
Expand Down Expand Up @@ -428,8 +428,8 @@ public function storePageContent(string $name, string $lang, string $body, strin
return true;
} catch (Throwable $e) {
Analog::log(
'An error has occurred while storing page content. | ' .
$e->getMessage(),
'An error has occurred while storing page content. | '
. $e->getMessage(),
Analog::ERROR
);
throw $e;
Expand Down Expand Up @@ -459,8 +459,8 @@ public function getNames(string $lang = I18n::DEFAULT_LANG): array
return $names;
} catch (Throwable $e) {
Analog::log(
'Cannot get pages names for lang `' . $lang . '` | ' .
$e->getMessage(),
'Cannot get pages names for lang `' . $lang . '` | '
. $e->getMessage(),
Analog::WARNING
);
throw $e;
Expand Down
12 changes: 6 additions & 6 deletions tests/GaletteLegalNotices/Entity/tests/units/Pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ public function testReplacements(): void
$pages->storePageContent('legal-information', 'en_US', $page_body, '');
$pages->getPages('legal-information', 'en_US');
$this->assertSame(
'Galette | ' .
' | ' .
'<span class="obfuscate"><span class="u">contact</span> [at] <span class="d">galette<span class="p"> [dot] </span>eu</span></span>',
'Galette | '
. ' | '
. '<span class="obfuscate"><span class="u">contact</span> [at] <span class="d">galette<span class="p"> [dot] </span>eu</span></span>',
$pages->getBody()
);

Expand All @@ -153,9 +153,9 @@ public function testReplacements(): void
);
$pages->getPages('legal-information', 'en_US');
$this->assertSame(
'Galette | ' .
'<a href="tel:+00000000000">+00 0 00 00 00 00</a> | ' .
'<span class="obfuscate"><span class="u">contact</span> [at] <span class="d">galette<span class="p"> [dot] </span>eu</span></span>',
'Galette | '
. '<a href="tel:+00000000000">+00 0 00 00 00 00</a> | '
. '<span class="obfuscate"><span class="u">contact</span> [at] <span class="d">galette<span class="p"> [dot] </span>eu</span></span>',
$pages->getBody()
);

Expand Down