Bump package to PHP 5.6

Author: wouterj

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - hhvm
 
@@ -17,13 +15,13 @@ env:
   matrix: SYMFONY_VERSION=3.1.*
   global:
     - SYMFONY_DEPRECATIONS_HELPER=2080
-    - SYMFONY_PHPUNIT_DIR=".phpunit" SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - SYMFONY_PHPUNIT_DIR=".phpunit" SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
 
 matrix:
   include:
     #- php: 7.0
     #  env: DEPS=dev SYMFONY_VERSION=3.3.*
-    - php: 5.5
+    - php: 5.6
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.1
       env: SYMFONY_VERSION=3.0.*
@@ -44,4 +42,3 @@ script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "[email protected]"

composer.json

@@ -12,22 +12,23 @@
         }
     ],
     "require": {
-        "php": "^5.5.6|^7.0",
+        "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
         "sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
         "sonata-project/admin-bundle": "^3.6.0",
         "symfony-cmf/tree-browser-bundle": "^2.0"
     },
     "require-dev": {
         "symfony-cmf/testing": "^2.0",
-        "symfony-cmf/core-bundle": "^2.0",
+        "symfony-cmf/core-bundle": "^2.0.0-RC2",
         "symfony-cmf/routing-bundle": "^2.0",
         "symfony-cmf/seo-bundle": "^2.0",
         "symfony-cmf/menu-bundle": "^2.0",
         "symfony-cmf/block-bundle": "^2.0",
         "symfony-cmf/content-bundle": "^2.0",
         "doctrine/orm": "^2.4",
         "doctrine/phpcr-odm": "^2.0",
+        "doctrine/doctrine-bundle": "^1.3",
         "symfony/phpunit-bridge": "^3.2",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",

tests/Unit/Admin/Core/Extension/ChildExtensionTest.php

@@ -19,22 +19,19 @@ public function testAlterNewInstance()
     {
         $parent = new \StdClass();
 
-        $modelManager = $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface');
+        $modelManager = $this->createMock('Sonata\AdminBundle\Model\ModelManagerInterface');
         $modelManager->expects($this->any())
             ->method('find')
             ->will($this->returnValue($parent))
         ;
 
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
-            ->disableOriginalConstructor()
-            ->getMock()
-        ;
+        $request = $this->createMock('Symfony\Component\HttpFoundation\Request');
         $request->expects($this->any())
             ->method('get')
             ->will($this->returnValue('parent-id'))
         ;
 
-        $admin = $this->getMock('Sonata\AdminBundle\Admin\AdminInterface');
+        $admin = $this->createMock('Sonata\AdminBundle\Admin\AdminInterface');
         $admin->expects($this->any())
             ->method('getModelManager')
             ->will($this->returnValue($modelManager))
@@ -48,7 +45,7 @@ public function testAlterNewInstance()
             ->will($this->returnValue($request))
         ;
 
-        $child = $this->getMock('Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface');
+        $child = $this->createMock('Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface');
         $child->expects($this->once())
             ->method('setParentObject')
             ->with($this->equalTo($parent));