From 6dd12954fb1c8e102bb4d8d693c4738fca7726f3 Mon Sep 17 00:00:00 2001 From: Daniel von Rohr Date: Wed, 17 Nov 2021 15:11:43 +0100 Subject: [PATCH] refactor: Pimcore X compatibility --- README.md | 2 +- composer.json | 2 +- .../Controller/TranslationController.php | 4 ++-- .../Resources/docs/01-setting_up_the_bundle.md | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a9284fa..d093b27 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A pretty nice way to expose your Pimcore shared translation messages to your client applications. ## Requirements -* Pimcore 5.8 or 6.0 +* Pimcore 10 * Bazinga JS Translation 2.0 ## Documentation diff --git a/composer.json b/composer.json index 5f80b03..8c2beac 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "matthiasmullie/minify": "^1.0", - "pimcore/pimcore": "^5.8 | ^6.3" + "pimcore/pimcore": "^10.0" }, "require-dev": { "phpstan/phpstan": "^0.11.19", diff --git a/src/PimcoreJsTranslationBundle/Controller/TranslationController.php b/src/PimcoreJsTranslationBundle/Controller/TranslationController.php index d82fd41..35b78f4 100644 --- a/src/PimcoreJsTranslationBundle/Controller/TranslationController.php +++ b/src/PimcoreJsTranslationBundle/Controller/TranslationController.php @@ -8,7 +8,7 @@ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt * files that are distributed with this source code. * - * @copyright Copyright (c) 2020 w-vision AG (https://www.w-vision.ch) + * @copyright Copyright (c) 2021 w-vision AG (https://www.w-vision.ch) * @license https://github.com/w-vision/PimcoreJsTranslationBundle/blob/master/LICENSE GNU General Public License version 3 (GPLv3) */ @@ -83,7 +83,7 @@ public function getTranslationsAction(Request $request, string $format): Respons $translations = []; - $translationList = new Translation\Website\Listing(); + $translationList = new Translation\Listing(); $translationList->setOrderKey('key'); $translationList->setOrder('asc'); $translationList->load(); diff --git a/src/PimcoreJsTranslationBundle/Resources/docs/01-setting_up_the_bundle.md b/src/PimcoreJsTranslationBundle/Resources/docs/01-setting_up_the_bundle.md index 9f08e82..5a4b96e 100644 --- a/src/PimcoreJsTranslationBundle/Resources/docs/01-setting_up_the_bundle.md +++ b/src/PimcoreJsTranslationBundle/Resources/docs/01-setting_up_the_bundle.md @@ -18,10 +18,6 @@ or also use the Pimcore bundle manager. $ php bin/console pimcore:bundle:enable PimcoreJsTranslationBundle ``` -``` bash -$ php bin/console pimcore:bundle:install PimcoreJsTranslationBundle -``` - **Important:** Don't forget to clear the cache and reload the Pimcore interface after you've done that. ### Continue to the next step!