Skip to content

Commit 4f686c7

Browse files
gagnieraygagnieray
committed
Update github workflow
1 parent de037df commit 4f686c7

File tree

4 files changed

+31
-32
lines changed

4 files changed

+31
-32
lines changed

‎.composer-require-checker.config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"GALETTE_NIGHTLY",
4848
"GALETTE_PHOTOS_PATH",
4949
"GALETTE_PLUGINS_PATH",
50+
"GALETTE_PLUGINS_DATA_PATH",
5051
"GALETTE_ROOT",
5152
"GALETTE_TELEMETRY_URI",
5253
"GALETTE_TEMPIMAGES_PATH",

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

Lines changed: 12 additions & 14 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.4' ]
2929
coverage: [none]
3030
fail-fast: false
3131

@@ -73,7 +73,7 @@ jobs:
7373
../../vendor/bin/phpcs lib/ ./*.php
7474
7575
- name: CS Fixer
76-
if: matrix.php-versions == '8.1'
76+
if: matrix.php-versions == '8.2'
7777
run: |
7878
cd galette-core/galette/plugins/plugin-legalnotices
7979
../../vendor/bin/php-cs-fixer check --show-progress=dots --verbose --diff
@@ -106,22 +106,20 @@ jobs:
106106
strategy:
107107
matrix:
108108
include:
109-
#always tests higher stable php version with lower db version
110-
#enable coverage on higher stable php version with higher postrgesql version
111109
#higher stable php version
112110
- { php-version: "8.4", db-image: "postgres:13", coverage: none, always: true }
113-
- { php-version: "8.4", db-image: "postgres:17", coverage: none, always: true }
111+
- { php-version: "8.4", db-image: "postgres:18", coverage: none, always: true }
114112
- { php-version: "8.4", db-image: "mysql:8.0", coverage: none, always: true }
115-
- { php-version: "8.4", db-image: "mysql:9.1", coverage: none, always: false }
116-
- { php-version: "8.4", db-image: "mariadb:10.5", coverage: none, always: true }
117-
- { php-version: "8.4", db-image: "mariadb:11.6", coverage: none, always: false }
113+
- { php-version: "8.4", db-image: "mysql:9.4", coverage: none, always: true }
114+
- { php-version: "8.4", db-image: "mariadb:10.6", coverage: none, always: true }
115+
- { php-version: "8.4", db-image: "mariadb:12.0", coverage: none, always: true }
118116
#lower php version
119-
- { php-version: "8.1", db-image: "postgres:13", coverage: none, always: false }
120-
- { php-version: "8.1", db-image: "postgres:17", coverage: none, always: false }
121-
- { php-version: "8.1", db-image: "mysql:8.0", coverage: none, always: false }
122-
- { php-version: "8.1", db-image: "mysql:9.1", coverage: none, always: false }
123-
- { php-version: "8.1", db-image: "mariadb:10.5", coverage: none, always: false }
124-
- { php-version: "8.1", db-image: "mariadb:11.6", coverage: none, always: false }
117+
- { php-version: "8.2", db-image: "postgres:13", coverage: none, always: true }
118+
- { php-version: "8.2", db-image: "postgres:18", coverage: none, always: true }
119+
- { php-version: "8.2", db-image: "mysql:8.0", coverage: none, always: true }
120+
- { php-version: "8.2", db-image: "mysql:9.4", coverage: none, always: true }
121+
- { php-version: "8.2", db-image: "mariadb:10.6", coverage: none, always: true }
122+
- { php-version: "8.2", db-image: "mariadb:12.0", coverage: none, always: true }
125123
fail-fast: false
126124

127125
env:

‎lib/GaletteLegalNotices/Entity/Pages.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ public function getPages(string $name, string $lang): ArrayObject
324324

325325
if ($is_lang_ok !== true) {
326326
Analog::log(
327-
'Language ' . $lang .
328-
' does not exists. Falling back to default Galette lang.',
327+
'Language ' . $lang
328+
. ' does not exists. Falling back to default Galette lang.',
329329
Analog::ERROR
330330
);
331331
$lang = $i18n->getID();
@@ -368,15 +368,15 @@ public function getPages(string $name, string $lang): ArrayObject
368368
return $this->getPages($name, $lang);
369369
} catch (Throwable $e) {
370370
Analog::log(
371-
'Unable to add missing requested page "' . $name .
372-
' (' . $lang . ') | ' . $e->getMessage(),
371+
'Unable to add missing requested page "' . $name
372+
. ' (' . $lang . ') | ' . $e->getMessage(),
373373
Analog::WARNING
374374
);
375375
}
376376
} else {
377377
Analog::log(
378-
'Unable to find missing requested page "' . $name .
379-
' (' . $lang . ')',
378+
'Unable to find missing requested page "' . $name
379+
. ' (' . $lang . ')',
380380
Analog::WARNING
381381
);
382382
}
@@ -385,8 +385,8 @@ public function getPages(string $name, string $lang): ArrayObject
385385
return $this->current_page;
386386
} catch (Throwable $e) {
387387
Analog::log(
388-
'Cannot get page `' . $name . '` for lang `' . $lang . '` | ' .
389-
$e->getMessage(),
388+
'Cannot get page `' . $name . '` for lang `' . $lang . '` | '
389+
. $e->getMessage(),
390390
Analog::WARNING
391391
);
392392
throw $e;
@@ -428,8 +428,8 @@ public function storePageContent(string $name, string $lang, string $body, strin
428428
return true;
429429
} catch (Throwable $e) {
430430
Analog::log(
431-
'An error has occurred while storing page content. | ' .
432-
$e->getMessage(),
431+
'An error has occurred while storing page content. | '
432+
. $e->getMessage(),
433433
Analog::ERROR
434434
);
435435
throw $e;
@@ -459,8 +459,8 @@ public function getNames(string $lang = I18n::DEFAULT_LANG): array
459459
return $names;
460460
} catch (Throwable $e) {
461461
Analog::log(
462-
'Cannot get pages names for lang `' . $lang . '` | ' .
463-
$e->getMessage(),
462+
'Cannot get pages names for lang `' . $lang . '` | '
463+
. $e->getMessage(),
464464
Analog::WARNING
465465
);
466466
throw $e;

‎tests/GaletteLegalNotices/Entity/tests/units/Pages.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ public function testReplacements(): void
141141
$pages->storePageContent('legal-information', 'en_US', $page_body, '');
142142
$pages->getPages('legal-information', 'en_US');
143143
$this->assertSame(
144-
'Galette | ' .
145-
' | ' .
146-
'<span class="obfuscate"><span class="u">contact</span> [at] <span class="d">galette<span class="p"> [dot] </span>eu</span></span>',
144+
'Galette | '
145+
. ' | '
146+
. '<span class="obfuscate"><span class="u">contact</span> [at] <span class="d">galette<span class="p"> [dot] </span>eu</span></span>',
147147
$pages->getBody()
148148
);
149149

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

0 commit comments

Comments
 (0)