diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json
index 3db1f9c..f03dabf 100644
--- a/.composer-require-checker.config.json
+++ b/.composer-require-checker.config.json
@@ -47,6 +47,7 @@
"GALETTE_NIGHTLY",
"GALETTE_PHOTOS_PATH",
"GALETTE_PLUGINS_PATH",
+ "GALETTE_PLUGINS_DATA_PATH",
"GALETTE_ROOT",
"GALETTE_TELEMETRY_URI",
"GALETTE_TEMPIMAGES_PATH",
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 72200ab..f330595 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
- php-versions: [ '8.1', '8.4' ]
+ php-versions: [ '8.2', '8.4' ]
coverage: [none]
fail-fast: false
@@ -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
@@ -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:
diff --git a/lib/GaletteLegalNotices/Entity/Pages.php b/lib/GaletteLegalNotices/Entity/Pages.php
index 719f94c..0a46085 100644
--- a/lib/GaletteLegalNotices/Entity/Pages.php
+++ b/lib/GaletteLegalNotices/Entity/Pages.php
@@ -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();
@@ -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
);
}
@@ -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;
@@ -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;
@@ -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;
diff --git a/tests/GaletteLegalNotices/Entity/tests/units/Pages.php b/tests/GaletteLegalNotices/Entity/tests/units/Pages.php
index 544f76e..fc63014 100644
--- a/tests/GaletteLegalNotices/Entity/tests/units/Pages.php
+++ b/tests/GaletteLegalNotices/Entity/tests/units/Pages.php
@@ -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 | ' .
- ' | ' .
- 'contact [at] galette [dot] eu',
+ 'Galette | '
+ . ' | '
+ . 'contact [at] galette [dot] eu',
$pages->getBody()
);
@@ -153,9 +153,9 @@ public function testReplacements(): void
);
$pages->getPages('legal-information', 'en_US');
$this->assertSame(
- 'Galette | ' .
- '+00 0 00 00 00 00 | ' .
- 'contact [at] galette [dot] eu',
+ 'Galette | '
+ . '+00 0 00 00 00 00 | '
+ . 'contact [at] galette [dot] eu',
$pages->getBody()
);