fix missing locale annotation for Gedmo trait #121
Conversation
| * | ||
| * @author Nicolas Bastien <nbastien.pro@gmail.com> | ||
| */ | ||
| trait Translatable |
There was a problem hiding this comment.
Please follow symfony code style and rename it to TranslateableTrait
|
@nicolas-bastien can you please verify this PR? |
|
@soullivaneuh stuck StyleCi build |
| * | ||
| * @author Gediminas Morkevicius <gediminas.morkevicius@gmail.com> | ||
| * | ||
| * @link http://www.gediminasm.org |
|
@dmarkowicz why do we need this file? |
| 'memory' => true, | ||
| ); | ||
|
|
||
| $config = null === $config ? $this->getMockAnnotatedConfig() : $config; |
There was a problem hiding this comment.
What about $config ?: $this->getMockAnnotatedConfig()
|
Thanks for comments. |
| @@ -12,7 +12,6 @@ | |||
| namespace Sonata\TranslationBundle\Traits\Gedmo; | |||
|
|
|||
| use Sonata\TranslationBundle\Model\Gedmo\AbstractPersonalTranslation; | |||
| use Sonata\TranslationBundle\Traits\Gedmo\Translatable; | |||
There was a problem hiding this comment.
Please fixup this commit with the previous commit.
|
I squashed PR. @OskarStark temp folder is not needed anymore, updated according to @greg0ire comments. |
| @@ -21,7 +20,7 @@ | |||
| */ | |||
| trait PersonalTranslatable | |||
| { | |||
| use Translatable; | |||
| use TranslatableTrait; | |||
There was a problem hiding this comment.
We should merge #124 first, who does the name refactoring @OskarStark
There was a problem hiding this comment.
ok then feel free to merge #124 and ping @dmarkowicz when he should rebase on this
thank you @core23 👍
|
Could you please rebase your PR and fix merge conflicts? |
|
Done! |
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function setUp() |
| use Doctrine\ORM\Mapping\Driver\AnnotationDriver; | ||
| use Doctrine\ORM\Tools\SchemaTool; | ||
|
|
||
| abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase |
There was a problem hiding this comment.
Please add some phpDoc including a description and author.
|
Is there anything else I can improve here? |
|
@core23 can you please give us a final review? thank you! |
| { | ||
| $evm = new EventManager(); | ||
|
|
||
| return $evm; |
There was a problem hiding this comment.
What does OTV mean?
There was a problem hiding this comment.
One time variable ;)
You assigned a variable and used it only once.
|
RTM, after fixing the last comments |
|
I pushed the last changes. |
|
Thanks @dmarkowicz ! |
I am targetting this branch, because it is a bug fix for 2.x
Changelog
Subject
\Traits\Gedmo\PersonalTranslatableTraitshould use new\Traits\Gedmo\TranslatableTraitwith@Gedmo\Localeannotation (same as\Model\Gedmo\AbstractTranslatableclass). This fix$entity->setLocale('XX')mechanic if entity use traits.