fixed some regressions

Author: lsmith77

composer.lock

@@ -5,31 +5,34 @@
 use Doctrine\Common\Persistence\ObjectManager;
 
 use Symfony\Component\Yaml\Parser;
-use Symfony\Cmf\Bundle\SimpleCmsBundle\DataFixtures\LoadCmsData;
 
-use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page;
+use Symfony\Cmf\Bundle\SimpleCmsBundle\DataFixtures\LoadCmsData;
+use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangRedirectRoute;
 use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangRoute;
+
 use Symfony\Cmf\Bundle\MenuBundle\Document\MultilangMenuItem;
 
 class LoadSimpleCmsData extends LoadCmsData
 {
+    private $yaml;
+
     public function getOrder()
     {
         return 5;
     }
 
     protected function getData()
     {
-        $yaml = new Parser();
-        return $yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml'));
+        return $this->yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml'));
     }
 
     public function load(ObjectManager $dm)
     {
+        $this->yaml = new Parser();
+
         parent::load($dm);
 
-        $yaml = new Parser();
-        $data = $yaml->parse(file_get_contents(__DIR__ . '/../../Resources/data/external.yml'));
+        $data = $this->yaml->parse(file_get_contents(__DIR__ . '/../../Resources/data/external.yml'));
 
         $basepath = $this->container->getParameter('symfony_cmf_simple_cms.basepath');
         $home = $dm->find(null, $basepath);
@@ -44,11 +47,18 @@ public function load(ObjectManager $dm)
             $menuItem = new MultilangMenuItem();
             $menuItem->setName($name);
             $menuItem->setParent($home);
-            if (!empty($overview['uri']))
+            if (!empty($overview['route'])) {
+                if (!empty($overview['uri'])) {
+                    $route = new MultilangRedirectRoute();
+                    $route->setPosition($home, $overview['route']);
+                    $route->setUri($overview['uri']);
+                    $dm->persist($route);
+                } else {
+                    $route = $dm->find(null, $basepath.'/'.$overview['route']);
+                }
+                $menuItem->setRoute($route->getId());
+            } else {
                 $menuItem->setUri($overview['uri']);
-            else
-            {
-                $menuItem->setRoute($dm->find(null, $basepath.'/'.$overview['route'])->getId());
             }
 
             $dm->persist($menuItem);

src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php

@@ -2,18 +2,22 @@ static:
     docs:
         label:
             en: "Website"
-            de: "Website"
-        uri: "http://cmf.symfony.com/"
-    demo:
+            de: "Webseite"
+        uri: "http://cmf.symfony.com"
+
+    demo_redirect:
         label:
             en: "Demo"
             de: "Demo"
-        uri: "http://cmf.liip.ch/"
+        route: "demo"
+        uri: "http://cmf.liip.ch"
+
     hardcoded_dynamic:
         label:
             en: "Dynamic"
             de: "Dynamisch"
         route: "dynamic"
+
     hardcoded_static:
         label:
             en: "Static"