ensure that the LocaleListner handles any Route model instance (including redirects)

Author: lsmith77

Doctrine/Phpcr/LocaleListener.php

@@ -14,6 +14,7 @@
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Event\MoveEventArgs;
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
+use Symfony\Cmf\Bundle\RoutingBundle\Model\Route as ModelRoute;
 
 /**
  * Doctrine PHPCR-ODM listener to update the locale on routes based on the URL.
@@ -118,7 +119,7 @@ public function setUpdateAvailableTranslations($update)
     public function postLoad(LifecycleEventArgs $args)
     {
         $doc = $args->getObject();
-        if (! $doc instanceof Route) {
+        if (! $doc instanceof ModelRoute) {
             return;
         }
         $this->updateLocale($doc, $doc->getId(), $args->getObjectManager());
@@ -132,7 +133,7 @@ public function postLoad(LifecycleEventArgs $args)
     public function postPersist(LifecycleEventArgs $args)
     {
         $doc = $args->getObject();
-        if (! $doc instanceof Route) {
+        if (! $doc instanceof ModelRoute) {
             return;
         }
         $this->updateLocale($doc, $doc->getId(), $args->getObjectManager());
@@ -146,7 +147,7 @@ public function postPersist(LifecycleEventArgs $args)
     public function postMove(MoveEventArgs $args)
     {
         $doc = $args->getObject();
-        if (! $doc instanceof Route) {
+        if (! $doc instanceof ModelRoute) {
             return;
         }
         $this->updateLocale($doc, $args->getTargetPath(), $args->getObjectManager(), true);
@@ -164,7 +165,7 @@ protected function getPrefixes()
      * Update the locale of a route if $id starts with the prefix and has a
      * valid locale right after.
      *
-     * @param Route           $doc   The route object
+     * @param ModelRoute      $doc   The route object
      * @param string          $id    The id (in move case, this is not the current
      *                               id of $route).
      * @param DocumentManager $dm    The document manager to get locales from if
@@ -173,7 +174,7 @@ protected function getPrefixes()
      * @param boolean         $force Whether to update the locale even if the
      *                               route already has a locale.
      */
-    protected function updateLocale(Route $doc, $id, DocumentManager $dm, $force = false)
+    protected function updateLocale(ModelRoute $doc, $id, DocumentManager $dm, $force = false)
     {
         $matches = array();