Merge pull request #126 from symfony-cmf/start-2.0

Start 2.0

Author: wouterj

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -15,20 +13,18 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  - SYMFONY_VERSION=2.8.*
+  - SYMFONY_VERSION=3.0.*
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.0
       env: DEPS=dev
-    - php: 5.3
+    - php: 5.5
       env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.8.*
+    - php: 7.0
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+ * **2016-06-21**: [BC BREAK] Deleted the `sonata_admin` bundle set.
+ * **2016-06-21**: [BC BREAK] Deleted the `LoadBaseData` data fixtures.
+ * **2016-06-21**: [BC BREAK] Deleted the `Content` document.
+ * **2016-06-21**: [BC BREAK] Dropped PHP <5.5 support.
+ * **2016-06-21**: [BC BREAK] Dropped Symfony <2.8 support.
+
 1.3.0
 -----
 

composer.json

@@ -8,15 +8,14 @@
             "homepage": "https://github.com/symfony-cmf/Routing/contributors"
         }
     ],
-    "prefer-stable": true,
     "require": {
-        "php": "^5.3.9|^7.0",
-        "symfony/symfony": "^2.3|3.*",
-        "symfony/phpunit-bridge": "^2.8.1|3.*",
-        "symfony/monolog-bundle": "^2.1|3.*",
+        "php": "^5.5.6|^7.0",
+        "symfony/symfony": "^2.8|^3.0",
+        "symfony/phpunit-bridge": "^2.8.1|^3.0",
+        "symfony/monolog-bundle": "^2.1|^3.0",
         "doctrine/common": "^2.4",
         "doctrine/doctrine-bundle": "^1.0",
-        "doctrine/phpcr-odm": "^1.1",
+        "doctrine/phpcr-odm": "^1.1|^2.0",
         "doctrine/phpcr-bundle": "^1.1",
         "doctrine/data-fixtures": "^1.0",
         "jackalope/jackalope": "^1.1.5",

src/DataFixtures/PHPCR/LoadBaseData.php

@@ -61,11 +61,6 @@ public function __construct($env, $debug)
             $baseSonataBundles[] = 'Sonata\jQueryBundle\SonatajQueryBundle';
         }
 
-        $this->registerBundleSet('sonata_admin', array_merge(array(
-            'Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
-            'Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle',
-        ), $baseSonataBundles));
-
         $this->registerBundleSet('sonata_admin_orm', array_merge(array(
             'Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle',
         ), $baseSonataBundles));
@@ -119,10 +114,6 @@ public function requireBundleSets(array $names)
      */
     public function requireBundleSet($name)
     {
-        if ('sonata_admin' === $name) {
-            @trigger_error('The "sonata_admin" bundleset is deprecated since version 1.1 and will be removed in 2.0. Use the "sonata_admin_phpcr" bundleset instead.', E_USER_DEPRECATED);
-        }
-
         if (!isset($this->bundleSets[$name])) {
             throw new \InvalidArgumentException(sprintf(
                 'Bundle set %s has not been registered, available bundle sets: %s',