Merge pull request #265 from symfony-cmf/remove_deprecations

wouterj · web-flow · commit 6b2c4b90438d · 2016-06-30T13:09:06.000+02:00
Removed deprecated features
diff --git a/Admin/MenuNodeAdmin.php b/Admin/MenuNodeAdmin.php
@@ -43,7 +43,7 @@ protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
             ->with('form.group_general')
-                ->add('parent', TreeModelType::class, array(
+                ->add('parentDocument', TreeModelType::class, array(
                     'root_node' => $this->menuRoot,
                     'choice_list' => array(),
                     'select_root_node' => true,
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 Changelog
 =========
 
-* **2019-06-18**: [BC BREAK] Removed all `*.class` parameters.
+* **2016-06-19**: [BC BREAK] Removed `setParent()`/`getParent()` from the model `MenuNode`.
+* **2016-06-18**: [BC BREAK] Removed all `*.class` parameters.
 * **2016-05-25**: Use "auto" for publish workflow enabled flag. If auto and
   CmfCoreBundle is not instantiated, publish workflow integration is not enabled.
 
diff --git a/Model/MenuNode.php b/Model/MenuNode.php
@@ -96,22 +96,6 @@ public function getParentObject()
         return $this->parent;
     }
 
-    /**
-     * @deprecated use setParentObject instead.
-     */
-    public function setParent($parent)
-    {
-        return $this->setParentObject($parent);
-    }
-
-    /**
-     * @deprecated use getParentObject instead.
-     */
-    public function getParent()
-    {
-        return $this->getParentObject();
-    }
-
     /**
      * @return string the loaded locale of this menu node
      */
diff --git a/Resources/translations/CmfMenuBundle.cs.xliff b/Resources/translations/CmfMenuBundle.cs.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Položky</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Menu</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.de.xliff b/Resources/translations/CmfMenuBundle.de.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Einträge</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Menüs</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.en.xliff b/Resources/translations/CmfMenuBundle.en.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Items</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Menu</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.fr.xliff b/Resources/translations/CmfMenuBundle.fr.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Éléments</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Menus</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.it.xliff b/Resources/translations/CmfMenuBundle.it.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Elementi</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Genitore</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.nl.xliff b/Resources/translations/CmfMenuBundle.nl.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Items</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Menu</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.sk.xliff b/Resources/translations/CmfMenuBundle.sk.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Položky</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Menu</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Resources/translations/CmfMenuBundle.sl.xliff b/Resources/translations/CmfMenuBundle.sl.xliff
@@ -78,8 +78,8 @@
         <source>form.label_children</source>
         <target>Elementi</target>
       </trans-unit>
-      <trans-unit id="form.label_parent">
-        <source>form.label_parent</source>
+      <trans-unit id="form.label_parentDocument">
+        <source>form.label_parentDocument</source>
         <target>Meniji</target>
       </trans-unit>
       <trans-unit id="form.label_name">
diff --git a/Tests/Functional/Doctrine/Phpcr/MenuNodeTest.php b/Tests/Functional/Doctrine/Phpcr/MenuNodeTest.php
@@ -149,7 +149,7 @@ public function testMenuNode()
         $this->assertEquals('fr', $menuNode->getLocale());
 
         $child = $this->dm->find(null, '/test/test-node/child1');
-        $menuNode = $child->getParent();
+        $menuNode = $child->getParentDocument();
         $this->assertCount(1, $menuNode->getChildren());
         $menuNode->removeChild($child);
         $this->dm->flush();
diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
@@ -0,0 +1,24 @@
+# Upgrade from 2.0 to 2.1
+
+## Model
+
+* Removed `setParent()`/`getParent()` from the model `MenuNode`. Use
+  `setParentObject()`/`getParentObject()` instead.
+
+  **Before**
+  ```php
+  use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;
+  // ...
+
+  $node = new MenuNode('some name');
+  $node->setParent($menuRoot);
+  ```
+
+  **After**
+  ```php
+  use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;
+  // ...
+
+  $node = new MenuNode('some name');
+  $node->setParentObject($menuRoot);
+  ```
diff --git a/composer.json b/composer.json
@@ -16,20 +16,22 @@
         "symfony/framework-bundle": "^2.8|^3.0",
         "symfony-cmf/core-bundle": "^2.0@dev",
         "doctrine/phpcr-bundle": "^1.1",
-        "doctrine/phpcr-odm": "^1.3",
+        "doctrine/phpcr-odm": "^2.0",
         "knplabs/knp-menu-bundle": "^2.0.0",
         "knplabs/knp-menu": "^2.0.0"
     },
     "require-dev": {
         "symfony/monolog-bundle": "^2.3|^3.0",
-        "symfony-cmf/routing-bundle": "^1.2.0|^2.0",
-        "symfony-cmf/testing": "^1.3",
+        "symfony-cmf/routing-bundle": "^1.4|^2.0",
+        "symfony-cmf/testing": "^2.0",
         "twig/twig": "^1.18|^2.0",
-        "sonata-project/doctrine-phpcr-admin-bundle": "^1.2.4|^2.0",
+        "sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
         "sonata-project/admin-bundle": "^2.3.7|^3.0",
         "sonata-project/block-bundle": "^2.2.8|^3.0",
         "sonata-project/core-bundle": "^2.2.5|^3.0"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "suggest": {
         "sonata-project/doctrine-phpcr-admin-bundle": "if you want to have editing capabilities (^1.1)",
         "burgov/key-value-form-bundle": "if you want to edit the advanced options on the node with the menu options extension"

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected function configureFormFields(FormMapper $formMapper)`
`43`	`43`	`{`
`44`	`44`	`$formMapper`
`45`	`45`	`->with('form.group_general')`
`46`		`- ->add('parent', TreeModelType::class, array(`
	`46`	`+ ->add('parentDocument', TreeModelType::class, array(`
`47`	`47`	`'root_node' => $this->menuRoot,`
`48`	`48`	`'choice_list' => array(),`
`49`	`49`	`'select_root_node' => true,`