From 6ff3ff112dcb2b8ffac90ec1943301fbd2ff02a2 Mon Sep 17 00:00:00 2001 From: MacFJA Date: Sat, 12 Sep 2020 21:22:18 +0200 Subject: [PATCH] Fix build + data typing protection --- .phan/config.php | 2 ++ CHANGELOG.md | 10 +++++++++- Makefile | 2 +- src/Controller/HomepageController.php | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.phan/config.php b/.phan/config.php index 58501c1..b5d1292 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -360,8 +360,10 @@ 'vendor/pcrov/jsonreader/src', 'vendor/psr/log/Psr/Log', 'vendor/sensio/framework-extra-bundle/src', + 'vendor/symfony/translation-contracts', 'vendor/symfony/config', 'vendor/symfony/console', + 'vendor/symfony/translation', 'vendor/symfony/filesystem', 'vendor/symfony/finder', 'vendor/symfony/framework-bundle', diff --git a/CHANGELOG.md b/CHANGELOG.md index e8df2e4..124ed4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.1.1] - 2020-09-12 + +### Fixed + +- Unprotected class usage +- Missing translations in the build process + ## [1.1.0] - 2020-09-12 ### Added @@ -44,7 +51,8 @@ Full rewrite of the application. First version -[Unreleased]: https://github.com/MacFJA/livres/compare/1.1.0...HEAD +[Unreleased]: https://github.com/MacFJA/livres/compare/1.1.1...HEAD +[1.1.1]: https://github.com/MacFJA/livres/releases/tag/1.1.1 [1.1.0]: https://github.com/MacFJA/livres/releases/tag/1.1.0 [1.0.0]: https://github.com/MacFJA/livres/releases/tag/1.0.0 [0.0.1]: https://github.com/MacFJA/livres/releases/tag/0.0.1 \ No newline at end of file diff --git a/Makefile b/Makefile index 59a716d..d86d48d 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ build: mkdir -p build/app cp -Rp node_modules build/app/ || : cp -Rp vendor build/app/ || : - cp -Rp .make _extra assets bin config src templates .env composer.json composer.lock Makefile package.json symfony.lock webpack.config.js package-lock.json LICENSE.md build/app/ + cp -Rp .make _extra assets bin config src templates translations .env composer.json composer.lock Makefile package.json symfony.lock webpack.config.js package-lock.json LICENSE.md build/app/ mkdir -p build/app/public mkdir -p build/app/public/cover cp public/index.php build/app/public/ diff --git a/src/Controller/HomepageController.php b/src/Controller/HomepageController.php index be5c093..2a647e9 100644 --- a/src/Controller/HomepageController.php +++ b/src/Controller/HomepageController.php @@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Translation\TranslatorBagInterface; use Symfony\Contracts\Translation\TranslatorInterface; /** @@ -72,6 +73,10 @@ public function base(iterable $providers, ProviderConfigurationInterface $provid */ public function translation(string $name, TranslatorInterface $translator): JsonResponse { + if (!($translator instanceof TranslatorBagInterface)) { + return new JsonResponse([]); + } + return new JsonResponse($translator->getCatalogue($name)->all('front')); } }