Prepare 2.0.0-RC1

symfony-cmf · Jan 21, 2017 · 924d116 · 924d116
1 parent df2ee0b
commit 924d116
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,7 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
-  - 7.1
   - hhvm
 
 sudo: false
@@ -17,17 +14,15 @@ cache:
 env:
   matrix: SYMFONY_VERSION=3.2.*
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=weak
+    - SYMFONY_DEPRECATIONS_HELPER=48
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
   include:
-    - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    #- php: nightly
-    #  env: DEPS=dev SYMFONY_VERSION=3.3.*
     - php: 7.1
-      env: SYMFONY_VERSION=3.0.*
+      env: DEPS=dev SYMFONY_VERSION=3.3.*
+    - php: 5.6
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.1
       env: SYMFONY_VERSION=3.1.*
   fast_finish: true
@@ -47,4 +42,3 @@ script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "symfony-cmf-devs@googlegroups.com"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
 Changelog
 =========
 
+2.0.0-RC1
+---------
+
  * **2016-12-15**: [BC BREAK] SeoMetadataType constructor refactored to take an options array
  * **2016-08-11**: [BC BREAK] Moved all Sonata related classes into sonata-admin-integration-bundle
  * **2016-05-08**: [BC BREAK] Removed `showAtion` in favor of `listAction` in the `SuggestionProviderController`
- * **2016-05-02**: [BC BREAK] Dropped PHP <5.5 support
+ * **2016-05-02**: [BC BREAK] Dropped PHP <5.6 support
  * **2016-05-02**: [BC BREAK] Dropped Symfony <2.8 support
 
 1.3.0

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ aware for Search Engine Optimisation (SEO).
 
 ## Requirements
 
-* Symfony 2.3+
+* Symfony 2.8+
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation

diff --git a/composer.json b/composer.json
@@ -12,14 +12,14 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|^7.0",
+        "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
         "sonata-project/seo-bundle": "^1.1.3|^2.0",
         "doctrine/collections": "^1.0"
     },
     "require-dev": {
         "symfony-cmf/testing": "^2.0",
-        "doctrine/phpcr-odm": "^2.0",
+        "doctrine/phpcr-odm": "^1.4|^2.0",
         "doctrine/orm": "^2.4",
         "sonata-project/doctrine-phpcr-admin-bundle": "^1.2.3|^2.0",
         "sonata-project/admin-bundle": "^2.3.7|^3.0",

diff --git a/src/Doctrine/Phpcr/SeoMetadata.php b/src/Doctrine/Phpcr/SeoMetadata.php
@@ -61,26 +61,32 @@ public function setParentDocument($parentDocument)
     }
 
     /**
-     * @deprecated use setParentDocument
+     * {@inheritdoc}
      */
-    public function setParent($parent)
+    public function getParentDocument()
     {
-        return $this->setParentDocument($parent);
+        return $this->parentDocument;
     }
 
     /**
-     * {@inheritdoc}
+     * @deprecated For compatibility with Doctrine PHPCR ODM 1.4, to be removed in version 3.0.
+     * @see setParentDocument
      */
-    public function getParentDocument()
+    public function setParent($parent)
     {
-        return $this->parentDocument;
+        @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 use getParentDocument
+     * @deprecated For compatibility with Doctrine PHPCR ODM 1.4, to be removed in version 3.0.
+     * @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();
     }
 }