Merge pull request #382 from symfony-cmf/phpcr-odm-1

Keep support for PHPCR-ODM 1.4

Author: dbu

.travis.yml

@@ -14,23 +14,19 @@ cache:
 
 env:
   matrix:
-    - SYMFONY_VERSION=3.1.*
+    - SYMFONY_VERSION=3.2.*
   global:
     - SYMFONY_DEPRECATIONS_HELPER=231
-    - SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - SYMFONY_PHPUNIT_DIR="./.phpunit"
-    - SYMFONY_PHPUNIT_VERSION=5.7
+    - SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_DIR="./.phpunit" SYMFONY_PHPUNIT_VERSION=5.7
 
 matrix:
   include:
-    - php: 7.0
+    - php: 7.1
       env: DEPS=dev SYMFONY_VERSION=3.3.*
     - php: 5.6
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.2.*
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:
@@ -48,4 +44,3 @@ script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "[email protected]"

CHANGELOG.md

@@ -1,7 +1,7 @@
 Changelog
 =========
 
- * **2016-12-02**: [BC BREAK] Move all sonata related code
+ * **2016-12-02**: [BC BREAK] Moved all sonata related code to sonata-phpcr-admin-integration-bundle
  * **2016-10-10**: [ORM] Add option to use custom Route class in ORM
  * **2016-06-18**: [BC BREAK] Removed all `*.class` parameters.
  * **2016-06-18**: [BC BREAK] Removed the `cmf_routing.dynamic.persistence.phpcr.route_basepath`

composer.json

@@ -19,32 +19,26 @@
     "require-dev": {
         "symfony-cmf/core-bundle": "^2.0",
         "symfony-cmf/testing": "^2.0",
-        "doctrine/phpcr-odm": "^2.0",
+        "doctrine/phpcr-odm": "^1.4|^2.0",
         "symfony/phpunit-bridge": "^3.2",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",
         "phpunit/php-code-coverage": "@stable",
-        "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",
         "symfony/monolog-bundle": "^2.3|^3.0",
         "doctrine/orm": "^2.5",
         "doctrine/data-fixtures": "^1.0.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "suggest": {
-        "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
+        "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.4)",
         "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
         "doctrine/orm": "To enable support for the ORM entities (^2.5)",
-
         "symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle",
-        "symfony-cmf/core-bundle": "To use the provided Doctrine\\Phpcr documents and for easier configuration (^1.1)",
-
-        "symfony-cmf/sonata-admin-integration": "To provide an admin interface for the PHPCR ODM documents (^1.1)"
+        "symfony-cmf/core-bundle": "To use the RouteTypeType form type and for easier configuration (^2.0)"
     },
     "conflict": {
-        "doctrine/phpcr-odm": "<2.0"
+        "doctrine/phpcr-odm": "<1.4"
     },
     "autoload": {
         "psr-4": {

src/Doctrine/Phpcr/RedirectRoute.php

@@ -94,6 +94,28 @@ public function getParentDocument()
         return $this->parent;
     }
 
+    /**
+     * @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
+     * @see setParentDocument
+     */
+    public function setParent($parent)
+    {
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use setParentDocument() instead.', E_USER_DEPRECATED);
+
+        return $this->setParentDocument($parent);
+    }
+
+    /**
+     * @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
+     * @see getParentDocument
+     */
+    public function getParent()
+    {
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use getParentDocument() instead.', E_USER_DEPRECATED);
+
+        return $this->getParentDocument();
+    }
+
     /**
      * Rename a route by setting its new name.
      *

src/Doctrine/Phpcr/Route.php

@@ -104,6 +104,28 @@ public function getParentDocument()
         return $this->parent;
     }
 
+    /**
+     * @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
+     * @see setParentDocument
+     */
+    public function setParent($parent)
+    {
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use setParentDocument() instead.', E_USER_DEPRECATED);
+
+        return $this->setParentDocument($parent);
+    }
+
+    /**
+     * @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
+     * @see getParentDocument
+     */
+    public function getParent()
+    {
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use getParentDocument() instead.', E_USER_DEPRECATED);
+
+        return $this->getParentDocument();
+    }
+
     /**
      * Rename a route by setting its new name.
      *