deprecate routeContent and use content instead. fix #118

Author: dbu

CHANGELOG.md

@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* **2013-07-26**: [Model] Deprecated setRouteContent and getRouteContent, use setContent and getContent instead.
 * **2013-07-19**: [Model] Separated database agnostic, doctrine generic and
   PHPCR-ODM specific code to prepare for Doctrine ORM support.
 * **2013-07-17**: [FormType] Moved TermsFormType to CoreBundle and renamed it to CheckboxUrlLableFormType

Model/RedirectRoute.php

@@ -45,15 +45,15 @@ class RedirectRoute extends Route implements RedirectRouteInterface
      *
      * @throws LogicException
      */
-    public function setRouteContent($document)
+    public function setContent($document)
     {
         throw new LogicException('Do not set a content for the redirect route. It is its own content.');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getRouteContent()
+    public function getContent()
     {
         return $this;
     }

Model/Route.php

@@ -25,7 +25,7 @@ class Route extends SymfonyRoute implements RouteObjectInterface
      *
      * @var object
      */
-    protected $routeContent;
+    protected $content;
 
     /**
      * Part of the URL that does not have parameters and thus can be used to
@@ -116,11 +116,22 @@ public function setStaticPrefix($prefix)
     }
 
     /**
-     * Set the object this url points to
+     * @deprecated use setContent instead
      */
     public function setRouteContent($object)
     {
-        $this->routeContent = $object;
+        $this->setContent($object);
+    }
+
+    /**
+     * Set the object this url points to
+     *
+     * @param mixed $object A content object that can be persisted by the
+     *      storage layer.
+     */
+    public function setContent($object)
+    {
+        $this->content = $object;
 
         return $this;
     }
@@ -130,7 +141,15 @@ public function setRouteContent($object)
      */
     public function getRouteContent()
     {
-        return $this->routeContent;
+        return $this->getContent();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getContent()
+    {
+        return $this->content;
     }
 
     /**

Resources/config/doctrine-model/Route.phpcr.xml

@@ -9,7 +9,7 @@
     <mapped-superclass name="Symfony\Cmf\Bundle\RoutingBundle\Model\Route" referenceable="true">
         <field name="variablePattern" type="string"/>
         <field name="addFormatPattern" type="boolean"/>
-        <reference-one name="routeContent"/>
+        <reference-one name="content" property="routeContent"/>
     </mapped-superclass>
 
 </doctrine-mapping>

UPGRADE-1.1.md

@@ -16,4 +16,7 @@ PHPCR specific configurations moved into
 
 You need to at least set `phpcr_provider: ~` to have the PHPCR provider loaded.
 
-Dropped redundant unused `routing_repositoryroot` configuration.
+Dropped redundant unused `routing_repositoryroot` configuration.
+
+Deprecated the setRouteContent and getRouteContent methods. Use setContent and
+getContent instead.