Merge pull request #313 from symfony-cmf/deprecation_internal

Trigger deprecation notices

Author: dbu

Doctrine/Phpcr/RedirectRoute.php

@@ -73,17 +73,19 @@ public function __construct(array $options = array())
      */
     public function setParent($parent)
     {
-        $this->parent = $parent;
+        @trigger_error('The Route#setParent() method is deprecated as of version 1.2 and will be removed in 2.0. Use setParentDocument() instead.', E_USER_DEPRECATED);
 
-        return $this;
+        return $this->setParentDocument($parent);
     }
 
     /**
      * @deprecated Use getParentDocument instead.
      */
     public function getParent()
     {
-        return $this->parent;
+        @trigger_error('The Route#getParent() method is deprecated as of version 1.2 and will be removed in 2.0. Use getParentDocument() instead.', E_USER_DEPRECATED);
+
+        return $this->getParentDocument();
     }
 
     /**

Doctrine/Phpcr/Route.php

@@ -93,17 +93,19 @@ public function setAddTrailingSlash($addTrailingSlash)
      */
     public function setParent($parent)
     {
-        $this->parent = $parent;
+        @trigger_error('The Route#setParent() method is deprecated as of version 1.2 and will be removed in 2.0. Use setParentDocument() instead.', E_USER_DEPRECATED);
 
-        return $this;
+        return $this->setParentDocument($parent);
     }
 
     /**
      * @deprecated Use getParentDocument instead.
      */
     public function getParent()
     {
-        return $this->parent;
+        @trigger_error('The Route#getParent() method is deprecated as of version 1.2 and will be removed in 2.0. Use getParentDocument() instead.', E_USER_DEPRECATED);
+
+        return $this->getParentDocument();
     }
 
     /**
@@ -112,6 +114,8 @@ public function getParent()
      * Note that this will change the URL this route matches.
      *
      * @param object $parent the new parent document
+     *
+     * @return $this
      */
     public function setParentDocument($parent)
     {

Tests/Functional/Doctrine/Phpcr/RouteProviderTest.php

@@ -45,7 +45,7 @@ private function buildRoutes()
 
         // smuggle a non-route thing into the repository
         $noroute = new Generic;
-        $noroute->setParent($route);
+        $noroute->setParentDocument($route);
         $noroute->setNodename('noroute');
         $this->getDm()->persist($noroute);
 

Tests/Resources/DataFixtures/Phpcr/LoadRouteData.php

@@ -26,7 +26,7 @@ public function load(ObjectManager $manager)
 
         $root = $manager->find(null, '/test');
         $parent = new Generic;
-        $parent->setParent($root);
+        $parent->setParentDocument($root);
         $parent->setNodename('routing');
         $manager->persist($parent);