[#145] Make sure locale doesn't change after flush is called

Author: wouterj

Adapter/PhpcrOdmAdapter.php

@@ -71,9 +71,8 @@ public function getLocales($contentDocument)
     public function translateObject($contentDocument, $locale)
     {
         $meta = $this->dm->getMetadataFactory()->getMetadataFor(get_class($contentDocument));
-        $contentDocument = $this->dm->findTranslation($meta->getName(), $meta->getIdentifierValue($contentDocument), $locale);
 
-        return $contentDocument;
+        return $this->dm->findTranslation($meta->getName(), $meta->getIdentifierValue($contentDocument), $locale);
     }
 
     /**

Doctrine/Phpcr/AutoRouteListener.php

@@ -61,8 +61,10 @@ public function onFlush(ManagerEventArgs $args)
         $updates = array_merge($scheduledInserts, $scheduledUpdates);
 
         $autoRoute = null;
+        $locale = null;
         foreach ($updates as $document) {
             if ($this->isAutoRouteable($document)) {
+                $locale = $uow->getCurrentLocale($document);
 
                 $uriContextCollection = new UriContextCollection($document);
                 $arm->buildUriContextCollection($uriContextCollection);
@@ -73,6 +75,14 @@ public function onFlush(ManagerEventArgs $args)
                     $dm->persist($autoRoute);
                     $uow->computeChangeSets();
                 }
+
+                // reset locale to the original locale
+                if (null !== $locale) {
+                    $meta = $dm->getMetadataFactory()->getMetadataFor(get_class($document));
+                    $dm->findTranslation($meta->getName(), $meta->getIdentifierValue($document), $locale);
+
+                    $locale = null;
+                }
             }
         }
 

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -10,7 +10,7 @@
  */
 
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Subscriber;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\EventListener;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;