[translatable] adjusted and optimized some code parts

lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php

@@ -110,19 +110,20 @@ final class ORM extends BaseAdapterORM implements TranslatableAdapter
         foreach ($em->getUnitOfWork()->getIdentityMap() as $className => $objects) {
             if ($className === $translationClass) {
                 foreach ($objects as $trans) {
-                    $match = !$trans instanceof Proxy
+                    $isRequestedTranslation = !$trans instanceof Proxy
                         && $trans->getLocale() === $locale
                         && $trans->getField() === $field
                     ;
-                    if ($match) {
+                    if ($isRequestedTranslation) {
                         if ($this->usesPersonalTranslation($translationClass)) {
-                            $match = $match && $trans->getObject() === $wrapped->getObject();
+                            $isRequestedTranslation = $trans->getObject() === $wrapped->getObject();
                         } else {
-                            $match = $match && $trans->getForeignKey() === $wrapped->getIdentifier();
-                            $match = $match && $trans->getObjectClass() === $wrapped->getMetadata()->name;
+                            $isRequestedTranslation = $trans->getForeignKey() === $wrapped->getIdentifier()
+                                && $trans->getObjectClass() === $wrapped->getMetadata()->name
+                            ;
                         }
                     }
-                    if ($match) {
+                    if ($isRequestedTranslation) {
                         return $trans;
                     }
                 }

lib/Gedmo/Translatable/TranslatableListener.php

@@ -456,14 +456,13 @@ class TranslatableListener extends MappedEventSubscriber
             // lookup persisted translations
             if ($ea->usesPersonalTranslation($translationClass)) {
                 foreach ($ea->getScheduledObjectInsertions($uow) as $trans) {
-                    $match = get_class($trans) === $translationClass
+                    $wasPersistedSeparetely = get_class($trans) === $translationClass
                         && $trans->getLocale() === $locale
                         && $trans->getField() === $field
                         && $trans->getObject() === $object
                     ;
-                    if ($match) {
+                    if ($wasPersistedSeparetely) {
                         $translation = $trans;
-                        $wasPersistedSeparetely = true;
                         break;
                     }
                 }