From 64a8534756e46e9f6d96b0e86d1897011f409bae Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sat, 19 Aug 2017 23:11:33 +0200 Subject: [PATCH 1/9] Removed WebUIMessage --- Controller/WebUIController.php | 16 +++--- Model/WebUiMessage.php | 72 -------------------------- Resources/config/validation.yml | 9 ++++ Resources/views/WebUI/create.html.twig | 2 +- 4 files changed, 19 insertions(+), 80 deletions(-) delete mode 100644 Model/WebUiMessage.php create mode 100644 Resources/config/validation.yml diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index 5690af17..78749180 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -140,13 +140,15 @@ public function createAction(Request $request, $configName, $locale, $domain) $storage = $this->get('php_translation.storage.'.$configName); try { - $message = $this->getMessage($request, ['Create']); + $message = $this->getMessage($request, ['WebUi_Create']); + $message->setDomain($domain); + $message->setLocale($locale); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } try { - $storage->create(new Message($message->getKey(), $domain, $locale, $message->getMessage())); + $storage->create($message); } catch (StorageException $e) { throw new BadRequestHttpException(sprintf( 'Key "%s" does already exist for "%s" on domain "%s".', @@ -176,7 +178,7 @@ public function editAction(Request $request, $configName, $locale, $domain) } try { - $message = $this->getMessage($request, ['Edit']); + $message = $this->getMessage($request, ['WebUi_Edit']); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } @@ -203,7 +205,7 @@ public function deleteAction(Request $request, $configName, $locale, $domain) } try { - $message = $this->getMessage($request, ['Delete']); + $message = $this->getMessage($request, ['WebUi_Delete']); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } @@ -219,18 +221,18 @@ public function deleteAction(Request $request, $configName, $locale, $domain) * @param Request $request * @param array $validationGroups * - * @return WebUiMessage + * @return Message */ private function getMessage(Request $request, array $validationGroups = []) { $json = $request->getContent(); $data = json_decode($json, true); - $message = new WebUiMessage(); + $message = new Message(); if (isset($data['key'])) { $message->setKey($data['key']); } if (isset($data['message'])) { - $message->setMessage($data['message']); + $message->setTranslation($data['message']); } $errors = $this->get('validator')->validate($message, null, $validationGroups); diff --git a/Model/WebUiMessage.php b/Model/WebUiMessage.php deleted file mode 100644 index 6a9e571e..00000000 --- a/Model/WebUiMessage.php +++ /dev/null @@ -1,72 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Translation\Bundle\Model; - -use Symfony\Component\Validator\Constraints as Assert; - -/** - * @author Tobias Nyholm - */ -final class WebUiMessage -{ - /** - * @var string - * @Assert\NotBlank(groups={"Create", "Edit", "Delete"}) - */ - private $key; - - /** - * @var string - * @Assert\NotBlank(groups={"Create", "Edit"}) - */ - private $message; - - /** - * @return string - */ - public function getKey() - { - return $this->key; - } - - /** - * @param string $key - * - * @return WebUiMessage - */ - public function setKey($key) - { - $this->key = $key; - - return $this; - } - - /** - * @return string - */ - public function getMessage() - { - return $this->message; - } - - /** - * @param string $message - * - * @return WebUiMessage - */ - public function setMessage($message) - { - $this->message = $message; - - return $this; - } -} diff --git a/Resources/config/validation.yml b/Resources/config/validation.yml new file mode 100644 index 00000000..33f03650 --- /dev/null +++ b/Resources/config/validation.yml @@ -0,0 +1,9 @@ +Translation\Common\Model\Message: + properties: + key: + - NotBlank: + groups: ["WebUi_Create", "WebUi_Edit", "WebUi_Delete"] + + message: + - NotBlank: + groups: ["WebUi_Create", "WebUi_Edit"] diff --git a/Resources/views/WebUI/create.html.twig b/Resources/views/WebUI/create.html.twig index 361f385c..e68cbe53 100644 --- a/Resources/views/WebUI/create.html.twig +++ b/Resources/views/WebUI/create.html.twig @@ -5,7 +5,7 @@ class="message-textarea" data-key="{{ message.key }}" onchange="editTranslation(this)" - >{{ message.message }} + >{{ message.translation }}
From 30ad62fef01e3065f9d766b38c1742289a332881 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sat, 19 Aug 2017 23:36:56 +0200 Subject: [PATCH 2/9] Added example translation file --- .../Resources/translations/messages.en.xlf | 22 +++++++++++++++++++ Tests/Unit/.gitkeep | 0 2 files changed, 22 insertions(+) create mode 100644 Tests/Functional/app/Resources/translations/messages.en.xlf delete mode 100644 Tests/Unit/.gitkeep diff --git a/Tests/Functional/app/Resources/translations/messages.en.xlf b/Tests/Functional/app/Resources/translations/messages.en.xlf new file mode 100644 index 00000000..97b00d22 --- /dev/null +++ b/Tests/Functional/app/Resources/translations/messages.en.xlf @@ -0,0 +1,22 @@ + + + + + + new + true + user login + + + key0 + trans0 + + + + + key1 + trans1 + + + + diff --git a/Tests/Unit/.gitkeep b/Tests/Unit/.gitkeep deleted file mode 100644 index e69de29b..00000000 From 08ce3a397f15fb48909b7ff6c53f881058d5b684 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 00:00:24 +0200 Subject: [PATCH 3/9] Adding tests for WebUI controller --- Controller/WebUIController.php | 4 +- Resources/config/validation.yml | 2 +- Resources/views/WebUI/base.html.twig | 2 +- .../{ => Controller}/EditInPlaceTest.php | 5 +- .../Controller/WebUIControllerTest.php | 107 ++++++++++++++++++ .../app/Resources/translations/.gitignore | 1 + Tests/Functional/app/config/default.yml | 5 + Tests/Functional/app/config/framework.yml | 2 +- Tests/Functional/app/config/routing.yml | 3 + composer.json | 1 + 10 files changed, 126 insertions(+), 6 deletions(-) rename Tests/Functional/{ => Controller}/EditInPlaceTest.php (94%) create mode 100644 Tests/Functional/Controller/WebUIControllerTest.php create mode 100644 Tests/Functional/app/Resources/translations/.gitignore diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index 78749180..8acd6ed2 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -179,13 +179,15 @@ public function editAction(Request $request, $configName, $locale, $domain) try { $message = $this->getMessage($request, ['WebUi_Edit']); + $message->setDomain($domain); + $message->setLocale($locale); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } /** @var StorageService $storage */ $storage = $this->get('php_translation.storage.'.$configName); - $storage->update(new Message($message->getKey(), $domain, $locale, $message->getMessage())); + $storage->update($message); return new Response('Translation updated'); } diff --git a/Resources/config/validation.yml b/Resources/config/validation.yml index 33f03650..fbd4188b 100644 --- a/Resources/config/validation.yml +++ b/Resources/config/validation.yml @@ -4,6 +4,6 @@ Translation\Common\Model\Message: - NotBlank: groups: ["WebUi_Create", "WebUi_Edit", "WebUi_Delete"] - message: + translation: - NotBlank: groups: ["WebUi_Create", "WebUi_Edit"] diff --git a/Resources/views/WebUI/base.html.twig b/Resources/views/WebUI/base.html.twig index f9e8a233..b559301a 100644 --- a/Resources/views/WebUI/base.html.twig +++ b/Resources/views/WebUI/base.html.twig @@ -17,7 +17,7 @@ {% for c in configNames %}
  • - {{ c|humanize }} + {{ c }}
    • {% endfor %} diff --git a/Tests/Functional/EditInPlaceTest.php b/Tests/Functional/Controller/EditInPlaceTest.php similarity index 94% rename from Tests/Functional/EditInPlaceTest.php rename to Tests/Functional/Controller/EditInPlaceTest.php index f57e7401..9a968235 100644 --- a/Tests/Functional/EditInPlaceTest.php +++ b/Tests/Functional/Controller/EditInPlaceTest.php @@ -9,9 +9,10 @@ * file that was distributed with this source code. */ -namespace Translation\Bundle\Tests\Functional; +namespace Translation\Bundle\Tests\Functional\Controller; use Symfony\Component\HttpFoundation\Request; +use Translation\Bundle\Tests\Functional\BaseTestCase; /** * @author Damien Alexandre @@ -51,7 +52,7 @@ public function testActivatedTest() public function testIfUntranslatableLabelGetsDisabled() { - $this->kernel->addConfigFile(__DIR__.'/app/config/disabled_label.yml'); + $this->kernel->addConfigFile(__DIR__.'/../app/config/disabled_label.yml'); $request = Request::create('/foobar'); // Activate the feature diff --git a/Tests/Functional/Controller/WebUIControllerTest.php b/Tests/Functional/Controller/WebUIControllerTest.php new file mode 100644 index 00000000..32033bfb --- /dev/null +++ b/Tests/Functional/Controller/WebUIControllerTest.php @@ -0,0 +1,107 @@ + + + + + + key0 + trans0 + + + + + key1 + trans1 + + + + + +XML + ); + } + + public function testIndexAction() + { + $request = Request::create('/_trans', 'GET'); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + + $request = Request::create('/_trans/app', 'GET'); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + } + + + public function testShowAction() + { + $request = Request::create('/_trans/app/en/messages', 'GET'); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + } + + + public function testCreateAction() + { + $request = Request::create('/_trans/app/sv/messages/new', 'POST', [], [], [], [], json_encode([ + 'key'=>'foo' + ])); + $response = $this->kernel->handle($request); + $this->assertEquals(400, $response->getStatusCode()); + + $request = Request::create('/_trans/app/sv/messages/new', 'POST', [], [], [], [], json_encode([ + 'key'=>'foo', + 'message'=>'bar' + ])); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + } + + public function testEditAction() + { + $request = Request::create('/_trans/app/sv/messages', 'POST', [], [], [], [], json_encode([ + 'key'=>'foo' + ])); + $response = $this->kernel->handle($request); + $this->assertEquals(400, $response->getStatusCode()); + + $request = Request::create('/_trans/app/sv/messages', 'POST', [], [], [], [], json_encode([ + 'key'=>'key1', + 'message'=>'bar' + ])); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + } + + + public function testDeleteAction() + { + // Removing something that does not exists is okey. + $request = Request::create('/_trans/app/sv/messages', 'DELETE', [], [], [], [], json_encode([ + 'key'=>'empty' + ])); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + + $request = Request::create('/_trans/app/sv/messages', 'DELETE', [], [], [], [], json_encode([ + 'key'=>'foo', + ])); + $response = $this->kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + } +} diff --git a/Tests/Functional/app/Resources/translations/.gitignore b/Tests/Functional/app/Resources/translations/.gitignore new file mode 100644 index 00000000..cd4f20e6 --- /dev/null +++ b/Tests/Functional/app/Resources/translations/.gitignore @@ -0,0 +1 @@ +messages.sv.xlf diff --git a/Tests/Functional/app/config/default.yml b/Tests/Functional/app/config/default.yml index 9237e5eb..ce3e9dbc 100644 --- a/Tests/Functional/app/config/default.yml +++ b/Tests/Functional/app/config/default.yml @@ -4,7 +4,12 @@ imports: - { resource: services.yml } translation: + locales: ["en", "sv"] webui: enabled: true edit_in_place: enabled: true + configs: + app: + dirs: ["%test.root_dir%/Resources/views"] + output_dir: "%test.root_dir%/Resources/translations" diff --git a/Tests/Functional/app/config/framework.yml b/Tests/Functional/app/config/framework.yml index a0604358..8822b255 100644 --- a/Tests/Functional/app/config/framework.yml +++ b/Tests/Functional/app/config/framework.yml @@ -6,7 +6,7 @@ framework: form: false csrf_protection: false validation: - enabled: false + enabled: true router: resource: "%test.root_dir%/config/routing.yml" type: 'yaml' diff --git a/Tests/Functional/app/config/routing.yml b/Tests/Functional/app/config/routing.yml index db41649a..c240bfcb 100644 --- a/Tests/Functional/app/config/routing.yml +++ b/Tests/Functional/app/config/routing.yml @@ -6,3 +6,6 @@ translated_page: _translation_edit_in_place: resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml' prefix: /admin + +_translation_web_ui: + resource: '@TranslationBundle/Resources/config/routing_webui.yml' diff --git a/composer.json b/composer.json index 9b6b7e36..e0440828 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "symfony/validator": "^2.7 || ^3.0", "symfony/translation": "^2.7 || ^3.0", "symfony/finder": "^2.7 || ^3.0", + "symfony/intl": "^2.7 || ^3.0", "php-translation/common": "^0.2.1", "php-translation/symfony-storage": "^0.3", From 0cc76b74227ebefc428d5a93c8128657c4955b07 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 00:01:20 +0200 Subject: [PATCH 4/9] Applied changes from StyleCI --- Controller/WebUIController.php | 1 - .../Controller/WebUIControllerTest.php | 30 +++++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index 8acd6ed2..926f8be5 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -18,7 +18,6 @@ use Symfony\Component\Intl\Intl; use Symfony\Component\Translation\MessageCatalogue; use Translation\Bundle\Exception\MessageValidationException; -use Translation\Bundle\Model\WebUiMessage; use Translation\Bundle\Service\StorageService; use Translation\Common\Exception\StorageException; use Translation\Bundle\Model\CatalogueMessage; diff --git a/Tests/Functional/Controller/WebUIControllerTest.php b/Tests/Functional/Controller/WebUIControllerTest.php index 32033bfb..4513c785 100644 --- a/Tests/Functional/Controller/WebUIControllerTest.php +++ b/Tests/Functional/Controller/WebUIControllerTest.php @@ -1,9 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Translation\Bundle\Tests\Functional\Controller; - use Symfony\Component\HttpFoundation\Request; use Translation\Bundle\Tests\Functional\BaseTestCase; @@ -13,7 +20,7 @@ public static function setUpBeforeClass() { parent::setUpBeforeClass(); - file_put_contents(__DIR__.'/../app/Resources/translations/messages.sv.xlf', << @@ -47,7 +54,6 @@ public function testIndexAction() $this->assertEquals(200, $response->getStatusCode()); } - public function testShowAction() { $request = Request::create('/_trans/app/en/messages', 'GET'); @@ -55,18 +61,17 @@ public function testShowAction() $this->assertEquals(200, $response->getStatusCode()); } - public function testCreateAction() { $request = Request::create('/_trans/app/sv/messages/new', 'POST', [], [], [], [], json_encode([ - 'key'=>'foo' + 'key' => 'foo', ])); $response = $this->kernel->handle($request); $this->assertEquals(400, $response->getStatusCode()); $request = Request::create('/_trans/app/sv/messages/new', 'POST', [], [], [], [], json_encode([ - 'key'=>'foo', - 'message'=>'bar' + 'key' => 'foo', + 'message' => 'bar', ])); $response = $this->kernel->handle($request); $this->assertEquals(200, $response->getStatusCode()); @@ -75,31 +80,30 @@ public function testCreateAction() public function testEditAction() { $request = Request::create('/_trans/app/sv/messages', 'POST', [], [], [], [], json_encode([ - 'key'=>'foo' + 'key' => 'foo', ])); $response = $this->kernel->handle($request); $this->assertEquals(400, $response->getStatusCode()); $request = Request::create('/_trans/app/sv/messages', 'POST', [], [], [], [], json_encode([ - 'key'=>'key1', - 'message'=>'bar' + 'key' => 'key1', + 'message' => 'bar', ])); $response = $this->kernel->handle($request); $this->assertEquals(200, $response->getStatusCode()); } - public function testDeleteAction() { // Removing something that does not exists is okey. $request = Request::create('/_trans/app/sv/messages', 'DELETE', [], [], [], [], json_encode([ - 'key'=>'empty' + 'key' => 'empty', ])); $response = $this->kernel->handle($request); $this->assertEquals(200, $response->getStatusCode()); $request = Request::create('/_trans/app/sv/messages', 'DELETE', [], [], [], [], json_encode([ - 'key'=>'foo', + 'key' => 'foo', ])); $response = $this->kernel->handle($request); $this->assertEquals(200, $response->getStatusCode()); From 627f7dcf7ac79bc7a85eadc43d0f6b56fe803bf8 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 00:09:50 +0200 Subject: [PATCH 5/9] Fixed tests --- Controller/WebUIController.php | 32 +++++++++++++------ Resources/config/validation.yml | 8 +++-- Tests/Functional/BundleInitializationTest.php | 2 +- Tests/Functional/app/config/default.yml | 1 - 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index 926f8be5..ce6dbe57 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -139,9 +139,10 @@ public function createAction(Request $request, $configName, $locale, $domain) $storage = $this->get('php_translation.storage.'.$configName); try { - $message = $this->getMessage($request, ['WebUi_Create']); + $message = $this->getMessageFromRequest($request); $message->setDomain($domain); $message->setLocale($locale); + $this->validateMessage($message, ['Create']); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } @@ -177,9 +178,10 @@ public function editAction(Request $request, $configName, $locale, $domain) } try { - $message = $this->getMessage($request, ['WebUi_Edit']); + $message = $this->getMessageFromRequest($request); $message->setDomain($domain); $message->setLocale($locale); + $this->validateMessage($message, ['Edit']); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } @@ -206,7 +208,10 @@ public function deleteAction(Request $request, $configName, $locale, $domain) } try { - $message = $this->getMessage($request, ['WebUi_Delete']); + $message = $this->getMessageFromRequest($request); + $message->setLocale($locale); + $message->setDomain($domain); + $this->validateMessage($message, ['Delete']); } catch (MessageValidationException $e) { return new Response($e->getMessage(), 400); } @@ -220,11 +225,10 @@ public function deleteAction(Request $request, $configName, $locale, $domain) /** * @param Request $request - * @param array $validationGroups * * @return Message */ - private function getMessage(Request $request, array $validationGroups = []) + private function getMessageFromRequest(Request $request) { $json = $request->getContent(); $data = json_decode($json, true); @@ -236,11 +240,6 @@ private function getMessage(Request $request, array $validationGroups = []) $message->setTranslation($data['message']); } - $errors = $this->get('validator')->validate($message, null, $validationGroups); - if (count($errors) > 0) { - throw MessageValidationException::create(); - } - return $message; } @@ -260,4 +259,17 @@ private function getLocale2LanguageMap() return $map; } + + /** + * @param Message $message + * @param array $validationGroups + * @throws MessageValidationException + */ + private function validateMessage(Message $message, array $validationGroups) + { + $errors = $this->get('validator')->validate($message, null, $validationGroups); + if (count($errors) > 0) { + throw MessageValidationException::create(); + } + } } diff --git a/Resources/config/validation.yml b/Resources/config/validation.yml index fbd4188b..bc91430b 100644 --- a/Resources/config/validation.yml +++ b/Resources/config/validation.yml @@ -2,8 +2,12 @@ Translation\Common\Model\Message: properties: key: - NotBlank: - groups: ["WebUi_Create", "WebUi_Edit", "WebUi_Delete"] + groups: ["Create", "Edit", "Delete"] translation: - NotBlank: - groups: ["WebUi_Create", "WebUi_Edit"] + groups: ["Create", "Edit"] + + domain: + - NotBlank: + groups: ["Create", "Edit", "Delete"] diff --git a/Tests/Functional/BundleInitializationTest.php b/Tests/Functional/BundleInitializationTest.php index 62619106..9a04a91e 100644 --- a/Tests/Functional/BundleInitializationTest.php +++ b/Tests/Functional/BundleInitializationTest.php @@ -31,7 +31,7 @@ public function testRegisterBundle() $this->assertInstanceOf(ConfigurationManager::class, $config); $default = $config->getConfiguration(); - $root = $container->getParameter('kernel.root_dir'); + $root = $container->getParameter('test.root_dir'); $this->assertEquals($root.'/Resources/translations', $default->getOutputDir()); $services = [ diff --git a/Tests/Functional/app/config/default.yml b/Tests/Functional/app/config/default.yml index ce3e9dbc..e1fda946 100644 --- a/Tests/Functional/app/config/default.yml +++ b/Tests/Functional/app/config/default.yml @@ -12,4 +12,3 @@ translation: configs: app: dirs: ["%test.root_dir%/Resources/views"] - output_dir: "%test.root_dir%/Resources/translations" From e6e09907a96a910aeb83805b2480ca059a7b47da Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 00:15:56 +0200 Subject: [PATCH 6/9] Fixed tests --- Tests/Functional/BundleInitializationTest.php | 2 +- Tests/Functional/Controller/WebUIControllerTest.php | 7 +++++++ Tests/Functional/app/config/default.yml | 4 ---- Tests/Functional/app/config/normal_config.yml | 10 ++++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 Tests/Functional/app/config/normal_config.yml diff --git a/Tests/Functional/BundleInitializationTest.php b/Tests/Functional/BundleInitializationTest.php index 9a04a91e..62619106 100644 --- a/Tests/Functional/BundleInitializationTest.php +++ b/Tests/Functional/BundleInitializationTest.php @@ -31,7 +31,7 @@ public function testRegisterBundle() $this->assertInstanceOf(ConfigurationManager::class, $config); $default = $config->getConfiguration(); - $root = $container->getParameter('test.root_dir'); + $root = $container->getParameter('kernel.root_dir'); $this->assertEquals($root.'/Resources/translations', $default->getOutputDir()); $services = [ diff --git a/Tests/Functional/Controller/WebUIControllerTest.php b/Tests/Functional/Controller/WebUIControllerTest.php index 4513c785..07035376 100644 --- a/Tests/Functional/Controller/WebUIControllerTest.php +++ b/Tests/Functional/Controller/WebUIControllerTest.php @@ -43,6 +43,13 @@ public static function setUpBeforeClass() ); } + protected function setUp() + { + parent::setUp(); + $this->kernel->addConfigFile(__DIR__.'/../app/config/normal_config.yml'); + } + + public function testIndexAction() { $request = Request::create('/_trans', 'GET'); diff --git a/Tests/Functional/app/config/default.yml b/Tests/Functional/app/config/default.yml index e1fda946..9237e5eb 100644 --- a/Tests/Functional/app/config/default.yml +++ b/Tests/Functional/app/config/default.yml @@ -4,11 +4,7 @@ imports: - { resource: services.yml } translation: - locales: ["en", "sv"] webui: enabled: true edit_in_place: enabled: true - configs: - app: - dirs: ["%test.root_dir%/Resources/views"] diff --git a/Tests/Functional/app/config/normal_config.yml b/Tests/Functional/app/config/normal_config.yml new file mode 100644 index 00000000..a6bdd8e1 --- /dev/null +++ b/Tests/Functional/app/config/normal_config.yml @@ -0,0 +1,10 @@ +translation: + locales: ["en", "sv"] + webui: + enabled: true + edit_in_place: + enabled: true + configs: + app: + dirs: ["%test.root_dir%/Resources/views"] + output_dir: "%test.root_dir%/Resources/translations" From 99adebd55c2daa480d35d5a4ffc9976a0325d4b7 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 00:16:12 +0200 Subject: [PATCH 7/9] cs --- Tests/Functional/Controller/WebUIControllerTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/Functional/Controller/WebUIControllerTest.php b/Tests/Functional/Controller/WebUIControllerTest.php index 07035376..3d71306d 100644 --- a/Tests/Functional/Controller/WebUIControllerTest.php +++ b/Tests/Functional/Controller/WebUIControllerTest.php @@ -49,7 +49,6 @@ protected function setUp() $this->kernel->addConfigFile(__DIR__.'/../app/config/normal_config.yml'); } - public function testIndexAction() { $request = Request::create('/_trans', 'GET'); From 626095102f0e9c5148f6538769d1b33ae6be71cc Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 00:16:36 +0200 Subject: [PATCH 8/9] Applied changes from StyleCI --- Controller/WebUIController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Controller/WebUIController.php b/Controller/WebUIController.php index ce6dbe57..2712fb18 100644 --- a/Controller/WebUIController.php +++ b/Controller/WebUIController.php @@ -262,7 +262,8 @@ private function getLocale2LanguageMap() /** * @param Message $message - * @param array $validationGroups + * @param array $validationGroups + * * @throws MessageValidationException */ private function validateMessage(Message $message, array $validationGroups) From d75bdf2af4223326839cdd3c05cb3decf0ebda4c Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 20 Aug 2017 01:04:41 +0200 Subject: [PATCH 9/9] Use symfony-storage 0.3.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e0440828..3daa1a77 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "symfony/intl": "^2.7 || ^3.0", "php-translation/common": "^0.2.1", - "php-translation/symfony-storage": "^0.3", + "php-translation/symfony-storage": "^0.3.1", "php-translation/extractor": "^1.2" }, "require-dev": {