diff --git a/Admin/Extension/AbstractTranslatableAdminExtension.php b/Admin/Extension/AbstractTranslatableAdminExtension.php index 17c9f12d..abc955d4 100644 --- a/Admin/Extension/AbstractTranslatableAdminExtension.php +++ b/Admin/Extension/AbstractTranslatableAdminExtension.php @@ -68,7 +68,7 @@ public function getTranslatableChecker() public function getTranslatableLocale(AdminInterface $admin) { if ($this->translatableLocale == null) { - if ($admin->getRequest()) { + if ($admin->hasRequest()) { $this->translatableLocale = $admin->getRequest()->get(self::TRANSLATABLE_LOCALE_PARAMETER); } if ($this->translatableLocale == null) { diff --git a/Tests/AdminExtension/Knplabs/TranslatableAdminExtensionTest.php b/Tests/AdminExtension/Knplabs/TranslatableAdminExtensionTest.php index 5bec6bc2..4ac409a6 100644 --- a/Tests/AdminExtension/Knplabs/TranslatableAdminExtensionTest.php +++ b/Tests/AdminExtension/Knplabs/TranslatableAdminExtensionTest.php @@ -50,6 +50,7 @@ protected function setUp() $this->admin = $this->prophesize('Sonata\AdminBundle\Admin\AdminInterface'); $this->admin->getRequest()->willReturn($request->reveal()); + $this->admin->hasRequest()->willReturn(true); $this->object = new TranslatableEntity(); } @@ -61,7 +62,7 @@ public function testSetLocaleForTranslatableObject() $this->assertEquals('es', $this->object->getLocale()); } - public function testAlertObjectForTranslatableObject() + public function testAlterObjectForTranslatableObject() { $this->extension->alterObject($this->admin->reveal(), $this->object); diff --git a/composer.json b/composer.json index 4d8837ae..eba1189a 100644 --- a/composer.json +++ b/composer.json @@ -29,12 +29,14 @@ "knplabs/doctrine-behaviors": "^1.0", "matthiasnoback/symfony-dependency-injection-test": "^0.5 || ^1.0", "sllh/php-cs-fixer-styleci-bridge": "^2.0", + "sonata-project/doctrine-orm-admin-bundle": "^3.1", "stof/doctrine-extensions-bundle": "^1.1", "symfony/phpunit-bridge": "^2.7 || ^3.0" }, "suggest": { "doctrine/phpcr-odm": "if you translate odm documents", "knplabs/doctrine-behaviors": "if you translate orm entities with the knplabs behaviours", + "sonata-project/doctrine-orm-admin-bundle": "if you translate orm entities and search on translated fields", "stof/doctrine-extensions-bundle": "if you translate orm entities with the gedmo extensions" }, "conflict": {